8280275: JUnit5 tests using Assumptions API fail to compile in some c…

…ases Backport-of: 94807b6edfb9af55be353cab237e8e64007c61dc
openjdk · May 2, 2022 · f01fc73 · f01fc73 · openjdk-notifier · May 2, 2022
1 parent ac52af6
commit f01fc73
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1861,13 +1861,13 @@ allprojects {
         testImplementation group: "org.hamcrest", name: "hamcrest-core", version: "1.3"
         testImplementation group: "org.junit.jupiter", name: "junit-jupiter", version: "5.8.1"
         testImplementation group: "org.junit.jupiter", name: "junit-jupiter-api", version: "5.8.1"
+        testImplementation group: "org.opentest4j", name: "opentest4j", version: "1.2.0"
         testRuntimeOnly group: "org.apiguardian", name: "apiguardian-api", version: "1.1.2"
         testRuntimeOnly group: "org.junit.jupiter", name: "junit-jupiter-engine", version: "5.8.1"
         testRuntimeOnly group: "org.junit.jupiter", name: "junit-jupiter-params", version: "5.8.1"
         testRuntimeOnly group: "org.junit.platform", name: "junit-platform-commons", version: "1.8.1"
         testRuntimeOnly group: "org.junit.platform", name: "junit-platform-engine", version: "1.8.1"
         testRuntimeOnly group: "org.junit.vintage", name: "junit-vintage-engine", version: "5.8.1"
-        testRuntimeOnly group: "org.opentest4j", name: "opentest4j", version: "1.2.0"
 
         if (BUILD_CLOSED && DO_JCOV)  {
             testImplementation name: "jcov"

diff --git a/modules/javafx.base/src/test/java/test/JUnit5Test.java b/modules/javafx.base/src/test/java/test/JUnit5Test.java
@@ -26,14 +26,17 @@
 package test;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import org.junit.jupiter.api.Test;
 
 public class JUnit5Test {
 
     @Test
     void junit5ShouldWork() {
-        System.err.println("JUnit 5 test working!");
+        assumeTrue(this != null);
+
         assertNotNull(this);
+        System.err.println("JUnit 5 test working!");
     }
 }