Upgrade Gradle Wrapper and build against Java 18

.github/workflows/build.yml

@@ -117,7 +117,7 @@ jobs:
     timeout-minutes: 15
     strategy:
       matrix:
-        java: [ 11, 17 ]
+        java: [ 11, 17, 18 ]
         junit-version: [ '5.9.0' ]
         modular: [true, false]
         os: [ubuntu, macos, windows]
@@ -151,23 +151,21 @@ jobs:
         modular: [true, false]
         os: [ubuntu, macos, windows]
     name: Experimental build with newest JDK early-access build and Gradle release candidate
-    # Gradle doesn't work with JDK EA builds, so we start it with a supported Java version,
-    # but execute the build on the experimental version
+    # Gradle doesn't work with JDK EA builds, so we launch it with a supported Java version,
+    # but set the Gradle toolchain to use the experimental version.
     steps:
       - name: Check out repo
         uses: actions/checkout@v2
-      - uses: sormuras/download-jdk@v1
+      - name: Set up experimental Java
+        uses: oracle-actions/setup-java@v1
         with:
-          feature: ${{ env.EXPERIMENTAL_JAVA }}
-      - uses: actions/setup-java@v2
-        with:
-          java-version: ${{ env.JDK_VERSION }}
-          distribution: jdkfile
-          jdkFile: ${{ env.JDK_FILE }}
+          website: jdk.java.net
+          release: ${{ env.EXPERIMENTAL_JAVA }}
       - name: Prepare JDK_EXPERIMENTAL env var
         shell: bash
         run: echo "JDK_EXPERIMENTAL=$JAVA_HOME" >> $GITHUB_ENV
-      - uses: actions/setup-java@v2
+      - name: Set up supported Java
+        uses: actions/setup-java@v2
         with:
           java-version: 17
           distribution: temurin

build.gradle.kts

@@ -198,6 +198,10 @@ tasks {
 			if (modularBuild.toBoolean())
 				java.srcDir("src/main/module")
 		}
+		test {
+			if (modularBuild.toBoolean())
+				java.srcDir("src/test/module")
+		}
 		create("demo") {
 			java {
 				srcDir("src/demo/java")
@@ -223,10 +227,29 @@ tasks {
 		options.compilerArgs.add("-Xlint:all,-exports")
 	}
 
+	// Prepares test-related JVM args
+	val moduleName = "org.junitpioneer"
+	val targetModule = if (modularBuild.toBoolean()) moduleName else "ALL-UNNAMED"
+	val patchModuleArg = "--patch-module=$moduleName=${compileJava.get().destinationDirectory.asFile.get().path}"
+	val testJvmArgs = listOf(
+			"-XX:+IgnoreUnrecognizedVMOptions",
+			"--add-opens=java.base/java.util=$targetModule",
+			"--add-opens=java.base/java.lang=$targetModule",
+			patchModuleArg
+	)
+
 	compileTestJava {
 		options.encoding = "UTF-8"
 		options.compilerArgs.add("-Werror")
-		options.compilerArgs.add("-Xlint:all")
+		var xlintArg = "-Xlint:all"
+		if (modularBuild.toBoolean()) {
+			options.compilerArgs.add(patchModuleArg)
+			xlintArg += ",-exports,-requires-automatic"
+			if (JavaVersion.current() >= JavaVersion.VERSION_16) {
+				xlintArg += ",-missing-explicit-ctor"
+			}
+		}
+		options.compilerArgs.add(xlintArg)
 	}
 
 	test {
@@ -241,19 +264,17 @@ tasks {
 			includeTestsMatching("*Tests")
 		}
 		systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
-		// `EnvironmentVariableExtension` uses reflection to change environment variables;
-		// this prevents the corresponding warning (and keeps working on Java 8)
-		// IF YOU ADD MORE OPTIONS; CONSIDER REPLACING `-XX:+IgnoreUnrecognizedVMOptions WITH A CONDITIONAL
-		jvmArgs(
-				"-XX:+IgnoreUnrecognizedVMOptions",
-				"--add-opens=java.base/java.util=ALL-UNNAMED")
+		if (JavaVersion.current() >= JavaVersion.VERSION_12)
+			systemProperty("java.security.manager", "allow")
+		jvmArgs(testJvmArgs)
 	}
 
 	testing {
 		suites {
 			val test by getting(JvmTestSuite::class) {
 				useJUnitJupiter()
 			}
+
 			val demoTests by registering(JvmTestSuite::class) {
 				dependencies {
 					implementation(project)
@@ -262,15 +283,25 @@ tasks {
 				}
 
 				sources {
-					java { srcDir("src/demo/java") }
-					resources { srcDir("src/demo/resources") }
+					java {
+						srcDir("src/demo/java")
+					}
+					resources {
+						srcDir("src/demo/resources")
+					}
 				}
-				targets { all { testTask.configure {
-					shouldRunAfter(test)
-					filter {
-						includeTestsMatching("*Demo")
+
+				targets {
+					all {
+						testTask.configure {
+							shouldRunAfter(test)
+							filter {
+								includeTestsMatching("*Demo")
+							}
+							jvmArgs(testJvmArgs)
+						}
 					}
-				} } }
+				}
 			}
 		}
 	}

docs/environment-variables.adoc

@@ -66,8 +66,15 @@ module java.base does not "opens java.lang" to unnamed module [...]
 ----
 
 The best way to prevent these warnings/errors, is to change the code under test, so this extension is no longer needed.
-The next best thing is to allow access to that specific package with `--add-opens=java.base/java.util=ALL-UNNAMED` (if you place JUnit Pioneer on the class path) or `--add-opens=java.base/java.util=org.junitpioneer` (if you place it on the module path).
+The next best thing is to allow access to that specific package:
 
+[source]
+----
+--add-opens java.base/java.util=$TARGET_MODULE
+--add-opens java.base/java.lang=$TARGET_MODULE
+----
+
+Where `$TARGET_MODULE` equals `ALL-UNNAMED` if you place JUnit Pioneer on the class path, or `org.junitpioneer` if you place JUnit Pioneer on the module path.
 These command line options need to be added to the JVM that executes the tests:
 
 * https://docs.gradle.org/current/dsl/org.gradle.api.tasks.testing.Test.html[Gradle]

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

src/main/java/org/junitpioneer/jupiter/ClearEnvironmentVariable.java

@@ -35,9 +35,9 @@
  * uses reflection to change them. This requires that the {@link SecurityManager}
  * allows modifications and can potentially break on different operating systems and
  * Java versions. Be aware that this is a fragile solution and consider finding a
- * better one for your specific situation. If you're running on Java 9 or later, you
- * may have to add {@code --add-opens=java.base/java.util=ALL-UNNAMED} to your test
- * execution to prevent warnings or even errors.</p>
+ * better one for your specific situation. If you're running on Java 9 or later and
+ * are encountering warnings or errors, check
+ * <a href="https://junit-pioneer.org/docs/environment-variables/#warnings-for-reflective-access">the documentation</a>.</p>
  *
  * <p>During
  * <a href="https://junit.org/junit5/docs/current/user-guide/#writing-tests-parallel-execution" target="_top">parallel test execution</a>,

src/main/module/module-info.java

@@ -22,11 +22,14 @@
 	exports org.junitpioneer.jupiter;
 	exports org.junitpioneer.jupiter.cartesian;
 	exports org.junitpioneer.jupiter.params;
+	exports org.junitpioneer.jupiter.json;
 
 	opens org.junitpioneer.vintage to org.junit.platform.commons;
 	opens org.junitpioneer.jupiter to org.junit.platform.commons;
 	opens org.junitpioneer.jupiter.cartesian to org.junit.platform.commons;
+	opens org.junitpioneer.jupiter.issue to org.junit.platform.commons;
 	opens org.junitpioneer.jupiter.params to org.junit.platform.commons;
+	opens org.junitpioneer.jupiter.json to org.junit.platform.commons, com.fasterxml.jackson.databind;
 
 	provides org.junit.platform.launcher.TestExecutionListener
 			with org.junitpioneer.jupiter.issue.IssueExtensionExecutionListener;

src/test/java/org/junitpioneer/internal/PioneerAnnotationUtilsTests.java

@@ -506,7 +506,7 @@ void onMethods() throws NoSuchMethodException {
 					.allSatisfy(annotation -> assertThat(annotation)
 							.isInstanceOfAny(RepeatableTestAnnotation.class, NonRepeatableTestAnnotation.class,
 								MetaAnnotatedTestAnnotation.class))
-					.extractingResultOf("value")
+					.extracting(this::extractingResultOfValue)
 					.containsExactlyInAnyOrder("Inherited 4", "Inherited 5", "Inherited 6",
 						"Annotated with repeatable 2");
 		}
@@ -523,7 +523,7 @@ void onClassNotRepeated() {
 					.allSatisfy(annotation -> assertThat(annotation)
 							.isInstanceOfAny(RepeatableTestAnnotation.class, NonRepeatableTestAnnotation.class,
 								MetaAnnotatedTestAnnotation.class))
-					.extractingResultOf("value")
+					.extracting(this::extractingResultOfValue)
 					.containsExactlyInAnyOrder("Inherited 1", "Inherited 2", "Inherited 3",
 						"Annotated with repeatable 1");
 		}
@@ -539,7 +539,7 @@ void onMethodRepeated() throws NoSuchMethodException {
 			assertThat(result)
 					.hasSize(1)
 					.allSatisfy(annotation -> assertThat(annotation).isInstanceOf(MetaAnnotatedTestAnnotation.class))
-					.extractingResultOf("value")
+					.extracting(this::extractingResultOfValue)
 					.containsExactlyInAnyOrder("Annotated with repeatable 2");
 		}
 
@@ -553,10 +553,23 @@ void onClassRepeated() {
 			assertThat(result)
 					.hasSize(1)
 					.allSatisfy(annotation -> assertThat(annotation).isInstanceOf(MetaAnnotatedTestAnnotation.class))
-					.extractingResultOf("value")
+					.extracting(this::extractingResultOfValue)
 					.containsExactlyInAnyOrder("Annotated with repeatable 1");
 		}
 
+		// see https://github.com/assertj/assertj/issues/2760
+		String extractingResultOfValue(Annotation annotation) {
+			if (annotation instanceof MetaAnnotatedTestAnnotation) {
+				return ((MetaAnnotatedTestAnnotation) annotation).value();
+			} else if (annotation instanceof NonRepeatableTestAnnotation) {
+				return ((NonRepeatableTestAnnotation) annotation).value();
+			} else if (annotation instanceof RepeatableTestAnnotation) {
+				return ((RepeatableTestAnnotation) annotation).value();
+			} else {
+				return null;
+			}
+		}
+
 	}
 
 }

src/test/java/org/junitpioneer/jupiter/EnvironmentVariableExtensionTests.java

@@ -28,12 +28,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestMethodOrder;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
-import org.junit.jupiter.api.condition.JRE;
 import org.junit.jupiter.api.extension.ExtensionConfigurationException;
 import org.junitpioneer.testkit.ExecutionResults;
 
-@EnabledForJreRange(max = JRE.JAVA_16, disabledReason = "See: https://github.com/junit-pioneer/junit-pioneer/issues/509")
 @DisplayName("EnvironmentVariable extension")
 class EnvironmentVariableExtensionTests {
 

src/test/java/org/junitpioneer/jupiter/EnvironmentVariableUtilsTests.java

@@ -21,10 +21,7 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
-import org.junit.jupiter.api.condition.JRE;
 
-@EnabledForJreRange(max = JRE.JAVA_16, disabledReason = "See: https://github.com/junit-pioneer/junit-pioneer/issues/509")
 @DisplayName("JUnitPioneer system environment utilities")
 @WritesEnvironmentVariable
 class EnvironmentVariableUtilsTests {

src/test/module/module-info.java

@@ -0,0 +1,53 @@
+/**
+ * JUnit Pioneer provides extensions for <a href="https://github.com/junit-team/junit5/">JUnit 5</a>
+ * and its Jupiter API.
+ *
+ * <p>Pioneer does not limit itself to proven ideas with wide application but is purposely open to
+ * experiments. It aims to spin off successful and cohesive portions into sibling projects or back
+ * into the JUnit 5 code base.
+ *
+ * <p>The dependencies on Jupiter modules could be marked as <code>transitive</code> but that would
+ * allow users who depend on this module to not `require` org.junit.*, which would be backwards.
+ */
+module org.junitpioneer {
+	// see Javadoc for why these aren't transitive
+	requires org.junit.jupiter.api;
+	requires org.junit.jupiter.params;
+	requires org.junit.platform.launcher;
+
+	requires static com.fasterxml.jackson.core;
+	requires static com.fasterxml.jackson.databind;
+
+	exports org.junitpioneer.vintage;
+	exports org.junitpioneer.jupiter;
+	exports org.junitpioneer.jupiter.cartesian;
+	exports org.junitpioneer.jupiter.params;
+	exports org.junitpioneer.jupiter.json;
+
+	opens org.junitpioneer.vintage to org.junit.platform.commons;
+	opens org.junitpioneer.jupiter to org.junit.platform.commons, nl.jqno.equalsverifier;
+	opens org.junitpioneer.jupiter.cartesian to org.junit.platform.commons;
+	opens org.junitpioneer.jupiter.issue to org.junit.platform.commons;
+	opens org.junitpioneer.jupiter.params to org.junit.platform.commons;
+	opens org.junitpioneer.jupiter.json to org.junit.platform.commons, com.fasterxml.jackson.databind;
+
+	provides org.junit.platform.launcher.TestExecutionListener
+			with org.junitpioneer.jupiter.issue.IssueExtensionExecutionListener;
+	provides org.junitpioneer.jupiter.IssueProcessor
+			with org.junitpioneer.jupiter.issue.StoringIssueProcessor;
+	uses org.junitpioneer.jupiter.IssueProcessor;
+
+	requires org.junit.platform.testkit;
+	requires org.mockito;
+	requires org.assertj.core;
+	requires nl.jqno.equalsverifier;
+
+	// via org.assertj.core
+	requires java.instrument;
+	requires jdk.unsupported;
+	// via nl.jqno.equalsverifier
+	requires java.sql;
+
+	opens org.junitpioneer.internal to org.junit.platform.commons;
+	opens org.junitpioneer.testkit to org.junit.platform.commons;
+}