Update JUnit (Pioneer) and Java (CI) (#818 / #826)

beatngu13 · web-flow · commit 3b2ae595df32 · 2024-10-06T15:28:09.000+02:00
This PR updates the JUnit dependency for Pioneer from 5.10.2 to 5.11.2. It also updates the latest included Java version for CI from 21 to 23. Since the engine behavior changed with JUnit 5.11.0 (see junit-team/junit-framework@9af6ca4#diff-58dca140b6249c0d7f76a8056994eb6762b71bd2f79cc28106e5391d16d23245), some assertions are updated as well. Closes: #818 PR: #826
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -83,6 +83,8 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
+          # Sonar needs Java 17
+          # See https://docs.sonarsource.com/sonarcloud/appendices/scanner-environment/
           java-version: 17
           distribution: temurin
       - name: Cache SonarCloud results
@@ -130,8 +132,10 @@ jobs:
     timeout-minutes: 15
     strategy:
       matrix:
-        java: [ 11, 17, 21 ]
-        junit-version: [ '5.9.2', '5.10.0' ]
+        # Pioneer, latest LTS, latest stable
+        java: [ 11, 21, 23 ]
+        # Pioneer = latest stable
+        junit-version: [ '5.11.2' ]
         os: [ubuntu, macos, windows]
     name: with Java ${{ matrix.java }}, JUnit ${{ matrix.junit-version }} on ${{ matrix.os }}
     steps:
@@ -160,7 +164,7 @@ jobs:
     timeout-minutes: 15
     strategy:
       matrix:
-        junit-version: [ '5.9.2', '5.10.0' ]
+        junit-version: [ '5.11.2' ]
         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 launch it with a supported Java version,
@@ -179,7 +183,7 @@ jobs:
       - name: Set up supported Java
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 23
           distribution: temurin
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@v3
@@ -216,10 +220,10 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          # we build the Javadoc with JDK 17 (for better results),
+          # we build the Javadoc with JDK 23 (for better results),
           # so install that as well
           java-version: |
-            21
+            23
             11
           distribution: temurin
       - name: Set up Gradle
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -304,7 +304,7 @@ tasks {
 		if (releaseBuild) {
 			javadocTool.set(project.javaToolchains.javadocToolFor {
 				// create Javadoc with the minimum Java version needed for our desired features (e.g. search)
-				languageVersion.set(JavaLanguageVersion.of(21))
+				languageVersion.set(JavaLanguageVersion.of(23))
 			})
 		}
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-junitVersion=5.10.1
+junitVersion=5.11.2
 
 # Ensure sufficient heap size, especially for Sonar.
 org.gradle.jvmargs=-Xmx8g
diff --git a/src/test/java/org/junitpioneer/jupiter/resource/ResourcesTests.java b/src/test/java/org/junitpioneer/jupiter/resource/ResourcesTests.java
@@ -26,6 +26,7 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.platform.commons.JUnitException;
 import org.junitpioneer.testkit.ExecutionResults;
 
 @DisplayName("Resources extension")
@@ -76,7 +77,10 @@ void thenThrownExceptionIsPropagated() {
 
 				assertThat(results)
 						.hasSingleFailedTest()
-						.withExceptionInstanceOf(EXPECTED_THROW_ON_RF_CLOSE_EXCEPTION.getClass())
+						.withExceptionInstanceOf(JUnitException.class)
+						.hasMessage("Failed to close extension context")
+						.cause()
+						.isInstanceOf(EXPECTED_THROW_ON_RF_CLOSE_EXCEPTION.getClass())
 						.hasMessage(EXPECTED_THROW_ON_RF_CLOSE_EXCEPTION.getMessage());
 			}
 
@@ -135,7 +139,10 @@ void thenThrownExceptionIsWrappedAndPropagated() {
 
 					assertThat(results)
 							.hasSingleFailedTest()
-							.withExceptionInstanceOf(EXPECTED_THROW_ON_R_CLOSE_EXCEPTION.getClass())
+							.withExceptionInstanceOf(JUnitException.class)
+							.hasMessage("Failed to close extension context")
+							.cause()
+							.isInstanceOf(EXPECTED_THROW_ON_R_CLOSE_EXCEPTION.getClass())
 							.hasMessage(EXPECTED_THROW_ON_R_CLOSE_EXCEPTION.getMessage());
 				}
 
@@ -629,7 +636,10 @@ void thenThrownExceptionIsPropagated() {
 
 				assertThat(results)
 						.hasSingleFailedContainer()
-						.withExceptionInstanceOf(EXPECTED_THROW_ON_RF_CLOSE_EXCEPTION.getClass())
+						.withExceptionInstanceOf(JUnitException.class)
+						.hasMessage("Failed to close extension context")
+						.cause()
+						.isInstanceOf(EXPECTED_THROW_ON_RF_CLOSE_EXCEPTION.getClass())
 						.hasMessage(EXPECTED_THROW_ON_RF_CLOSE_EXCEPTION.getMessage());
 			}
 
@@ -688,7 +698,10 @@ void thenThrownExceptionIsWrappedAndPropagated() {
 
 					assertThat(results)
 							.hasSingleFailedContainer()
-							.withExceptionInstanceOf(EXPECTED_THROW_ON_R_CLOSE_EXCEPTION.getClass())
+							.withExceptionInstanceOf(JUnitException.class)
+							.hasMessage("Failed to close extension context")
+							.cause()
+							.isInstanceOf(EXPECTED_THROW_ON_R_CLOSE_EXCEPTION.getClass())
 							.hasMessage(EXPECTED_THROW_ON_R_CLOSE_EXCEPTION.getMessage());
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ tasks {`
`304`	`304`	`if (releaseBuild) {`
`305`	`305`	`javadocTool.set(project.javaToolchains.javadocToolFor {`
`306`	`306`	`// create Javadoc with the minimum Java version needed for our desired features (e.g. search)`
`307`		`- languageVersion.set(JavaLanguageVersion.of(21))`
	`307`	`+ languageVersion.set(JavaLanguageVersion.of(23))`
`308`	`308`	`})`
`309`	`309`	`}`
`310`	`310`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-junitVersion=5.10.1`
	`1`	`+junitVersion=5.11.2`
`2`	`2`
`3`	`3`	`# Ensure sufficient heap size, especially for Sonar.`
`4`	`4`	`org.gradle.jvmargs=-Xmx8g`