File tree Expand file tree Collapse file tree 2 files changed +7
-7
lines changed
junit-jupiter-params/src/main/java/org/junit/jupiter/params Expand file tree Collapse file tree 2 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -150,10 +150,10 @@ protected static Stream<? extends Arguments> arguments(ArgumentsProvider provide
150
150
}
151
151
152
152
private Object [] consumedArguments (Object [] arguments , ParameterizedTestMethodContext methodContext ) {
153
- int parameterCount = methodContext .getParameterCount ();
154
153
if (methodContext .hasAggregator ()) {
155
154
return arguments ;
156
155
}
156
+ int parameterCount = methodContext .getParameterCount ();
157
157
return arguments .length > parameterCount ? Arrays .copyOf (arguments , parameterCount ) : arguments ;
158
158
}
159
159
Original file line number Diff line number Diff line change @@ -73,14 +73,14 @@ private static boolean looksLikeAFullyQualifiedMethodName(String factoryMethodNa
73
73
if (factoryMethodName .contains ("#" )) {
74
74
return true ;
75
75
}
76
- int indexOfDot = factoryMethodName .indexOf ("." );
77
- if (indexOfDot == -1 ) {
76
+ int indexOfFirstDot = factoryMethodName .indexOf ('.' );
77
+ if (indexOfFirstDot == -1 ) {
78
78
return false ;
79
79
}
80
- int indexOfOpeningParenthesis = factoryMethodName .indexOf ( "(" );
81
- if (indexOfOpeningParenthesis > 0 ) {
82
- // Exclude simple method names with parameters
83
- return indexOfDot < indexOfOpeningParenthesis ;
80
+ int indexOfLastOpeningParenthesis = factoryMethodName .lastIndexOf ( '(' );
81
+ if (indexOfLastOpeningParenthesis > 0 ) {
82
+ // Exclude simple/local method names with parameters
83
+ return indexOfFirstDot < indexOfLastOpeningParenthesis ;
84
84
}
85
85
// If we get this far, we conclude the supplied factory method name "looks"
86
86
// like it was intended to be a fully qualified method name, even if the
You can’t perform that action at this time.
0 commit comments