Skip to content

Commit f2435f8

Browse files
committed
Simplify test setup
1 parent 993dd76 commit f2435f8

File tree

1 file changed

+19
-58
lines changed

1 file changed

+19
-58
lines changed

csharp/extractor/Semmle.Extraction.Tests/FilePathFilter.cs

Lines changed: 19 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,18 @@ private class ProgressMonitorStub : IProgressMonitor
1515
public void Log(Severity severity, string message) { }
1616
}
1717

18+
private static (FilePathFilter TestSubject, IEnumerable<FileInfo> Files) TestSetup()
19+
{
20+
return TestSetup("/a/b",
21+
[
22+
"/a/b/c/d/e/f.cs",
23+
"/a/b/c/d/e/g.cs",
24+
"/a/b/c/d/e/h.cs",
25+
"/a/b/c/x/y/i.cs",
26+
"/a/b/c/x/z/i.cs"
27+
]);
28+
}
29+
1830
private static (FilePathFilter TestSubject, IEnumerable<FileInfo> Files) TestSetup(string root, IEnumerable<string> paths)
1931
{
2032
root = GetPlatformSpecifixPath(root);
@@ -48,15 +60,7 @@ private static void AssertEquivalence(IEnumerable<FileInfo>? expected, IEnumerab
4860
[Fact]
4961
public void TestNoFilter()
5062
{
51-
(var testSubject, var files) = TestSetup(
52-
"/a/b",
53-
[
54-
"/a/b/c/d/e/f.cs",
55-
"/a/b/c/d/e/g.cs",
56-
"/a/b/c/d/e/h.cs",
57-
"/a/b/c/x/y/i.cs",
58-
"/a/b/c/x/z/i.cs"
59-
]);
63+
(var testSubject, var files) = TestSetup();
6064

6165
Environment.SetEnvironmentVariable("LGTM_INDEX_FILTERS", null);
6266

@@ -68,15 +72,7 @@ public void TestNoFilter()
6872
[Fact]
6973
public void TestFiltersWithOnlyInclude()
7074
{
71-
(var testSubject, var files) = TestSetup(
72-
"/a/b",
73-
[
74-
"/a/b/c/d/e/f.cs",
75-
"/a/b/c/d/e/g.cs",
76-
"/a/b/c/d/e/h.cs",
77-
"/a/b/c/x/y/i.cs",
78-
"/a/b/c/x/z/i.cs"
79-
]);
75+
(var testSubject, var files) = TestSetup();
8076

8177
Environment.SetEnvironmentVariable("LGTM_INDEX_FILTERS", """
8278
include:c/d
@@ -99,14 +95,7 @@ public void TestFiltersWithOnlyInclude()
9995
[Fact]
10096
public void TestFiltersWithOnlyExclude()
10197
{
102-
(var testSubject, var files) = TestSetup("/a/b",
103-
[
104-
"/a/b/c/d/e/f.cs",
105-
"/a/b/c/d/e/g.cs",
106-
"/a/b/c/d/e/h.cs",
107-
"/a/b/c/x/y/i.cs",
108-
"/a/b/c/x/z/i.cs"
109-
]);
98+
(var testSubject, var files) = TestSetup();
11099

111100
Environment.SetEnvironmentVariable("LGTM_INDEX_FILTERS", """
112101
exclude:c/d/e
@@ -126,14 +115,7 @@ public void TestFiltersWithOnlyExclude()
126115
[Fact]
127116
public void TestFiltersWithIncludeExclude()
128117
{
129-
(var testSubject, var files) = TestSetup("/a/b",
130-
[
131-
"/a/b/c/d/e/f.cs",
132-
"/a/b/c/d/e/g.cs",
133-
"/a/b/c/d/e/h.cs",
134-
"/a/b/c/x/y/i.cs",
135-
"/a/b/c/x/z/i.cs"
136-
]);
118+
(var testSubject, var files) = TestSetup();
137119

138120
Environment.SetEnvironmentVariable("LGTM_INDEX_FILTERS", """
139121
include:c/x
@@ -153,14 +135,7 @@ public void TestFiltersWithIncludeExclude()
153135
[Fact]
154136
public void TestFiltersWithIncludeExcludeExcludeFirst()
155137
{
156-
(var testSubject, var files) = TestSetup("/a/b",
157-
[
158-
"/a/b/c/d/e/f.cs",
159-
"/a/b/c/d/e/g.cs",
160-
"/a/b/c/d/e/h.cs",
161-
"/a/b/c/x/y/i.cs",
162-
"/a/b/c/x/z/i.cs"
163-
]);
138+
(var testSubject, var files) = TestSetup();
164139

165140
Environment.SetEnvironmentVariable("LGTM_INDEX_FILTERS", """
166141
exclude:c/x/z
@@ -180,14 +155,7 @@ public void TestFiltersWithIncludeExcludeExcludeFirst()
180155
[Fact]
181156
public void TestFiltersWithIncludeExcludeComplexPatterns1()
182157
{
183-
(var testSubject, var files) = TestSetup("/a/b",
184-
[
185-
"/a/b/c/d/e/f.cs",
186-
"/a/b/c/d/e/g.cs",
187-
"/a/b/c/d/e/h.cs",
188-
"/a/b/c/x/y/i.cs",
189-
"/a/b/c/x/z/i.cs"
190-
]);
158+
(var testSubject, var files) = TestSetup();
191159

192160
Environment.SetEnvironmentVariable("LGTM_INDEX_FILTERS", """
193161
include:c/**/i.*
@@ -211,14 +179,7 @@ public void TestFiltersWithIncludeExcludeComplexPatterns1()
211179
[Fact]
212180
public void TestFiltersWithIncludeExcludeComplexPatterns2()
213181
{
214-
(var testSubject, var files) = TestSetup("/a/b",
215-
[
216-
"/a/b/c/d/e/f.cs",
217-
"/a/b/c/d/e/g.cs",
218-
"/a/b/c/d/e/h.cs",
219-
"/a/b/c/x/y/i.cs",
220-
"/a/b/c/x/z/i.cs"
221-
]);
182+
(var testSubject, var files) = TestSetup();
222183

223184
Environment.SetEnvironmentVariable("LGTM_INDEX_FILTERS", """
224185
include:**/i.*

0 commit comments

Comments
 (0)