From ab336f2c8799955fe3ea8d98db88c004d337fe54 Mon Sep 17 00:00:00 2001 From: Gijs de Jong Date: Mon, 27 Feb 2023 14:23:41 +0100 Subject: [PATCH] Flatten package structure --- testng-junit-migrator/README.md | 2 +- .../argument => }/DataProviderArgumentMigrator.java | 6 ++---- .../testngjunit/{migrators => }/DataProviderMigrator.java | 4 ++-- .../argument => }/DescriptionArgumentMigrator.java | 6 ++---- .../argument => }/ExpectedExceptionsArgumentMigrator.java | 6 ++---- .../java/tech/picnic/errorprone/testngjunit/Migrator.java | 2 +- .../{migrators/argument => }/PriorityArgumentMigrator.java | 6 ++---- .../errorprone/testngjunit/SupportedArgumentKind.java | 4 ---- .../picnic/errorprone/testngjunit/TestNGJUnitMigration.java | 1 - .../tech/picnic/errorprone/testngjunit/TestNGMatchers.java | 2 +- .../tech/picnic/errorprone/testngjunit/TestNGMetadata.java | 2 +- .../tech/picnic/errorprone/testngjunit/TestNGScanner.java | 1 - 12 files changed, 14 insertions(+), 28 deletions(-) rename testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/{migrators/argument => }/DataProviderArgumentMigrator.java (88%) rename testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/{migrators => }/DataProviderMigrator.java (98%) rename testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/{migrators/argument => }/DescriptionArgumentMigrator.java (82%) rename testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/{migrators/argument => }/ExpectedExceptionsArgumentMigrator.java (93%) rename testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/{migrators/argument => }/PriorityArgumentMigrator.java (85%) diff --git a/testng-junit-migrator/README.md b/testng-junit-migrator/README.md index e4ab61126ee..67198b2e87f 100644 --- a/testng-junit-migrator/README.md +++ b/testng-junit-migrator/README.md @@ -103,4 +103,4 @@ This script will: 2. Add the required `JUnit` dependencies to your `pom.xml` 3. Run the `testng-to-junit` migration 4. Run the migrated JUnit tests and count the number of completed tests -5. Display the difference in the amount of completed tests. \ No newline at end of file +5. Display the difference in the amount of completed tests. diff --git a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/migrators/argument/DataProviderArgumentMigrator.java b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/DataProviderArgumentMigrator.java similarity index 88% rename from testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/migrators/argument/DataProviderArgumentMigrator.java rename to testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/DataProviderArgumentMigrator.java index 00aacd544ad..e376fd5a06e 100644 --- a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/migrators/argument/DataProviderArgumentMigrator.java +++ b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/DataProviderArgumentMigrator.java @@ -1,4 +1,4 @@ -package tech.picnic.errorprone.testngjunit.migrators.argument; +package tech.picnic.errorprone.testngjunit; import com.google.errorprone.VisitorState; import com.google.errorprone.annotations.Immutable; @@ -10,12 +10,10 @@ import com.sun.source.tree.Tree; import java.util.Optional; import tech.picnic.errorprone.bugpatterns.util.SourceCode; -import tech.picnic.errorprone.testngjunit.Migrator; -import tech.picnic.errorprone.testngjunit.TestNGMetadata; /** An {@link Migrator} that migrates the {@code dataProvider} argument. */ @Immutable -public final class DataProviderArgumentMigrator implements Migrator { +final class DataProviderArgumentMigrator implements Migrator { @Override public Optional createFix( ClassTree classTree, MethodTree methodTree, ExpressionTree dataValue, VisitorState state) { diff --git a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/migrators/DataProviderMigrator.java b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/DataProviderMigrator.java similarity index 98% rename from testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/migrators/DataProviderMigrator.java rename to testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/DataProviderMigrator.java index 27ead4c9a43..5ab1445b2c8 100644 --- a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/migrators/DataProviderMigrator.java +++ b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/DataProviderMigrator.java @@ -1,4 +1,4 @@ -package tech.picnic.errorprone.testngjunit.migrators; +package tech.picnic.errorprone.testngjunit; import static com.sun.source.tree.Tree.Kind.NEW_ARRAY; import static java.util.stream.Collectors.joining; @@ -23,7 +23,7 @@ import tech.picnic.errorprone.bugpatterns.util.SourceCode; /** A helper class that migrates a TestNG {@code DataProvider} to a JUnit {@code MethodSource}. */ -public final class DataProviderMigrator { +final class DataProviderMigrator { /** * Create the {@link SuggestedFix} required to migrate a TestNG {@code DataProvider} to a JUnit * {@code MethodSource}. diff --git a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/migrators/argument/DescriptionArgumentMigrator.java b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/DescriptionArgumentMigrator.java similarity index 82% rename from testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/migrators/argument/DescriptionArgumentMigrator.java rename to testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/DescriptionArgumentMigrator.java index 1e28f49f03b..0f91caa6f8c 100644 --- a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/migrators/argument/DescriptionArgumentMigrator.java +++ b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/DescriptionArgumentMigrator.java @@ -1,4 +1,4 @@ -package tech.picnic.errorprone.testngjunit.migrators.argument; +package tech.picnic.errorprone.testngjunit; import com.google.errorprone.VisitorState; import com.google.errorprone.annotations.Immutable; @@ -8,12 +8,10 @@ import com.sun.source.tree.MethodTree; import java.util.Optional; import tech.picnic.errorprone.bugpatterns.util.SourceCode; -import tech.picnic.errorprone.testngjunit.Migrator; -import tech.picnic.errorprone.testngjunit.TestNGMetadata; /** An {@link Migrator} that migrates the {@code description} argument. */ @Immutable -public final class DescriptionArgumentMigrator implements Migrator { +final class DescriptionArgumentMigrator implements Migrator { @Override public Optional createFix( ClassTree classTree, MethodTree methodTree, ExpressionTree dataValue, VisitorState state) { diff --git a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/migrators/argument/ExpectedExceptionsArgumentMigrator.java b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/ExpectedExceptionsArgumentMigrator.java similarity index 93% rename from testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/migrators/argument/ExpectedExceptionsArgumentMigrator.java rename to testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/ExpectedExceptionsArgumentMigrator.java index 599f0c8b0b3..6284d2638d5 100644 --- a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/migrators/argument/ExpectedExceptionsArgumentMigrator.java +++ b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/ExpectedExceptionsArgumentMigrator.java @@ -1,4 +1,4 @@ -package tech.picnic.errorprone.testngjunit.migrators.argument; +package tech.picnic.errorprone.testngjunit; import static com.google.auto.common.MoreStreams.toImmutableList; import static com.sun.source.tree.Tree.Kind.MEMBER_SELECT; @@ -15,12 +15,10 @@ import com.sun.source.tree.NewArrayTree; import java.util.Optional; import tech.picnic.errorprone.bugpatterns.util.SourceCode; -import tech.picnic.errorprone.testngjunit.Migrator; -import tech.picnic.errorprone.testngjunit.TestNGMetadata; /** An {@link Migrator} that migrates the {@code expectedExceptions} argument. */ @Immutable -public final class ExpectedExceptionsArgumentMigrator implements Migrator { +final class ExpectedExceptionsArgumentMigrator implements Migrator { @Override public Optional createFix( ClassTree classTree, MethodTree methodTree, ExpressionTree dataValue, VisitorState state) { diff --git a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/Migrator.java b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/Migrator.java index bd13f98da72..dc2a0cb9cae 100644 --- a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/Migrator.java +++ b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/Migrator.java @@ -30,7 +30,7 @@ * {@code Test} annotation to JUnit. */ @Immutable -public interface Migrator { +interface Migrator { /** * Attempt to create a {@link SuggestedFix}. * diff --git a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/migrators/argument/PriorityArgumentMigrator.java b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/PriorityArgumentMigrator.java similarity index 85% rename from testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/migrators/argument/PriorityArgumentMigrator.java rename to testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/PriorityArgumentMigrator.java index 34857ea6e7f..3959f1bc67d 100644 --- a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/migrators/argument/PriorityArgumentMigrator.java +++ b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/PriorityArgumentMigrator.java @@ -1,4 +1,4 @@ -package tech.picnic.errorprone.testngjunit.migrators.argument; +package tech.picnic.errorprone.testngjunit; import com.google.errorprone.VisitorState; import com.google.errorprone.annotations.Immutable; @@ -8,12 +8,10 @@ import com.sun.source.tree.MethodTree; import java.util.Optional; import tech.picnic.errorprone.bugpatterns.util.SourceCode; -import tech.picnic.errorprone.testngjunit.Migrator; -import tech.picnic.errorprone.testngjunit.TestNGMetadata; /** An {@link Migrator} that migrates the {@code priority} argument. */ @Immutable -public final class PriorityArgumentMigrator implements Migrator { +final class PriorityArgumentMigrator implements Migrator { @Override public Optional createFix( ClassTree classTree, MethodTree methodTree, ExpressionTree dataValue, VisitorState state) { diff --git a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/SupportedArgumentKind.java b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/SupportedArgumentKind.java index d9a9f732e06..4459b90b5e3 100644 --- a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/SupportedArgumentKind.java +++ b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/SupportedArgumentKind.java @@ -3,10 +3,6 @@ import static java.util.Arrays.stream; import java.util.Optional; -import tech.picnic.errorprone.testngjunit.migrators.argument.DataProviderArgumentMigrator; -import tech.picnic.errorprone.testngjunit.migrators.argument.DescriptionArgumentMigrator; -import tech.picnic.errorprone.testngjunit.migrators.argument.ExpectedExceptionsArgumentMigrator; -import tech.picnic.errorprone.testngjunit.migrators.argument.PriorityArgumentMigrator; /** The annotation argument kinds that are supported by the TestNG -> JUnit migration. */ enum SupportedArgumentKind { diff --git a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/TestNGJUnitMigration.java b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/TestNGJUnitMigration.java index 69df58f2ec7..f6cfbdc19f1 100644 --- a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/TestNGJUnitMigration.java +++ b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/TestNGJUnitMigration.java @@ -23,7 +23,6 @@ import java.util.Optional; import org.jspecify.annotations.Nullable; import tech.picnic.errorprone.testngjunit.TestNGMetadata.AnnotationMetadata; -import tech.picnic.errorprone.testngjunit.migrators.DataProviderMigrator; /** * A {@link BugChecker} that migrates TestNG unit tests to JUnit 5. diff --git a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/TestNGMatchers.java b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/TestNGMatchers.java index fea7c572007..b076398b98a 100644 --- a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/TestNGMatchers.java +++ b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/TestNGMatchers.java @@ -16,7 +16,7 @@ *

These constants and methods are additions to the ones found in {@link * com.google.errorprone.matchers.TestNgMatchers}. */ -public final class TestNGMatchers { +final class TestNGMatchers { /** * Matches the TestNG {@code Test} annotation specifically. As {@link * com.google.errorprone.matchers.TestNgMatchers#hasTestNgAnnotation(ClassTree)} also other TestNG diff --git a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/TestNGMetadata.java b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/TestNGMetadata.java index f33c36f0f34..9feb145bcd0 100644 --- a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/TestNGMetadata.java +++ b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/TestNGMetadata.java @@ -19,7 +19,7 @@ * TestNGJUnitMigration}. */ @AutoValue -public abstract class TestNGMetadata { +abstract class TestNGMetadata { abstract ClassTree getClassTree(); abstract Optional getClassLevelAnnotationMetadata(); diff --git a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/TestNGScanner.java b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/TestNGScanner.java index d807a75ac8e..73fe7c7acb2 100644 --- a/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/TestNGScanner.java +++ b/testng-junit-migrator/src/main/java/tech/picnic/errorprone/testngjunit/TestNGScanner.java @@ -16,7 +16,6 @@ import com.sun.source.util.TreeScanner; import java.util.Optional; import org.jspecify.annotations.Nullable; -import tech.picnic.errorprone.testngjunit.migrators.DataProviderMigrator; /** * A {@link TreeScanner} which will scan a {@link com.sun.source.tree.CompilationUnitTree} and