Polish contribution

See #3292
See #3279
See #3280

Author: sbrannen

documentation/src/docs/asciidoc/release-notes/release-notes-5.10.0-M1.adoc

@@ -15,8 +15,7 @@ repository on GitHub.
 
 ==== Bug Fixes
 
-* Use a test class's own classloader to search for `@MethodSource` and `MethodBasedCondition` methods.
-  This allows these features to work correctly inside an OSGi framework.
+* ❓
 
 ==== Deprecations and Breaking Changes
 
@@ -75,6 +74,10 @@ repository on GitHub.
 
 ==== Bug Fixes
 
+* The extensions supporting `@MethodSource`, `@EnabledIf`, and `@DisabledIf` now load
+  classes by fully-qualified class name using the `ClassLoader` obtained from the test
+  class when possible. This allows classes to be resolved with custom `ClassLoader`
+  arrangements (such as OSGi).
 * When converting an argument for a `@ParameterizedTest` method from a fully-qualified
   class name (`String`) to a `Class`, the `ClassLoader` of the class in which the
   `@ParameterizedTest` method is declared is now used to resolve the `Class` instead of

junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java

@@ -25,6 +25,7 @@
 import org.junit.jupiter.api.extension.ExecutionCondition;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.JUnitException;
+import org.junit.platform.commons.util.ClassLoaderUtils;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ReflectionUtils;
 import org.junit.platform.commons.util.StringUtils;
@@ -57,14 +58,18 @@ public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext con
 	}
 
 	private Method getConditionMethod(String fullyQualifiedMethodName, ExtensionContext context) {
-		final Class<?> testClass = context.getRequiredTestClass();
+		Class<?> testClass = context.getRequiredTestClass();
 		if (!fullyQualifiedMethodName.contains("#")) {
 			return findMethod(testClass, fullyQualifiedMethodName);
 		}
 		String[] methodParts = ReflectionUtils.parseFullyQualifiedMethodName(fullyQualifiedMethodName);
 		String className = methodParts[0];
 		String methodName = methodParts[1];
-		Class<?> clazz = ReflectionUtils.tryToLoadClass(className, testClass.getClassLoader()).getOrThrow(
+		ClassLoader classLoader = testClass.getClassLoader();
+		if (classLoader == null) {
+			classLoader = ClassLoaderUtils.getDefaultClassLoader();
+		}
+		Class<?> clazz = ReflectionUtils.tryToLoadClass(className, classLoader).getOrThrow(
 			cause -> new JUnitException(format("Could not load class [%s]", className), cause));
 		return findMethod(clazz, methodName);
 	}

junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java

@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.commons.util.ClassLoaderUtils;
 import org.junit.platform.commons.util.CollectionUtils;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.ReflectionUtils;
@@ -109,7 +110,11 @@ private static Method findFactoryMethodByFullyQualifiedName(Class<?> testClass,
 		String className = methodParts[0];
 		String methodName = methodParts[1];
 		String methodParameters = methodParts[2];
-		Class<?> clazz = loadRequiredClass(className, testClass.getClassLoader());
+		ClassLoader classLoader = testClass.getClassLoader();
+		if (classLoader == null) {
+			classLoader = ClassLoaderUtils.getDefaultClassLoader();
+		}
+		Class<?> clazz = loadRequiredClass(className, classLoader);
 
 		// Attempt to find an exact match first.
 		Method factoryMethod = ReflectionUtils.findMethod(clazz, methodName, methodParameters).orElse(null);