Supply invocation index for @ParameterizedTest to test author : using…

… int instead of Integer
junit-team · Nov 11, 2022 · e232d6c · e232d6c
1 parent 219abcc
commit e232d6c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestExtension.java
@@ -122,7 +122,7 @@ private ExtensionContext.Store getStore(ExtensionContext context) {
 	}
 
 	private TestTemplateInvocationContext createInvocationContext(ParameterizedTestNameFormatter formatter,
-			ParameterizedTestMethodContext methodContext, Object[] arguments, Integer invocationIndex) {
+			ParameterizedTestMethodContext methodContext, Object[] arguments, int invocationIndex) {
 		return new ParameterizedTestInvocationContext(formatter, methodContext, arguments, invocationIndex);
 	}
 

diff --git a/...ter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestInvocationContext.java b/...ter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestInvocationContext.java
@@ -25,10 +25,10 @@ class ParameterizedTestInvocationContext implements TestTemplateInvocationContex
 	private final ParameterizedTestNameFormatter formatter;
 	private final ParameterizedTestMethodContext methodContext;
 	private final Object[] arguments;
-	private final Integer invocationIndex;
+	private final int invocationIndex;
 
 	ParameterizedTestInvocationContext(ParameterizedTestNameFormatter formatter,
-			ParameterizedTestMethodContext methodContext, Object[] arguments, Integer invocationIndex) {
+			ParameterizedTestMethodContext methodContext, Object[] arguments, int invocationIndex) {
 		this.formatter = formatter;
 		this.methodContext = methodContext;
 		this.arguments = arguments;

diff --git a/...jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java b/...jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestMethodContext.java
@@ -161,7 +161,7 @@ int indexOfFirstAggregator() {
 	 * Resolve the parameter for the supplied context using the supplied
 	 * arguments.
 	 */
-	Object resolve(ParameterContext parameterContext, Object[] arguments, Integer invocationIndex) {
+	Object resolve(ParameterContext parameterContext, Object[] arguments, int invocationIndex) {
 		return getResolver(parameterContext).resolve(parameterContext, arguments, invocationIndex);
 	}
 
@@ -213,7 +213,7 @@ Resolver createResolver(ParameterContext parameterContext) {
 	}
 
 	interface Resolver {
-		Object resolve(ParameterContext parameterContext, Object[] arguments, Integer invocationIndex);
+		Object resolve(ParameterContext parameterContext, Object[] arguments, int invocationIndex);
 	}
 
 	static class Converter implements Resolver {
@@ -227,7 +227,7 @@ static class Converter implements Resolver {
 		}
 
 		@Override
-		public Object resolve(ParameterContext parameterContext, Object[] arguments, Integer invocationIndex) {
+		public Object resolve(ParameterContext parameterContext, Object[] arguments, int invocationIndex) {
 			Object argument = arguments[parameterContext.getIndex()];
 			try {
 				return this.argumentConverter.convert(argument, parameterContext);
@@ -250,7 +250,7 @@ static class Aggregator implements Resolver {
 		}
 
 		@Override
-		public Object resolve(ParameterContext parameterContext, Object[] arguments, Integer invocationIndex) {
+		public Object resolve(ParameterContext parameterContext, Object[] arguments, int invocationIndex) {
 			ArgumentsAccessor accessor = new DefaultArgumentsAccessor(invocationIndex, arguments);
 			try {
 				return this.argumentsAggregator.aggregateArguments(accessor, parameterContext);

diff --git a/...ter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java b/...ter-params/src/main/java/org/junit/jupiter/params/ParameterizedTestParameterResolver.java
@@ -34,10 +34,10 @@ class ParameterizedTestParameterResolver implements ParameterResolver, AfterTest
 
 	private final ParameterizedTestMethodContext methodContext;
 	private final Object[] arguments;
-	private final Integer invocationIndex;
+	private final int invocationIndex;
 
 	ParameterizedTestParameterResolver(ParameterizedTestMethodContext methodContext, Object[] arguments,
-			Integer invocationIndex) {
+			int invocationIndex) {
 		this.methodContext = methodContext;
 		this.arguments = arguments;
 		this.invocationIndex = invocationIndex;