Don't wrap arguments with Named in ParameterizedTestExtension

Author: juliette-derancourt

junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java

@@ -92,7 +92,6 @@ public Stream<TestTemplateInvocationContext> provideTestTemplateInvocationContex
 				.flatMap(provider -> arguments(provider, extensionContext))
 				.map(Arguments::get)
 				.map(arguments -> consumedArguments(arguments, methodContext))
-				.map(this::namedArguments)
 				.map(arguments -> createInvocationContext(formatter, methodContext, arguments))
 				.peek(invocationContext -> invocationCount.incrementAndGet())
 				.onClose(() ->
@@ -123,7 +122,7 @@ private ExtensionContext.Store getStore(ExtensionContext context) {
 	}
 
 	private TestTemplateInvocationContext createInvocationContext(ParameterizedTestNameFormatter formatter,
-			ParameterizedTestMethodContext methodContext, List<Named<Object>> arguments) {
+			ParameterizedTestMethodContext methodContext, Object[] arguments) {
 		return new ParameterizedTestInvocationContext(formatter, methodContext, arguments);
 	}
 
@@ -154,16 +153,4 @@ private Object[] consumedArguments(Object[] arguments, ParameterizedTestMethodCo
 		return arguments.length > parameterCount ? Arrays.copyOf(arguments, parameterCount) : arguments;
 	}
 
-	@SuppressWarnings("unchecked")
-	private List<Named<Object>> namedArguments(Object[] arguments) {
-		return Arrays.stream(arguments) //
-				.map(argument -> {
-					if (argument instanceof Named) {
-						return (Named<Object>) argument;
-					}
-					return Named.of(StringUtils.nullSafeToString(argument), argument);
-				}) //
-				.collect(Collectors.toList());
-	}
-
 }

junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestInvocationContext.java

@@ -25,18 +25,18 @@ class ParameterizedTestInvocationContext implements TestTemplateInvocationContex
 
 	private final ParameterizedTestNameFormatter formatter;
 	private final ParameterizedTestMethodContext methodContext;
-	private final List<Named<Object>> arguments;
+	private final Object[] arguments;
 
 	ParameterizedTestInvocationContext(ParameterizedTestNameFormatter formatter,
-			ParameterizedTestMethodContext methodContext, List<Named<Object>> arguments) {
+			ParameterizedTestMethodContext methodContext, Object[] arguments) {
 		this.formatter = formatter;
 		this.methodContext = methodContext;
 		this.arguments = arguments;
 	}
 
 	@Override
 	public String getDisplayName(int invocationIndex) {
-		return this.formatter.format(invocationIndex, this.arguments.toArray());
+		return this.formatter.format(invocationIndex, this.arguments);
 	}
 
 	@Override

junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java

@@ -12,23 +12,24 @@
 
 import java.lang.reflect.Executable;
 import java.lang.reflect.Method;
-import java.util.List;
+import java.util.Arrays;
 
 import org.junit.jupiter.api.Named;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import org.junit.jupiter.api.extension.ParameterResolver;
+import org.junit.platform.commons.util.StringUtils;
 
 /**
  * @since 5.0
  */
 class ParameterizedTestParameterResolver implements ParameterResolver {
 
 	private final ParameterizedTestMethodContext methodContext;
-	private final List<Named<Object>> arguments;
+	private final Object[] arguments;
 
-	ParameterizedTestParameterResolver(ParameterizedTestMethodContext methodContext, List<Named<Object>> arguments) {
+	ParameterizedTestParameterResolver(ParameterizedTestMethodContext methodContext, Object[] arguments) {
 		this.methodContext = methodContext;
 		this.arguments = arguments;
 	}
@@ -56,13 +57,25 @@ public boolean supportsParameter(ParameterContext parameterContext, ExtensionCon
 		}
 
 		// Else fallback to behavior for parameterized test methods without aggregators.
-		return parameterIndex < this.arguments.size();
+		return parameterIndex < this.arguments.length;
 	}
 
 	@Override
 	public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
 			throws ParameterResolutionException {
-		return this.methodContext.resolve(parameterContext, this.arguments.stream().map(Named::getPayload).toArray());
+		return this.methodContext.resolve(parameterContext, extractPayloads(this.arguments));
+	}
+
+	@SuppressWarnings("unchecked")
+	private Object[] extractPayloads(Object[] arguments) {
+		return Arrays.stream(arguments) //
+				.map(argument -> {
+					if (argument instanceof Named) {
+						return ((Named<Object>) argument).getPayload();
+					}
+					return argument;
+				}) //
+				.toArray();
 	}
 
 }