Enhance canConvert with inner converters evaluation

scordio · scordio · commit 940d018ebbeb · 2025-02-13T18:13:03.000+01:00
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/support/conversion/DefaultConversionService.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/support/conversion/DefaultConversionService.java
@@ -78,7 +78,20 @@ private DefaultConversionService() {
 	 */
 	@Override
 	public boolean canConvert(Object source, Class<?> targetType, ClassLoader classLoader) {
-		return source instanceof String;
+		if (source == null && targetType.isPrimitive()) {
+			return false;
+		}
+
+		if (!(source instanceof String)) {
+			return false;
+		}
+
+		if (String.class.equals(targetType)) {
+			return true;
+		}
+
+		return stringToObjectConverters.stream().anyMatch(
+			candidate -> candidate.canConvertTo(toWrapperType(targetType)));
 	}
 
 	/**
@@ -145,7 +158,6 @@ public Object convert(Object source, Class<?> targetType, ClassLoader classLoade
 			return source;
 		}
 
-		// FIXME move/copy next three lines to canConvert?
 		Class<?> targetTypeToUse = toWrapperType(targetType);
 		Optional<StringToObjectConverter> converter = stringToObjectConverters.stream().filter(
 			candidate -> candidate.canConvertTo(targetTypeToUse)).findFirst();
