Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename Maven integration test modules #2691

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-android-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@

<modules>
<module>gson</module>
<module>jpms-test</module>
<module>graal-native-image-test</module>
<module>shrinker-test</module>
<module>test-jpms</module>
<module>test-graal-native-image</module>
<module>test-shrinker</module>
<module>extras</module>
<module>metrics</module>
<module>proto</module>
Expand Down
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<artifactId>gson-parent</artifactId>
<version>2.11.1-SNAPSHOT</version>
</parent>
<artifactId>graal-native-image-test</artifactId>
<artifactId>test-graal-native-image</artifactId>
<name>Test: GraalVM Native Image</name>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion jpms-test/README.md → test-jpms/README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion jpms-test/pom.xml → test-jpms/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<artifactId>gson-parent</artifactId>
<version>2.11.1-SNAPSHOT</version>
</parent>
<artifactId>jpms-test</artifactId>
<artifactId>test-jpms</artifactId>
<name>Test: Java Platform Module System (JPMS)</name>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion shrinker-test/README.md → test-shrinker/README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion shrinker-test/pom.xml → test-shrinker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<artifactId>gson-parent</artifactId>
<version>2.11.1-SNAPSHOT</version>
</parent>
<artifactId>shrinker-test</artifactId>
<artifactId>test-shrinker</artifactId>
<name>Test: Code shrinking (ProGuard / R8)</name>

<properties>
Expand Down
File renamed without changes.
File renamed without changes.