Use canonical type names in conversion logging and error messages

Closes #4806

Author: sbrannen

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ParameterResolutionUtils.java

@@ -144,7 +144,7 @@ private static Object resolveParameter(ParameterContext parameterContext, Execut
 
 			logger.trace(() -> String.format(
 				"ParameterResolver [%s] resolved a value of type [%s] for parameter [%s] in %s [%s].",
-				resolver.getClass().getName(), (value != null ? value.getClass().getName() : null),
+				resolver.getClass().getName(), (value != null ? value.getClass().getTypeName() : null),
 				parameterContext.getParameter(), asLabel(executable), executable.toGenericString()));
 
 			return value;
@@ -185,8 +185,8 @@ private static void validateResolvedType(Parameter parameter, Object value, Exec
 				message = String.format(
 					"ParameterResolver [%s] resolved a value of type [%s] for parameter [%s] "
 							+ "in %s [%s], but a value assignment compatible with [%s] is required.",
-					resolver.getClass().getName(), (value != null ? value.getClass().getName() : null), parameter,
-					asLabel(executable), executable.toGenericString(), type.getName());
+					resolver.getClass().getName(), (value != null ? value.getClass().getTypeName() : null), parameter,
+					asLabel(executable), executable.toGenericString(), type.getTypeName());
 			}
 
 			throw new ParameterResolutionException(message);

junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/TypedArgumentConverter.java

@@ -64,12 +64,12 @@ private T convert(Object source, Class<?> actualTargetType) {
 		if (!this.sourceType.isInstance(source)) {
 			String message = String.format(
 				"%s cannot convert objects of type [%s]. Only source objects of type [%s] are supported.",
-				getClass().getSimpleName(), source.getClass().getName(), this.sourceType.getName());
+				getClass().getSimpleName(), source.getClass().getTypeName(), this.sourceType.getTypeName());
 			throw new ArgumentConversionException(message);
 		}
 		if (!ReflectionUtils.isAssignableTo(this.targetType, actualTargetType)) {
 			String message = String.format("%s cannot convert to type [%s]. Only target type [%s] is supported.",
-				getClass().getSimpleName(), actualTargetType.getName(), this.targetType.getName());
+				getClass().getSimpleName(), actualTargetType.getTypeName(), this.targetType.getTypeName());
 			throw new ArgumentConversionException(message);
 		}
 		return convert(this.sourceType.cast(source));

jupiter-tests/src/test/java/org/junit/jupiter/engine/execution/ParameterResolutionUtilsTests.java

@@ -11,6 +11,7 @@
 package org.junit.jupiter.engine.execution;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
@@ -241,6 +242,20 @@ void reportTypeMismatchBetweenParameterAndResolvedParameter() {
 		// @formatter:on
 	}
 
+	@Test
+	void reportTypeMismatchBetweenParameterAndResolvedParameterWithArrayTypes() {
+		testMethodWithASingleStringArrayParameter();
+		thereIsAParameterResolverThatResolvesTheParameterTo(new int[][] {});
+
+		assertThatExceptionOfType(ParameterResolutionException.class)//
+				.isThrownBy(this::resolveMethodParameters)//
+				.withMessageContaining(//
+					"resolved a value of type [int[][]] for parameter [java.lang.String[]", //
+					"in method", //
+					"but a value assignment compatible with [java.lang.String[]] is required." //
+				);
+	}
+
 	@Test
 	void wrapAllExceptionsThrownDuringParameterResolutionIntoAParameterResolutionException() {
 		anyTestMethodWithAtLeastOneParameter();
@@ -309,6 +324,10 @@ private void testMethodWithASingleStringParameter() {
 		testMethodWith("singleStringParameter", String.class);
 	}
 
+	private void testMethodWithASingleStringArrayParameter() {
+		testMethodWith("singleStringArrayParameter", String[].class);
+	}
+
 	private void testMethodWithASinglePrimitiveIntParameter() {
 		testMethodWith("primitiveParameterInt", int.class);
 	}
@@ -412,6 +431,8 @@ interface MethodSource {
 
 		void singleStringParameter(String parameter);
 
+		void singleStringArrayParameter(String[] parameter);
+
 		void primitiveParameterInt(int parameter);
 
 		void multipleParameters(String first, Integer second, Double third);

jupiter-tests/src/test/java/org/junit/jupiter/params/converter/TypedArgumentConverterTests.java

@@ -79,6 +79,26 @@ void sourceTypeMismatch() {
 							+ "Only source objects of type [java.lang.String] are supported.");
 		}
 
+		@Test
+		void sourceTypeMismatchForArrayType() {
+			Parameter parameter = findParameterOfMethod("stringToByteArray", Byte[].class);
+			ParameterContext parameterContext = parameterContext(parameter);
+			assertThatExceptionOfType(ArgumentConversionException.class)//
+					.isThrownBy(() -> this.converter.convert(new String[][] {}, parameterContext))//
+					.withMessage("StringLengthArgumentConverter cannot convert objects of type [java.lang.String[][]]. "
+							+ "Only source objects of type [java.lang.String] are supported.");
+		}
+
+		@Test
+		void sourceTypeMismatchForPrimitiveArrayType() {
+			Parameter parameter = findParameterOfMethod("stringToByteArray", Byte[].class);
+			ParameterContext parameterContext = parameterContext(parameter);
+			assertThatExceptionOfType(ArgumentConversionException.class)//
+					.isThrownBy(() -> this.converter.convert(new byte[0], parameterContext))//
+					.withMessage("StringLengthArgumentConverter cannot convert objects of type [byte[]]. "
+							+ "Only source objects of type [java.lang.String] are supported.");
+		}
+
 		@Test
 		void targetTypeMismatch() {
 			Parameter parameter = findParameterOfMethod("stringToBoolean", Boolean.class);
@@ -89,6 +109,26 @@ void targetTypeMismatch() {
 							+ "Only target type [java.lang.Integer] is supported.");
 		}
 
+		@Test
+		void targetTypeMismatchForArrayType() {
+			Parameter parameter = findParameterOfMethod("stringToByteArray", Byte[].class);
+			ParameterContext parameterContext = parameterContext(parameter);
+			assertThatExceptionOfType(ArgumentConversionException.class)//
+					.isThrownBy(() -> this.converter.convert("enigma", parameterContext))//
+					.withMessage("StringLengthArgumentConverter cannot convert to type [java.lang.Byte[]]. "
+							+ "Only target type [java.lang.Integer] is supported.");
+		}
+
+		@Test
+		void targetTypeMismatchForPrimitiveArrayType() {
+			Parameter parameter = findParameterOfMethod("stringToPrimitiveByteArray", byte[].class);
+			ParameterContext parameterContext = parameterContext(parameter);
+			assertThatExceptionOfType(ArgumentConversionException.class)//
+					.isThrownBy(() -> this.converter.convert("enigma", parameterContext))//
+					.withMessage("StringLengthArgumentConverter cannot convert to type [byte[]]. "
+							+ "Only target type [java.lang.Integer] is supported.");
+		}
+
 		private ParameterContext parameterContext(Parameter parameter) {
 			ParameterContext parameterContext = mock();
 			when(parameterContext.getParameter()).thenReturn(parameter);
@@ -103,6 +143,12 @@ private Parameter findParameterOfMethod(String methodName, Class<?>... parameter
 		void stringToBoolean(Boolean b) {
 		}
 
+		void stringToByteArray(Byte[] array) {
+		}
+
+		void stringToPrimitiveByteArray(byte[] array) {
+		}
+
 	}
 
 	/**