Drop unnecessary BugCheckerRefactoringTestHelper file path prefixes (#248)

This commit is contained in:
Rick Ossendrijver
2022-09-27 14:22:52 +02:00
committed by GitHub
parent 7bef1c8e67
commit e37da2a1ed
19 changed files with 58 additions and 58 deletions

View File

@@ -120,7 +120,7 @@ final class AmbiguousJsonCreatorTest {
void replacement() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"import com.fasterxml.jackson.annotation.JsonCreator;",
"",
"enum A {",
@@ -132,7 +132,7 @@ final class AmbiguousJsonCreatorTest {
" }",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import com.fasterxml.jackson.annotation.JsonCreator;",
"",
"enum A {",

View File

@@ -73,7 +73,7 @@ final class AutowiredConstructorTest {
void replacement() {
refactoringTestHelper
.addInputLines(
"in/Container.java",
"Container.java",
"import org.springframework.beans.factory.annotation.Autowired;",
"",
"interface Container {",
@@ -89,7 +89,7 @@ final class AutowiredConstructorTest {
" }",
"}")
.addOutputLines(
"out/Container.java",
"Container.java",
"import org.springframework.beans.factory.annotation.Autowired;",
"",
"interface Container {",

View File

@@ -135,7 +135,7 @@ final class CanonicalAnnotationSyntaxTest {
void replacement() {
refactoringTestHelper
.addInputLines(
"in/pkg/A.java",
"pkg/A.java",
"package pkg;",
"",
"import pkg.A.Foo;",
@@ -206,7 +206,7 @@ final class CanonicalAnnotationSyntaxTest {
" A trailingComma3();",
"}")
.addOutputLines(
"out/pkg/A.java",
"pkg/A.java",
"package pkg;",
"",
"import pkg.A.Foo;",

View File

@@ -71,13 +71,13 @@ final class EmptyMethodTest {
void replacement() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"final class A {",
" void instanceMethod() {}",
"",
" static void staticMethod() {}",
"}")
.addOutputLines("out/A.java", "final class A {}")
.addOutputLines("A.java", "final class A {}")
.doTest(TestMode.TEXT_MATCH);
}
}

View File

@@ -44,13 +44,13 @@ final class ErrorProneTestHelperSourceFormatTest {
"",
" refactoringTestHelper",
" // BUG: Diagnostic contains: Test code should follow the Google Java style",
" .addInputLines(\"in/A.java\", \"class A { }\")",
" .addInputLines(\"A.java\", \"class A { }\")",
" // BUG: Diagnostic contains: Test code should follow the Google Java style",
" .addOutputLines(\"out/A.java\", \"class A { }\")",
" .addOutputLines(\"A.java\", \"class A { }\")",
" // BUG: Diagnostic contains: Test code should follow the Google Java style",
" .addInputLines(\"in/B.java\", \"import java.util.Map;\", \"\", \"class B {}\")",
" .addInputLines(\"B.java\", \"import java.util.Map;\", \"\", \"class B {}\")",
" // Unused import, but in an output file, so not flagged.",
" .addOutputLines(\"out/B.java\", \"import java.util.Map;\", \"\", \"class B {}\")",
" .addOutputLines(\"B.java\", \"import java.util.Map;\", \"\", \"class B {}\")",
" .doTest(TestMode.TEXT_MATCH);",
" }",
"}")
@@ -65,7 +65,7 @@ final class ErrorProneTestHelperSourceFormatTest {
*/
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"import com.google.errorprone.BugCheckerRefactoringTestHelper;",
"import com.google.errorprone.BugCheckerRefactoringTestHelper.TestMode;",
"import com.google.errorprone.CompilationTestHelper;",
@@ -90,14 +90,14 @@ final class ErrorProneTestHelperSourceFormatTest {
"",
" refactoringTestHelper",
" .addInputLines(",
" \"in/A.java\",",
" \"A.java\",",
" \"import java.util.Map;\",",
" \"import java.util.Collection;\",",
" \"import java.util.List;\",",
" \"\",",
" \"interface A extends List<A>, Map<A,A> { }\")",
" .addOutputLines(",
" \"out/A.java\",",
" \"A.java\",",
" \"import java.util.Map;\",",
" \"import java.util.Collection;\",",
" \"import java.util.List;\",",
@@ -107,7 +107,7 @@ final class ErrorProneTestHelperSourceFormatTest {
" }",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import com.google.errorprone.BugCheckerRefactoringTestHelper;",
"import com.google.errorprone.BugCheckerRefactoringTestHelper.TestMode;",
"import com.google.errorprone.CompilationTestHelper;",
@@ -131,13 +131,13 @@ final class ErrorProneTestHelperSourceFormatTest {
"",
" refactoringTestHelper",
" .addInputLines(",
" \"in/A.java\",",
" \"A.java\",",
" \"import java.util.List;\",",
" \"import java.util.Map;\",",
" \"\",",
" \"interface A extends List<A>, Map<A, A> {}\")",
" .addOutputLines(",
" \"out/A.java\",",
" \"A.java\",",
" \"import java.util.Collection;\",",
" \"import java.util.List;\",",
" \"import java.util.Map;\",",

View File

@@ -67,7 +67,7 @@ final class FluxFlatMapUsageTest {
refactoringTestHelper
.setFixChooser(FixChoosers.FIRST)
.addInputLines(
"in/A.java",
"A.java",
"import reactor.core.publisher.Flux;",
"",
"class A {",
@@ -77,7 +77,7 @@ final class FluxFlatMapUsageTest {
" }",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import reactor.core.publisher.Flux;",
"",
"class A {",
@@ -94,7 +94,7 @@ final class FluxFlatMapUsageTest {
refactoringTestHelper
.setFixChooser(FixChoosers.SECOND)
.addInputLines(
"in/A.java",
"A.java",
"import reactor.core.publisher.Flux;",
"",
"class A {",
@@ -106,7 +106,7 @@ final class FluxFlatMapUsageTest {
" }",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import reactor.core.publisher.Flux;",
"",
"class A {",

View File

@@ -311,7 +311,7 @@ final class FormatStringConcatenationTest {
void replacement() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"import static com.google.common.base.Preconditions.checkArgument;",
"import static org.assertj.core.api.Assertions.assertThat;",
"",
@@ -360,7 +360,7 @@ final class FormatStringConcatenationTest {
" }",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import static com.google.common.base.Preconditions.checkArgument;",
"import static org.assertj.core.api.Assertions.assertThat;",
"",

View File

@@ -308,7 +308,7 @@ final class JUnitMethodDeclarationTest {
void replacement() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"import static org.junit.jupiter.params.provider.Arguments.arguments;",
"",
"import org.junit.jupiter.api.AfterAll;",
@@ -363,7 +363,7 @@ final class JUnitMethodDeclarationTest {
" private void testClass() {}",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import static org.junit.jupiter.params.provider.Arguments.arguments;",
"",
"import org.junit.jupiter.api.AfterAll;",

View File

@@ -167,7 +167,7 @@ final class LexicographicalAnnotationAttributeListingTest {
void replacement() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"import static java.math.RoundingMode.DOWN;",
"import static java.math.RoundingMode.UP;",
"",
@@ -204,7 +204,7 @@ final class LexicographicalAnnotationAttributeListingTest {
" A unsortedInnderAnns();",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import static java.math.RoundingMode.DOWN;",
"import static java.math.RoundingMode.UP;",
"",

View File

@@ -114,7 +114,7 @@ final class LexicographicalAnnotationListingTest {
void replacement() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"import java.lang.annotation.Repeatable;",
"",
"interface A {",
@@ -176,7 +176,7 @@ final class LexicographicalAnnotationListingTest {
" A unsortedRepeatableAnnotation();",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import java.lang.annotation.Repeatable;",
"",
"interface A {",

View File

@@ -325,7 +325,7 @@ final class MethodReferenceUsageTest {
void replacement() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"import static java.util.Collections.emptyList;",
"",
"import java.util.Collections;",
@@ -378,7 +378,7 @@ final class MethodReferenceUsageTest {
" }",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import static java.util.Collections.emptyList;",
"",
"import java.util.Collections;",

View File

@@ -57,7 +57,7 @@ final class MockitoStubbingTest {
void replacement() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"import static org.mockito.ArgumentMatchers.eq;",
"import static org.mockito.Mockito.doAnswer;",
"import static org.mockito.Mockito.mock;",
@@ -80,7 +80,7 @@ final class MockitoStubbingTest {
" }",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import static org.mockito.ArgumentMatchers.eq;",
"import static org.mockito.Mockito.doAnswer;",
"import static org.mockito.Mockito.mock;",

View File

@@ -499,7 +499,7 @@ final class PrimitiveComparisonTest {
void replacementWithPrimitiveVariants() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"import java.util.Comparator;",
"",
"interface A extends Comparable<A> {",
@@ -536,7 +536,7 @@ final class PrimitiveComparisonTest {
" }",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import java.util.Comparator;",
"",
"interface A extends Comparable<A> {",
@@ -579,7 +579,7 @@ final class PrimitiveComparisonTest {
void replacementWithBoxedVariants() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"import java.util.Comparator;",
"",
"interface A extends Comparable<A> {",
@@ -609,7 +609,7 @@ final class PrimitiveComparisonTest {
" }",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import java.util.Comparator;",
"",
"interface A extends Comparable<A> {",
@@ -645,7 +645,7 @@ final class PrimitiveComparisonTest {
void replacementWithPrimitiveVariantsUsingStaticImports() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"import static java.util.Comparator.comparing;",
"",
"import java.util.Comparator;",
@@ -660,7 +660,7 @@ final class PrimitiveComparisonTest {
" Comparator<A> dCmp = comparing(o -> 0.0);",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import static java.util.Comparator.comparing;",
"import static java.util.Comparator.comparingDouble;",
"import static java.util.Comparator.comparingInt;",
@@ -684,7 +684,7 @@ final class PrimitiveComparisonTest {
void replacementWithBoxedVariantsUsingStaticImports() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"import static java.util.Comparator.comparingDouble;",
"import static java.util.Comparator.comparingInt;",
"import static java.util.Comparator.comparingLong;",
@@ -701,7 +701,7 @@ final class PrimitiveComparisonTest {
" Comparator<A> dCmp = comparingDouble(o -> Double.valueOf(0));",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import static java.util.Comparator.comparing;",
"import static java.util.Comparator.comparingDouble;",
"import static java.util.Comparator.comparingInt;",
@@ -725,7 +725,7 @@ final class PrimitiveComparisonTest {
void replacementWithPrimitiveVariantsInComplexSyntacticalContext() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"import java.util.Comparator;",
"",
"interface A extends Comparable<A> {",
@@ -738,7 +738,7 @@ final class PrimitiveComparisonTest {
" Comparator<A> dCmp = Comparator.<A, A>comparing(o -> o).thenComparing(o -> 0.0);",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import java.util.Comparator;",
"",
"interface A extends Comparable<A> {",
@@ -757,7 +757,7 @@ final class PrimitiveComparisonTest {
void replacementWithBoxedVariantsInComplexSyntacticalContext() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"import java.util.Comparator;",
"",
"interface A extends Comparable<A> {",
@@ -775,7 +775,7 @@ final class PrimitiveComparisonTest {
" Comparator.<A, A>comparing(o -> o).thenComparingDouble(o -> Double.valueOf(0));",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import java.util.Comparator;",
"",
"interface A extends Comparable<A> {",

View File

@@ -511,7 +511,7 @@ final class RedundantStringConversionTest {
void replacement() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"class A {",
" private final Object o = new Object();",
" private final String s = o.toString();",
@@ -525,7 +525,7 @@ final class RedundantStringConversionTest {
" }",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"class A {",
" private final Object o = new Object();",
" private final String s = o.toString();",

View File

@@ -40,7 +40,7 @@ final class RefasterAnyOfUsageTest {
void replacement() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"import com.google.errorprone.refaster.Refaster;",
"import com.google.errorprone.refaster.annotation.BeforeTemplate;",
"",
@@ -52,7 +52,7 @@ final class RefasterAnyOfUsageTest {
" }",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import com.google.errorprone.refaster.Refaster;",
"import com.google.errorprone.refaster.annotation.BeforeTemplate;",
"",

View File

@@ -47,7 +47,7 @@ final class ScheduledTransactionTraceTest {
void replacement() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"import com.newrelic.api.agent.Trace;",
"import org.springframework.scheduling.annotation.Scheduled;",
"",
@@ -68,7 +68,7 @@ final class ScheduledTransactionTraceTest {
" void scheduledButImproperlyTraced3() {}",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import com.newrelic.api.agent.Trace;",
"import org.springframework.scheduling.annotation.Scheduled;",
"",

View File

@@ -98,7 +98,7 @@ final class Slf4JLogStatementTest {
void replacement() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"import org.slf4j.Logger;",
"import org.slf4j.LoggerFactory;",
"import org.slf4j.Marker;",
@@ -121,7 +121,7 @@ final class Slf4JLogStatementTest {
" }",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import org.slf4j.Logger;",
"import org.slf4j.LoggerFactory;",
"import org.slf4j.Marker;",

View File

@@ -87,7 +87,7 @@ final class SpringMvcAnnotationTest {
void replacement() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"import static org.springframework.web.bind.annotation.RequestMethod.PATCH;",
"import static org.springframework.web.bind.annotation.RequestMethod.POST;",
"import static org.springframework.web.bind.annotation.RequestMethod.PUT;",
@@ -117,7 +117,7 @@ final class SpringMvcAnnotationTest {
" A curly();",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import static org.springframework.web.bind.annotation.RequestMethod.PATCH;",
"import static org.springframework.web.bind.annotation.RequestMethod.POST;",
"import static org.springframework.web.bind.annotation.RequestMethod.PUT;",

View File

@@ -120,7 +120,7 @@ final class StaticImportTest {
void replacement() {
refactoringTestHelper
.addInputLines(
"in/A.java",
"A.java",
"import static java.util.function.Predicate.not;",
"",
"import com.google.common.base.Predicates;",
@@ -190,7 +190,7 @@ final class StaticImportTest {
" final class Test {}",
"}")
.addOutputLines(
"out/A.java",
"A.java",
"import static com.google.common.collect.ImmutableMap.toImmutableMap;",
"import static com.google.common.collect.ImmutableSet.toImmutableSet;",
"import static com.google.errorprone.BugPattern.LinkType.NONE;",