From 6b52bc72d75f7f65fccc9363a89d6aa43b8c4506 Mon Sep 17 00:00:00 2001 From: Marcono1234 Date: Thu, 30 May 2024 23:37:10 +0200 Subject: [PATCH] Rename Maven integration test modules The new naming scheme `test-...` groups the modules in the file system and the IDE and therefore hopefully makes it easier to quickly see which modules are integration tests. --- .github/workflows/build.yml | 4 ++-- .github/workflows/check-android-compatibility.yml | 4 ++-- pom.xml | 6 +++--- .../README.md | 2 +- .../pom.xml | 2 +- .../google/gson/native_test/Java17RecordReflectionTest.java | 0 .../java/com/google/gson/native_test/ReflectionTest.java | 0 .../resources/META-INF/native-image/reflect-config.json | 0 {jpms-test => test-jpms}/README.md | 2 +- {jpms-test => test-jpms}/pom.xml | 2 +- {jpms-test => test-jpms}/src/main/java/module-info.java | 0 .../com/google/gson/jpms_test/ExportedPackagesTest.java | 0 .../src/test/java/com/google/gson/jpms_test/ModuleTest.java | 0 .../google/gson/jpms_test/ReflectionInaccessibleTest.java | 0 .../com/google/gson/jpms_test/opened/ReflectionTest.java | 0 {jpms-test => test-jpms}/src/test/java/module-info.java | 0 {shrinker-test => test-shrinker}/README.md | 2 +- {shrinker-test => test-shrinker}/common.pro | 0 {shrinker-test => test-shrinker}/pom.xml | 2 +- {shrinker-test => test-shrinker}/proguard.pro | 0 {shrinker-test => test-shrinker}/r8.pro | 0 .../src/main/java/com/example/ClassWithAdapter.java | 0 .../main/java/com/example/ClassWithExposeAnnotation.java | 0 .../main/java/com/example/ClassWithHasArgsConstructor.java | 0 .../java/com/example/ClassWithJsonAdapterAnnotation.java | 0 .../src/main/java/com/example/ClassWithNamedFields.java | 0 .../main/java/com/example/ClassWithNoArgsConstructor.java | 0 .../src/main/java/com/example/ClassWithSerializedName.java | 0 .../example/ClassWithUnreferencedHasArgsConstructor.java | 0 .../com/example/ClassWithUnreferencedNoArgsConstructor.java | 0 .../main/java/com/example/ClassWithVersionAnnotations.java | 0 .../src/main/java/com/example/EnumClass.java | 0 .../main/java/com/example/EnumClassWithSerializedName.java | 0 .../src/main/java/com/example/GenericClasses.java | 0 .../src/main/java/com/example/Main.java | 0 .../src/main/java/com/example/NoSerializedNameMain.java | 0 .../src/main/java/com/example/TestExecutor.java | 0 .../src/main/java/com/example/UnusedClass.java | 0 .../src/test/java/com/google/gson/it/ShrinkingIT.java | 0 39 files changed, 13 insertions(+), 13 deletions(-) rename {graal-native-image-test => test-graal-native-image}/README.md (98%) rename {graal-native-image-test => test-graal-native-image}/pom.xml (98%) rename {graal-native-image-test => test-graal-native-image}/src/test/java/com/google/gson/native_test/Java17RecordReflectionTest.java (100%) rename {graal-native-image-test => test-graal-native-image}/src/test/java/com/google/gson/native_test/ReflectionTest.java (100%) rename {graal-native-image-test => test-graal-native-image}/src/test/resources/META-INF/native-image/reflect-config.json (100%) rename {jpms-test => test-jpms}/README.md (96%) rename {jpms-test => test-jpms}/pom.xml (97%) rename {jpms-test => test-jpms}/src/main/java/module-info.java (100%) rename {jpms-test => test-jpms}/src/test/java/com/google/gson/jpms_test/ExportedPackagesTest.java (100%) rename {jpms-test => test-jpms}/src/test/java/com/google/gson/jpms_test/ModuleTest.java (100%) rename {jpms-test => test-jpms}/src/test/java/com/google/gson/jpms_test/ReflectionInaccessibleTest.java (100%) rename {jpms-test => test-jpms}/src/test/java/com/google/gson/jpms_test/opened/ReflectionTest.java (100%) rename {jpms-test => test-jpms}/src/test/java/module-info.java (100%) rename {shrinker-test => test-shrinker}/README.md (98%) rename {shrinker-test => test-shrinker}/common.pro (100%) rename {shrinker-test => test-shrinker}/pom.xml (99%) rename {shrinker-test => test-shrinker}/proguard.pro (100%) rename {shrinker-test => test-shrinker}/r8.pro (100%) rename {shrinker-test => test-shrinker}/src/main/java/com/example/ClassWithAdapter.java (100%) rename {shrinker-test => test-shrinker}/src/main/java/com/example/ClassWithExposeAnnotation.java (100%) rename {shrinker-test => test-shrinker}/src/main/java/com/example/ClassWithHasArgsConstructor.java (100%) rename {shrinker-test => test-shrinker}/src/main/java/com/example/ClassWithJsonAdapterAnnotation.java (100%) rename {shrinker-test => test-shrinker}/src/main/java/com/example/ClassWithNamedFields.java (100%) rename {shrinker-test => test-shrinker}/src/main/java/com/example/ClassWithNoArgsConstructor.java (100%) rename {shrinker-test => test-shrinker}/src/main/java/com/example/ClassWithSerializedName.java (100%) rename {shrinker-test => test-shrinker}/src/main/java/com/example/ClassWithUnreferencedHasArgsConstructor.java (100%) rename {shrinker-test => test-shrinker}/src/main/java/com/example/ClassWithUnreferencedNoArgsConstructor.java (100%) rename {shrinker-test => test-shrinker}/src/main/java/com/example/ClassWithVersionAnnotations.java (100%) rename {shrinker-test => test-shrinker}/src/main/java/com/example/EnumClass.java (100%) rename {shrinker-test => test-shrinker}/src/main/java/com/example/EnumClassWithSerializedName.java (100%) rename {shrinker-test => test-shrinker}/src/main/java/com/example/GenericClasses.java (100%) rename {shrinker-test => test-shrinker}/src/main/java/com/example/Main.java (100%) rename {shrinker-test => test-shrinker}/src/main/java/com/example/NoSerializedNameMain.java (100%) rename {shrinker-test => test-shrinker}/src/main/java/com/example/TestExecutor.java (100%) rename {shrinker-test => test-shrinker}/src/main/java/com/example/UnusedClass.java (100%) rename {shrinker-test => test-shrinker}/src/test/java/com/google/gson/it/ShrinkingIT.java (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 50f6b3d0d0..a70af06d59 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,9 +45,9 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} cache: 'maven' - name: Build and run tests - # Only run tests in `graal-native-image-test` (and implicitly build and run tests in `gson`), + # Only run tests in `test-graal-native-image` (and implicitly build and run tests in `gson`), # everything else is covered already by regular build job above - run: mvn test --batch-mode --no-transfer-progress --activate-profiles native-image-test --projects graal-native-image-test --also-make + run: mvn test --batch-mode --no-transfer-progress --activate-profiles native-image-test --projects test-graal-native-image --also-make verify-reproducible-build: name: "Verify reproducible build" diff --git a/.github/workflows/check-android-compatibility.yml b/.github/workflows/check-android-compatibility.yml index 939582e547..6c0b6da3b3 100644 --- a/.github/workflows/check-android-compatibility.yml +++ b/.github/workflows/check-android-compatibility.yml @@ -26,5 +26,5 @@ jobs: - name: Check Android compatibility run: | # Run 'test' phase because plugin normally expects to be executed after tests have been compiled - # Have to skip 'jpms-test' module because it requires that full Gson JAR has been built - mvn --batch-mode --no-transfer-progress test animal-sniffer:check@check-android-compatibility -DskipTests --projects '!jpms-test' + # Have to skip 'test-jpms' module because it requires that full Gson JAR has been built + mvn --batch-mode --no-transfer-progress test animal-sniffer:check@check-android-compatibility -DskipTests --projects '!test-jpms' diff --git a/pom.xml b/pom.xml index f755076592..4bf279f8b1 100644 --- a/pom.xml +++ b/pom.xml @@ -28,9 +28,9 @@ gson - jpms-test - graal-native-image-test - shrinker-test + test-jpms + test-graal-native-image + test-shrinker extras metrics proto diff --git a/graal-native-image-test/README.md b/test-graal-native-image/README.md similarity index 98% rename from graal-native-image-test/README.md rename to test-graal-native-image/README.md index b3b2b353c2..2c14d04132 100644 --- a/graal-native-image-test/README.md +++ b/test-graal-native-image/README.md @@ -1,4 +1,4 @@ -# graal-native-image-test +# test-graal-native-image This Maven module contains integration tests for using Gson in a GraalVM Native Image. diff --git a/graal-native-image-test/pom.xml b/test-graal-native-image/pom.xml similarity index 98% rename from graal-native-image-test/pom.xml rename to test-graal-native-image/pom.xml index 6f556c1ad6..66b18e2f1a 100644 --- a/graal-native-image-test/pom.xml +++ b/test-graal-native-image/pom.xml @@ -21,7 +21,7 @@ gson-parent 2.11.1-SNAPSHOT - graal-native-image-test + test-graal-native-image Test: GraalVM Native Image diff --git a/graal-native-image-test/src/test/java/com/google/gson/native_test/Java17RecordReflectionTest.java b/test-graal-native-image/src/test/java/com/google/gson/native_test/Java17RecordReflectionTest.java similarity index 100% rename from graal-native-image-test/src/test/java/com/google/gson/native_test/Java17RecordReflectionTest.java rename to test-graal-native-image/src/test/java/com/google/gson/native_test/Java17RecordReflectionTest.java diff --git a/graal-native-image-test/src/test/java/com/google/gson/native_test/ReflectionTest.java b/test-graal-native-image/src/test/java/com/google/gson/native_test/ReflectionTest.java similarity index 100% rename from graal-native-image-test/src/test/java/com/google/gson/native_test/ReflectionTest.java rename to test-graal-native-image/src/test/java/com/google/gson/native_test/ReflectionTest.java diff --git a/graal-native-image-test/src/test/resources/META-INF/native-image/reflect-config.json b/test-graal-native-image/src/test/resources/META-INF/native-image/reflect-config.json similarity index 100% rename from graal-native-image-test/src/test/resources/META-INF/native-image/reflect-config.json rename to test-graal-native-image/src/test/resources/META-INF/native-image/reflect-config.json diff --git a/jpms-test/README.md b/test-jpms/README.md similarity index 96% rename from jpms-test/README.md rename to test-jpms/README.md index c667c0dad1..b921c4edc5 100644 --- a/jpms-test/README.md +++ b/test-jpms/README.md @@ -1,4 +1,4 @@ -# jpms-test +# test-jpms This Maven module contains tests to verify that Gson's `module-info.class` which is used by the Java Platform Module System (JPMS) works properly and can be used by other projects. The module declaration file `src/test/java/module-info.java` uses Gson's module. diff --git a/jpms-test/pom.xml b/test-jpms/pom.xml similarity index 97% rename from jpms-test/pom.xml rename to test-jpms/pom.xml index 5589549ad1..06239433c7 100644 --- a/jpms-test/pom.xml +++ b/test-jpms/pom.xml @@ -21,7 +21,7 @@ gson-parent 2.11.1-SNAPSHOT - jpms-test + test-jpms Test: Java Platform Module System (JPMS) diff --git a/jpms-test/src/main/java/module-info.java b/test-jpms/src/main/java/module-info.java similarity index 100% rename from jpms-test/src/main/java/module-info.java rename to test-jpms/src/main/java/module-info.java diff --git a/jpms-test/src/test/java/com/google/gson/jpms_test/ExportedPackagesTest.java b/test-jpms/src/test/java/com/google/gson/jpms_test/ExportedPackagesTest.java similarity index 100% rename from jpms-test/src/test/java/com/google/gson/jpms_test/ExportedPackagesTest.java rename to test-jpms/src/test/java/com/google/gson/jpms_test/ExportedPackagesTest.java diff --git a/jpms-test/src/test/java/com/google/gson/jpms_test/ModuleTest.java b/test-jpms/src/test/java/com/google/gson/jpms_test/ModuleTest.java similarity index 100% rename from jpms-test/src/test/java/com/google/gson/jpms_test/ModuleTest.java rename to test-jpms/src/test/java/com/google/gson/jpms_test/ModuleTest.java diff --git a/jpms-test/src/test/java/com/google/gson/jpms_test/ReflectionInaccessibleTest.java b/test-jpms/src/test/java/com/google/gson/jpms_test/ReflectionInaccessibleTest.java similarity index 100% rename from jpms-test/src/test/java/com/google/gson/jpms_test/ReflectionInaccessibleTest.java rename to test-jpms/src/test/java/com/google/gson/jpms_test/ReflectionInaccessibleTest.java diff --git a/jpms-test/src/test/java/com/google/gson/jpms_test/opened/ReflectionTest.java b/test-jpms/src/test/java/com/google/gson/jpms_test/opened/ReflectionTest.java similarity index 100% rename from jpms-test/src/test/java/com/google/gson/jpms_test/opened/ReflectionTest.java rename to test-jpms/src/test/java/com/google/gson/jpms_test/opened/ReflectionTest.java diff --git a/jpms-test/src/test/java/module-info.java b/test-jpms/src/test/java/module-info.java similarity index 100% rename from jpms-test/src/test/java/module-info.java rename to test-jpms/src/test/java/module-info.java diff --git a/shrinker-test/README.md b/test-shrinker/README.md similarity index 98% rename from shrinker-test/README.md rename to test-shrinker/README.md index f9b674d143..b29e600b30 100644 --- a/shrinker-test/README.md +++ b/test-shrinker/README.md @@ -1,4 +1,4 @@ -# shrinker-test +# test-shrinker This Maven module contains integration tests which check the behavior of Gson when used in combination with code shrinking and obfuscation tools, such as ProGuard or R8. diff --git a/shrinker-test/common.pro b/test-shrinker/common.pro similarity index 100% rename from shrinker-test/common.pro rename to test-shrinker/common.pro diff --git a/shrinker-test/pom.xml b/test-shrinker/pom.xml similarity index 99% rename from shrinker-test/pom.xml rename to test-shrinker/pom.xml index 10ec6f1f1c..fab4baa298 100644 --- a/shrinker-test/pom.xml +++ b/test-shrinker/pom.xml @@ -22,7 +22,7 @@ gson-parent 2.11.1-SNAPSHOT - shrinker-test + test-shrinker Test: Code shrinking (ProGuard / R8) diff --git a/shrinker-test/proguard.pro b/test-shrinker/proguard.pro similarity index 100% rename from shrinker-test/proguard.pro rename to test-shrinker/proguard.pro diff --git a/shrinker-test/r8.pro b/test-shrinker/r8.pro similarity index 100% rename from shrinker-test/r8.pro rename to test-shrinker/r8.pro diff --git a/shrinker-test/src/main/java/com/example/ClassWithAdapter.java b/test-shrinker/src/main/java/com/example/ClassWithAdapter.java similarity index 100% rename from shrinker-test/src/main/java/com/example/ClassWithAdapter.java rename to test-shrinker/src/main/java/com/example/ClassWithAdapter.java diff --git a/shrinker-test/src/main/java/com/example/ClassWithExposeAnnotation.java b/test-shrinker/src/main/java/com/example/ClassWithExposeAnnotation.java similarity index 100% rename from shrinker-test/src/main/java/com/example/ClassWithExposeAnnotation.java rename to test-shrinker/src/main/java/com/example/ClassWithExposeAnnotation.java diff --git a/shrinker-test/src/main/java/com/example/ClassWithHasArgsConstructor.java b/test-shrinker/src/main/java/com/example/ClassWithHasArgsConstructor.java similarity index 100% rename from shrinker-test/src/main/java/com/example/ClassWithHasArgsConstructor.java rename to test-shrinker/src/main/java/com/example/ClassWithHasArgsConstructor.java diff --git a/shrinker-test/src/main/java/com/example/ClassWithJsonAdapterAnnotation.java b/test-shrinker/src/main/java/com/example/ClassWithJsonAdapterAnnotation.java similarity index 100% rename from shrinker-test/src/main/java/com/example/ClassWithJsonAdapterAnnotation.java rename to test-shrinker/src/main/java/com/example/ClassWithJsonAdapterAnnotation.java diff --git a/shrinker-test/src/main/java/com/example/ClassWithNamedFields.java b/test-shrinker/src/main/java/com/example/ClassWithNamedFields.java similarity index 100% rename from shrinker-test/src/main/java/com/example/ClassWithNamedFields.java rename to test-shrinker/src/main/java/com/example/ClassWithNamedFields.java diff --git a/shrinker-test/src/main/java/com/example/ClassWithNoArgsConstructor.java b/test-shrinker/src/main/java/com/example/ClassWithNoArgsConstructor.java similarity index 100% rename from shrinker-test/src/main/java/com/example/ClassWithNoArgsConstructor.java rename to test-shrinker/src/main/java/com/example/ClassWithNoArgsConstructor.java diff --git a/shrinker-test/src/main/java/com/example/ClassWithSerializedName.java b/test-shrinker/src/main/java/com/example/ClassWithSerializedName.java similarity index 100% rename from shrinker-test/src/main/java/com/example/ClassWithSerializedName.java rename to test-shrinker/src/main/java/com/example/ClassWithSerializedName.java diff --git a/shrinker-test/src/main/java/com/example/ClassWithUnreferencedHasArgsConstructor.java b/test-shrinker/src/main/java/com/example/ClassWithUnreferencedHasArgsConstructor.java similarity index 100% rename from shrinker-test/src/main/java/com/example/ClassWithUnreferencedHasArgsConstructor.java rename to test-shrinker/src/main/java/com/example/ClassWithUnreferencedHasArgsConstructor.java diff --git a/shrinker-test/src/main/java/com/example/ClassWithUnreferencedNoArgsConstructor.java b/test-shrinker/src/main/java/com/example/ClassWithUnreferencedNoArgsConstructor.java similarity index 100% rename from shrinker-test/src/main/java/com/example/ClassWithUnreferencedNoArgsConstructor.java rename to test-shrinker/src/main/java/com/example/ClassWithUnreferencedNoArgsConstructor.java diff --git a/shrinker-test/src/main/java/com/example/ClassWithVersionAnnotations.java b/test-shrinker/src/main/java/com/example/ClassWithVersionAnnotations.java similarity index 100% rename from shrinker-test/src/main/java/com/example/ClassWithVersionAnnotations.java rename to test-shrinker/src/main/java/com/example/ClassWithVersionAnnotations.java diff --git a/shrinker-test/src/main/java/com/example/EnumClass.java b/test-shrinker/src/main/java/com/example/EnumClass.java similarity index 100% rename from shrinker-test/src/main/java/com/example/EnumClass.java rename to test-shrinker/src/main/java/com/example/EnumClass.java diff --git a/shrinker-test/src/main/java/com/example/EnumClassWithSerializedName.java b/test-shrinker/src/main/java/com/example/EnumClassWithSerializedName.java similarity index 100% rename from shrinker-test/src/main/java/com/example/EnumClassWithSerializedName.java rename to test-shrinker/src/main/java/com/example/EnumClassWithSerializedName.java diff --git a/shrinker-test/src/main/java/com/example/GenericClasses.java b/test-shrinker/src/main/java/com/example/GenericClasses.java similarity index 100% rename from shrinker-test/src/main/java/com/example/GenericClasses.java rename to test-shrinker/src/main/java/com/example/GenericClasses.java diff --git a/shrinker-test/src/main/java/com/example/Main.java b/test-shrinker/src/main/java/com/example/Main.java similarity index 100% rename from shrinker-test/src/main/java/com/example/Main.java rename to test-shrinker/src/main/java/com/example/Main.java diff --git a/shrinker-test/src/main/java/com/example/NoSerializedNameMain.java b/test-shrinker/src/main/java/com/example/NoSerializedNameMain.java similarity index 100% rename from shrinker-test/src/main/java/com/example/NoSerializedNameMain.java rename to test-shrinker/src/main/java/com/example/NoSerializedNameMain.java diff --git a/shrinker-test/src/main/java/com/example/TestExecutor.java b/test-shrinker/src/main/java/com/example/TestExecutor.java similarity index 100% rename from shrinker-test/src/main/java/com/example/TestExecutor.java rename to test-shrinker/src/main/java/com/example/TestExecutor.java diff --git a/shrinker-test/src/main/java/com/example/UnusedClass.java b/test-shrinker/src/main/java/com/example/UnusedClass.java similarity index 100% rename from shrinker-test/src/main/java/com/example/UnusedClass.java rename to test-shrinker/src/main/java/com/example/UnusedClass.java diff --git a/shrinker-test/src/test/java/com/google/gson/it/ShrinkingIT.java b/test-shrinker/src/test/java/com/google/gson/it/ShrinkingIT.java similarity index 100% rename from shrinker-test/src/test/java/com/google/gson/it/ShrinkingIT.java rename to test-shrinker/src/test/java/com/google/gson/it/ShrinkingIT.java