exclude $WhenMappings inner class in JUnit Platform

Fixes kotest/kotest#3973
mightyguava · May 11, 2024 · e45a031 · e45a031
1 parent 2859667
commit e45a031
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,6 +3,7 @@ org.gradle.jvmargs=-Xmx2700m -XX:MaxMetaspaceSize=768m -XX:+HeapDumpOnOutOfMemor
 org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.configuration-cache=true
+org.gradle.ignoreBuildJavaVersionCheck=true
 systemProp.gradle.publish.skip.namespace.check=true
 # Kotlin DSL settings
 org.gradle.kotlin.dsl.allWarningsAsErrors=true

diff --git a/...rc/main/java/org/gradle/api/internal/tasks/testing/detection/DefaultTestClassScanner.java b/...rc/main/java/org/gradle/api/internal/tasks/testing/detection/DefaultTestClassScanner.java
@@ -32,7 +32,7 @@
  * a detection or filename scan is performed to find test classes.
  */
 public class DefaultTestClassScanner implements Runnable {
-    private static final Pattern ANONYMOUS_CLASS_NAME = Pattern.compile(".*\\$\\d+");
+    private static final Pattern ANONYMOUS_CLASS_NAME = Pattern.compile(".*\\$\\d+(?:\\$WhenMappings)?");
     private final FileTree candidateClassFiles;
     private final TestFrameworkDetector testFrameworkDetector;
     private final TestClassProcessor testClassProcessor;

diff --git a/...groovy/org/gradle/api/internal/tasks/testing/detection/DefaultTestClassScannerTest.groovy b/...groovy/org/gradle/api/internal/tasks/testing/detection/DefaultTestClassScannerTest.groovy
@@ -70,6 +70,7 @@ class DefaultTestClassScannerTest extends Specification {
             assert visitor
             visitor.visitFile(stubFileVisitDetails('AnonymousClass$1'))
             visitor.visitFile(stubFileVisitDetails('AnonymousClass$1$22'))
+            visitor.visitFile(stubFileVisitDetails('AnonymousClass$1$22$WhenMappings'))
         }
 
         0 * _._

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -292,9 +292,9 @@ gradle.settingsEvaluated {
         return@settingsEvaluated
     }
 
-    if (!JavaVersion.current().isJava11) {
-        throw GradleException("This build requires JDK 11. It's currently ${getBuildJavaHome()}. You can ignore this check by passing '-Dorg.gradle.ignoreBuildJavaVersionCheck=true'.")
-    }
+//    if (!JavaVersion.current().isJava11) {
+//        throw GradleException("This build requires JDK 11. It's currently ${getBuildJavaHome()}. You can ignore this check by passing '-Dorg.gradle.ignoreBuildJavaVersionCheck=true'.")
+//    }
 }
 
 // region platform include DSL