Disable JFR-related tests on OpenJ9 JVMs

Author: marcphilipp

gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts

@@ -86,6 +86,9 @@ dependencies {
 	testRuntimeOnly(project(":junit-platform-reporting"))
 
 	testRuntimeOnly(bundleFromLibs("log4j"))
+	testRuntimeOnly(dependencyFromLibs("jfrPolyfill")) {
+		because("OpenJ9 does not include JFR")
+	}
 	testRuntimeOnly(dependencyFromLibs("openTestReporting-events")) {
 		because("it's required to run tests via IntelliJ which does not consumed the shadowed jar of junit-platform-reporting")
 	}

junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/extension/DisabledOnOpenJ9.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015-2024 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.api.extension;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@DisabledIfSystemProperty(named = "java.vm.vendor", matches = ".*OpenJ9.*")
+public @interface DisabledOnOpenJ9 {
+}

junit-platform-jfr/junit-platform-jfr.gradle.kts

@@ -9,6 +9,7 @@ dependencies {
 	api(projects.junitPlatformLauncher)
 
 	compileOnlyApi(libs.apiguardian)
+	compileOnly(libs.jfrPolyfill)
 
 	osgiVerification(projects.junitJupiterEngine)
 	osgiVerification(projects.junitPlatformLauncher)

platform-tests/src/test/java/org/junit/platform/commons/util/ReflectionUtilsTests.java

@@ -1008,7 +1008,8 @@ void findNestedClassesWithInvalidNestedClassFile(@TrackLogRecords LogRecordListe
 				assertEquals(fqcn, classWithInvalidNestedClassFile.getName());
 				var noClassDefFoundError = assertThrows(NoClassDefFoundError.class,
 					classWithInvalidNestedClassFile::getDeclaredClasses);
-				assertEquals("tests/NestedInterfaceGroovyTests$NestedInterface$1", noClassDefFoundError.getMessage());
+				assertThat(noClassDefFoundError) //
+						.hasMessageMatching("tests[./]NestedInterfaceGroovyTests\\$NestedInterface\\$1");
 
 				assertThat(findNestedClasses(classWithInvalidNestedClassFile)).isEmpty();
 				// @formatter:off

platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingDiscoveryListenerIntegrationTests.java

@@ -16,13 +16,15 @@
 import static org.moditect.jfrunit.JfrEventsAssert.assertThat;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.DisabledOnOpenJ9;
 import org.junit.jupiter.engine.JupiterTestEngine;
 import org.junit.platform.launcher.core.LauncherFactoryForTestingPurposesOnly;
 import org.moditect.jfrunit.EnableEvent;
 import org.moditect.jfrunit.JfrEventTest;
 import org.moditect.jfrunit.JfrEvents;
 
 @JfrEventTest
+@DisabledOnOpenJ9
 public class FlightRecordingDiscoveryListenerIntegrationTests {
 
 	public JfrEvents jfrEvents = new JfrEvents();

platform-tests/src/test/java/org/junit/platform/jfr/FlightRecordingExecutionListenerIntegrationTests.java

@@ -18,13 +18,15 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestReporter;
+import org.junit.jupiter.api.extension.DisabledOnOpenJ9;
 import org.junit.jupiter.engine.JupiterTestEngine;
 import org.junit.platform.launcher.core.LauncherFactoryForTestingPurposesOnly;
 import org.moditect.jfrunit.EnableEvent;
 import org.moditect.jfrunit.JfrEventTest;
 import org.moditect.jfrunit.JfrEvents;
 
 @JfrEventTest
+@DisabledOnOpenJ9
 public class FlightRecordingExecutionListenerIntegrationTests {
 
 	public JfrEvents jfrEvents = new JfrEvents();

platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts

@@ -68,6 +68,7 @@ dependencies {
 		because("we reference Ant's main class")
 	}
 	testImplementation(libs.bundles.xmlunit)
+	testImplementation(testFixtures(projects.junitJupiterApi))
 
 	thirdPartyJars(libs.junit4)
 	thirdPartyJars(libs.assertj)

platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ModularUserGuideTests.java

@@ -27,6 +27,7 @@
 
 import org.codehaus.groovy.runtime.ProcessGroovyMethods;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.DisabledOnOpenJ9;
 import org.junit.jupiter.api.io.TempDir;
 
 import platform.tooling.support.Helper;
@@ -35,6 +36,7 @@
 /**
  * @since 1.5
  */
+@DisabledOnOpenJ9
 class ModularUserGuideTests {
 
 	private static final String DOCUMENTATION_MODULE_DESCRIPTOR = """

platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ToolProviderTests.java

@@ -36,6 +36,7 @@
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.DisabledOnOpenJ9;
 
 import platform.tooling.support.Helper;
 import platform.tooling.support.MavenRepo;
@@ -87,6 +88,7 @@ void findAndRunJUnitOnTheClassPath() {
 	}
 
 	@Test
+	@DisabledOnOpenJ9
 	void findAndRunJUnitOnTheModulePath() {
 		var finder = ModuleFinder.of(LIB);
 		var modules = finder.findAll().stream() //