Skip to content

Commit 50d0983

Browse files
graememorganError Prone Team
graememorgan
authored and
Error Prone Team
committed
Add some missing testdata/ prefixes.
This supports removing the hack of checking both paths. PiperOrigin-RevId: 678280454
1 parent f82fb66 commit 50d0983

File tree

148 files changed

+609
-398
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+609
-398
lines changed

‎core/src/test/java/com/google/errorprone/CommandLineFlagTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public void canPromoteToError() {
170170
ErrorProneTestCompiler compiler =
171171
builder.report(ScannerSupplier.fromBugCheckerClasses(WarningChecker.class)).build();
172172
ImmutableList<JavaFileObject> sources =
173-
forResources(getClass(), "CommandLineFlagTestFile.java");
173+
forResources(getClass(), "testdata/CommandLineFlagTestFile.java");
174174

175175
Result exitCode = compiler.compile(sources);
176176
assertThat(exitCode).isEqualTo(Result.OK);
@@ -185,7 +185,7 @@ public void canDemoteToWarning() {
185185
ErrorProneTestCompiler compiler =
186186
builder.report(ScannerSupplier.fromBugCheckerClasses(ErrorChecker.class)).build();
187187
ImmutableList<JavaFileObject> sources =
188-
forResources(getClass(), "CommandLineFlagTestFile.java");
188+
forResources(getClass(), "testdata/CommandLineFlagTestFile.java");
189189

190190
Result exitCode = compiler.compile(sources);
191191
assertThat(exitCode).isEqualTo(Result.ERROR);
@@ -201,7 +201,7 @@ public void canDisable() {
201201
ErrorProneTestCompiler compiler =
202202
builder.report(ScannerSupplier.fromBugCheckerClasses(DisableableChecker.class)).build();
203203
ImmutableList<JavaFileObject> sources =
204-
forResources(getClass(), "CommandLineFlagTestFile.java");
204+
forResources(getClass(), "testdata/CommandLineFlagTestFile.java");
205205

206206
Result exitCode = compiler.compile(sources);
207207
assertThat(exitCode).isEqualTo(Result.ERROR);
@@ -217,7 +217,7 @@ public void cantDisableNondisableableCheck() {
217217
ErrorProneTestCompiler compiler =
218218
builder.report(ScannerSupplier.fromBugCheckerClasses(NondisableableChecker.class)).build();
219219
ImmutableList<JavaFileObject> sources =
220-
forResources(getClass(), "CommandLineFlagTestFile.java");
220+
forResources(getClass(), "testdata/CommandLineFlagTestFile.java");
221221

222222
InvalidCommandLineOptionException expected =
223223
assertThrows(
@@ -230,7 +230,7 @@ public void cantDisableNondisableableCheck() {
230230
public void cantOverrideNonexistentCheck() {
231231
ErrorProneTestCompiler compiler = builder.build();
232232
ImmutableList<JavaFileObject> sources =
233-
forResources(getClass(), "CommandLineFlagTestFile.java");
233+
forResources(getClass(), "testdata/CommandLineFlagTestFile.java");
234234
List<String> badOptions =
235235
Arrays.asList(
236236
"-Xep:BogusChecker:ERROR",
@@ -251,7 +251,7 @@ public void cantOverrideNonexistentCheck() {
251251
public void ignoreUnknownChecksFlagAllowsOverridingUnknownCheck() {
252252
ErrorProneTestCompiler compiler = builder.build();
253253
ImmutableList<JavaFileObject> sources =
254-
forResources(getClass(), "CommandLineFlagTestFile.java");
254+
forResources(getClass(), "testdata/CommandLineFlagTestFile.java");
255255
List<String> badOptions =
256256
Arrays.asList(
257257
"-Xep:BogusChecker:ERROR",

‎core/src/test/java/com/google/errorprone/bugpatterns/ArrayEqualsTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,21 @@ public class ArrayEqualsTest {
3232

3333
@Test
3434
public void positiveCase() {
35-
compilationHelper.addSourceFile("ArrayEqualsPositiveCases.java").doTest();
35+
compilationHelper.addSourceFile("testdata/ArrayEqualsPositiveCases.java").doTest();
3636
}
3737

3838
@Test
3939
public void java7PositiveCase() {
40-
compilationHelper.addSourceFile("ArrayEqualsPositiveCases2.java").doTest();
40+
compilationHelper.addSourceFile("testdata/ArrayEqualsPositiveCases2.java").doTest();
4141
}
4242

4343
@Test
4444
public void negativeCase() {
45-
compilationHelper.addSourceFile("ArrayEqualsNegativeCases.java").doTest();
45+
compilationHelper.addSourceFile("testdata/ArrayEqualsNegativeCases.java").doTest();
4646
}
4747

4848
@Test
4949
public void java7NegativeCase() {
50-
compilationHelper.addSourceFile("ArrayEqualsNegativeCases2.java").doTest();
50+
compilationHelper.addSourceFile("testdata/ArrayEqualsNegativeCases2.java").doTest();
5151
}
5252
}

‎core/src/test/java/com/google/errorprone/bugpatterns/ArrayHashCodeTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ public class ArrayHashCodeTest {
3232

3333
@Test
3434
public void positiveCase() {
35-
compilationHelper.addSourceFile("ArrayHashCodePositiveCases.java").doTest();
35+
compilationHelper.addSourceFile("testdata/ArrayHashCodePositiveCases.java").doTest();
3636
}
3737

3838
@Test
3939
public void negativeCase() {
40-
compilationHelper.addSourceFile("ArrayHashCodeNegativeCases.java").doTest();
40+
compilationHelper.addSourceFile("testdata/ArrayHashCodeNegativeCases.java").doTest();
4141
}
4242

4343
/** Tests java.util.Objects hashCode methods, which are only in JDK 7 and above. */
4444
@Test
4545
public void java7NegativeCase() {
46-
compilationHelper.addSourceFile("ArrayHashCodeNegativeCases2.java").doTest();
46+
compilationHelper.addSourceFile("testdata/ArrayHashCodeNegativeCases2.java").doTest();
4747
}
4848
}

‎core/src/test/java/com/google/errorprone/bugpatterns/ArrayToStringTest.java‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ public class ArrayToStringTest {
3434

3535
@Test
3636
public void positiveCase() {
37-
compilationHelper.addSourceFile("ArrayToStringPositiveCases.java").doTest();
37+
compilationHelper.addSourceFile("testdata/ArrayToStringPositiveCases.java").doTest();
3838
}
3939

4040
@Test
4141
public void negativeCase() {
42-
compilationHelper.addSourceFile("ArrayToStringNegativeCases.java").doTest();
42+
compilationHelper.addSourceFile("testdata/ArrayToStringNegativeCases.java").doTest();
4343
}
4444

4545
@Test
@@ -194,22 +194,30 @@ void test(Exception e) {
194194

195195
@Test
196196
public void positiveCompoundAssignment() {
197-
compilationHelper.addSourceFile("ArrayToStringCompoundAssignmentPositiveCases.java").doTest();
197+
compilationHelper
198+
.addSourceFile("testdata/ArrayToStringCompoundAssignmentPositiveCases.java")
199+
.doTest();
198200
}
199201

200202
@Test
201203
public void negativeCompoundAssignment() {
202-
compilationHelper.addSourceFile("ArrayToStringCompoundAssignmentNegativeCases.java").doTest();
204+
compilationHelper
205+
.addSourceFile("testdata/ArrayToStringCompoundAssignmentNegativeCases.java")
206+
.doTest();
203207
}
204208

205209
@Test
206210
public void positiveConcat() {
207-
compilationHelper.addSourceFile("ArrayToStringConcatenationPositiveCases.java").doTest();
211+
compilationHelper
212+
.addSourceFile("testdata/ArrayToStringConcatenationPositiveCases.java")
213+
.doTest();
208214
}
209215

210216
@Test
211217
public void negativeConcat() {
212-
compilationHelper.addSourceFile("ArrayToStringConcatenationNegativeCases.java").doTest();
218+
compilationHelper
219+
.addSourceFile("testdata/ArrayToStringConcatenationNegativeCases.java")
220+
.doTest();
213221
}
214222

215223
@Test

‎core/src/test/java/com/google/errorprone/bugpatterns/AssertFalseTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ public class AssertFalseTest {
3232

3333
@Test
3434
public void negativeCase() {
35-
compilationHelper.addSourceFile("AssertFalseNegativeCases.java").doTest();
35+
compilationHelper.addSourceFile("testdata/AssertFalseNegativeCases.java").doTest();
3636
}
3737

3838
@Test
3939
public void positiveCase() {
40-
compilationHelper.addSourceFile("AssertFalsePositiveCases.java").doTest();
40+
compilationHelper.addSourceFile("testdata/AssertFalsePositiveCases.java").doTest();
4141
}
4242
}

‎core/src/test/java/com/google/errorprone/bugpatterns/AsyncFunctionReturnsNullTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ public class AsyncFunctionReturnsNullTest {
2929

3030
@Test
3131
public void positiveCase() {
32-
compilationHelper.addSourceFile("AsyncFunctionReturnsNullPositiveCases.java").doTest();
32+
compilationHelper.addSourceFile("testdata/AsyncFunctionReturnsNullPositiveCases.java").doTest();
3333
}
3434

3535
@Test
3636
public void negativeCase() {
37-
compilationHelper.addSourceFile("AsyncFunctionReturnsNullNegativeCases.java").doTest();
37+
compilationHelper.addSourceFile("testdata/AsyncFunctionReturnsNullNegativeCases.java").doTest();
3838
}
3939
}

‎core/src/test/java/com/google/errorprone/bugpatterns/BadComparableTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ public class BadComparableTest {
3131

3232
@Test
3333
public void positiveCase() {
34-
compilationHelper.addSourceFile("BadComparablePositiveCases.java").doTest();
34+
compilationHelper.addSourceFile("testdata/BadComparablePositiveCases.java").doTest();
3535
}
3636

3737
@Test
3838
public void negativeCase() {
39-
compilationHelper.addSourceFile("BadComparableNegativeCases.java").doTest();
39+
compilationHelper.addSourceFile("testdata/BadComparableNegativeCases.java").doTest();
4040
}
4141
}

‎core/src/test/java/com/google/errorprone/bugpatterns/BadImportTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ void foo() {
181181

182182
@Test
183183
public void positive_nested() {
184-
compilationTestHelper.addSourceFile("BadImportPositiveCases.java").doTest();
184+
compilationTestHelper.addSourceFile("testdata/BadImportPositiveCases.java").doTest();
185185
}
186186

187187
@Test
@@ -262,7 +262,7 @@ static class B {}
262262

263263
@Test
264264
public void negative_nested() {
265-
compilationTestHelper.addSourceFile("BadImportNegativeCases.java").doTest();
265+
compilationTestHelper.addSourceFile("testdata/BadImportNegativeCases.java").doTest();
266266
}
267267

268268
@Test
@@ -284,8 +284,8 @@ public void negative_badImportIsTopLevelClass() {
284284
@Test
285285
public void nestedFixes() {
286286
refactoringTestHelper
287-
.addInput("BadImportPositiveCases.java")
288-
.addOutput("BadImportPositiveCases_expected.java")
287+
.addInput("testdata/BadImportPositiveCases.java")
288+
.addOutput("testdata/BadImportPositiveCases_expected.java")
289289
.doTest(TestMode.AST_MATCH);
290290
}
291291

‎core/src/test/java/com/google/errorprone/bugpatterns/BadShiftAmountTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ public class BadShiftAmountTest {
3232

3333
@Test
3434
public void positiveCase() {
35-
compilationHelper.addSourceFile("BadShiftAmountPositiveCases.java").doTest();
35+
compilationHelper.addSourceFile("testdata/BadShiftAmountPositiveCases.java").doTest();
3636
}
3737

3838
@Test
3939
public void negativeCase() {
40-
compilationHelper.addSourceFile("BadShiftAmountNegativeCases.java").doTest();
40+
compilationHelper.addSourceFile("testdata/BadShiftAmountNegativeCases.java").doTest();
4141
}
4242
}

‎core/src/test/java/com/google/errorprone/bugpatterns/BanClassLoaderTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ public class BanClassLoaderTest {
3333

3434
@Test
3535
public void positiveCase() {
36-
compilationHelper.addSourceFile("BanClassLoaderPositiveCases.java").doTest();
36+
compilationHelper.addSourceFile("testdata/BanClassLoaderPositiveCases.java").doTest();
3737
}
3838

3939
@Test
4040
public void negativeCase() {
41-
compilationHelper.addSourceFile("BanClassLoaderNegativeCases.java").doTest();
41+
compilationHelper.addSourceFile("testdata/BanClassLoaderNegativeCases.java").doTest();
4242
}
4343
}

0 commit comments

Comments
 (0)