Polishing

junit-team · Jan 23, 2023 · 30cfc3b · 30cfc3b
1 parent 0af9910
commit 30cfc3b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 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
@@ -150,10 +150,10 @@ protected static Stream<? extends Arguments> arguments(ArgumentsProvider provide
 	}
 
 	private Object[] consumedArguments(Object[] arguments, ParameterizedTestMethodContext methodContext) {
-		int parameterCount = methodContext.getParameterCount();
 		if (methodContext.hasAggregator()) {
 			return arguments;
 		}
+		int parameterCount = methodContext.getParameterCount();
 		return arguments.length > parameterCount ? Arrays.copyOf(arguments, parameterCount) : arguments;
 	}
 

diff --git a/...piter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java b/...piter-params/src/main/java/org/junit/jupiter/params/provider/MethodArgumentsProvider.java
@@ -73,14 +73,14 @@ private static boolean looksLikeAFullyQualifiedMethodName(String factoryMethodNa
 		if (factoryMethodName.contains("#")) {
 			return true;
 		}
-		int indexOfDot = factoryMethodName.indexOf(".");
-		if (indexOfDot == -1) {
+		int indexOfFirstDot = factoryMethodName.indexOf('.');
+		if (indexOfFirstDot == -1) {
 			return false;
 		}
-		int indexOfOpeningParenthesis = factoryMethodName.indexOf("(");
-		if (indexOfOpeningParenthesis > 0) {
-			// Exclude simple method names with parameters
-			return indexOfDot < indexOfOpeningParenthesis;
+		int indexOfLastOpeningParenthesis = factoryMethodName.lastIndexOf('(');
+		if (indexOfLastOpeningParenthesis > 0) {
+			// Exclude simple/local method names with parameters
+			return indexOfFirstDot < indexOfLastOpeningParenthesis;
 		}
 		// If we get this far, we conclude the supplied factory method name "looks"
 		// like it was intended to be a fully qualified method name, even if the