-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Add List-based support to Arguments API #4574
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
3a32cf8
to
9de99b7
Compare
9de99b7
to
3f3aa29
Compare
static Arguments of(@Nullable List<@Nullable Object> arguments) { | ||
if (arguments == null) { | ||
return of((Object) null); // Properly wrap null | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
static Arguments of(@Nullable List<@Nullable Object> arguments) { | |
if (arguments == null) { | |
return of((Object) null); // Properly wrap null | |
} | |
static Arguments of(List<@Nullable Object> arguments) { | |
Preconditions.notNull(arguments, "arguments must not be null"); |
if (arguments.isEmpty()) { | ||
// Must still return empty arguments array | ||
return of(new Object[0]); | ||
} | ||
return () -> arguments.toArray(new Object[0]); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if (arguments.isEmpty()) { | |
// Must still return empty arguments array | |
return of(new Object[0]); | |
} | |
return () -> arguments.toArray(new Object[0]); | |
return of(arguments.toArray()); |
static ArgumentSet argumentSet(String name, List<@Nullable Object> arguments) { | ||
Preconditions.notBlank(name, "name must not be null or blank"); | ||
Preconditions.notNull(arguments, "arguments list must not be null"); | ||
return new ArgumentSet(name, arguments.toArray(new Object[0])); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
return new ArgumentSet(name, arguments.toArray(new Object[0])); | |
return new ArgumentSet(name, arguments.toArray()); |
return Stream.of(arguments(Collections.emptyList())); | ||
return Stream.of(Arguments.of((Object) Collections.emptyList())); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This makes me wonder whether we should choose different names instead of overloading of()
, arguments()
, and argumentSet()
to avoid such breakages. Maybe copyOf
, argumentsOf
, and argumentSetOf()
?
@junit-team/junit-5 WDYT?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, we unfortunately overlooked the fact that a single List
is also a single Object
, so we definitely cannot go with this as-is.
Existing code must still compile without adding casts.
Though, in our defense, it is easy to overlook something like that when "coding in the browser". 😉
Maybe
copyOf
,argumentsOf
, andargumentSetOf()
?
I would rather go with something consistent, instead of having "copy" in only one of the names.
How about something like fromList()
, argumentsFromList()
, and argumentSetFromList()
?
We could also drop the List
part of the names, if we are somehow sure we will never introduce yet-another-set-of-overloads. So, something like from()
, argumentsFrom()
, and argumentSetFrom()
.
Thoughts?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the thoughtful feedback! I agree that it's important to avoid breaking existing usage. I also like the idea of going with a more general naming convention, so my preference would be to use from()
instead of fromList()
or argumentsFrom()
. I'm happy to update the PR accordingly once there's consensus.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1 on the shorter variants. We might even get away with adding overloads to that in the future because "conflicts" with List
seem less likely than with Object...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have updated the code with the suggestions!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd pondered it more while away from the computer and decided that I'm in favor of the from()
, argumentsFrom()
and argumentSetFrom()
variants because of the brevity and also because of the nice symmetry with the new toList()
instance method.
from(List)
and toList()
work well together.
So, I'm glad to see you both agree and that you're already implemented the changes, @mariokhoury4. 👍
@@ -172,4 +176,72 @@ public String toString() { | |||
|
|||
} | |||
|
|||
/** |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please move these next to the other static
factory methods above.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the suggestion! I'll move the method next to the other static factory methods to keep things consistent.
cbde5ed
to
a2ca294
Compare
a2ca294
to
d566f95
Compare
@@ -125,6 +129,77 @@ static ArgumentSet argumentSet(String name, @Nullable Object... arguments) { | |||
return new ArgumentSet(name, arguments); | |||
} | |||
|
|||
/** | |||
* Factory method for creating an instance of {@code Arguments} based on | |||
* the supplied {@code arguments} as a {@link List}. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
* the supplied {@code arguments} as a {@link List}. | |
* the supplied {@link List} of {@code arguments}. |
(same below for other methods)
* @param arguments the arguments as a List to be used for an invocation | ||
* of the test method; must not be {@code null} but may contain {@code null} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
* @param arguments the arguments as a List to be used for an invocation | |
* of the test method; must not be {@code null} but may contain {@code null} | |
* @param arguments the arguments to be used for an invocation of the test | |
* method; must not be {@code null} but may contain {@code null} |
(same below for other methods)
* Convert the arguments to a new mutable {@link List} containing the same | ||
* elements as {@link #get()}. | ||
* | ||
* <p>This is useful for test logic that benefits from {@code List} operations such as filtering, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please hard-wrap lines at 80 chars.
@@ -56,4 +60,50 @@ void argumentsReturnsSameArrayUsedForCreating() { | |||
assertThat(arguments.get()).isSameAs(input); | |||
} | |||
|
|||
@Test | |||
void ofSupportsList() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
void ofSupportsList() { | |
void fromSupportsList() { |
} | ||
|
||
@Test | ||
void argumentsSupportsListAlias() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
void argumentsSupportsListAlias() { | |
void argumentsFromSupportsList() { |
|
||
assertThat(result).containsExactly("a", 2, null); // preserves content | ||
result.add("extra"); // confirms mutability | ||
assertThat(result).contains("extra"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please also verify that the array in arguments
can't be modified.
|
||
@Test | ||
void toListWorksOnEmptyArguments() { | ||
Arguments arguments = Arguments.from(Arrays.asList()); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Arguments arguments = Arguments.from(Arrays.asList()); | |
Arguments arguments = Arguments.of(); |
|
||
@Test | ||
void toListReturnsMutableListOfArguments() { | ||
Arguments arguments = Arguments.from(Arrays.asList("a", 2, null)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Arguments arguments = Arguments.from(Arrays.asList("a", 2, null)); | |
Arguments arguments = Arguments.of("a", 2, null); |
List<Object> input = Arrays.asList(1, "two", null, 3.0); | ||
Arguments arguments = Arguments.from(input); | ||
|
||
assertArrayEquals(new Object[] { 1, "two", null, 3.0 }, arguments.get()); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add an assertion verifying that modifying the initial List
has no effect on arguments
* @param arguments the arguments to be used for an invocation of the test | ||
* method; must not be {@code null} but may contain {@code null}. | ||
* @return an instance of {@code Arguments}; never {@code null}. | ||
* @since 6.0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
* @param arguments the arguments to be used for an invocation of the test | |
* method; must not be {@code null} but may contain {@code null}. | |
* @return an instance of {@code Arguments}; never {@code null}. | |
* @since 6.0 | |
* @param arguments the arguments to be used for an invocation of the test | |
* method; must not be {@code null} but may contain {@code null} | |
* @return an instance of {@code Arguments}; never {@code null} | |
* @since 6.0 |
* @param arguments the arguments to be used for an invocation of the test | ||
* method; must not be {@code null} but may contain {@code null}. | ||
* @return an instance of {@code Arguments}; never {@code null}. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
* @param arguments the arguments to be used for an invocation of the test | |
* method; must not be {@code null} but may contain {@code null}. | |
* @return an instance of {@code Arguments}; never {@code null}. | |
* @param arguments the arguments to be used for an invocation of the test | |
* method; must not be {@code null} but may contain {@code null} | |
* @return an instance of {@code Arguments}; never {@code null} |
* @param name the name of the argument set; must not be {@code null} | ||
* or blank. | ||
* @param arguments the arguments to be used for an invocation of the test | ||
* method; must not be {@code null} but may contain {@code null}. | ||
* @return an {@code ArgumentSet}; never {@code null}. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
* @param name the name of the argument set; must not be {@code null} | |
* or blank. | |
* @param arguments the arguments to be used for an invocation of the test | |
* method; must not be {@code null} but may contain {@code null}. | |
* @return an {@code ArgumentSet}; never {@code null}. | |
* @param name the name of the argument set; must not be {@code null} | |
* or blank | |
* @param arguments the arguments to be used for an invocation of the test | |
* method; must not be {@code null} but may contain {@code null} | |
* @return an {@code ArgumentSet}; never {@code null} |
* @return a mutable List of arguments; never {@code null} but may contain | ||
* {@code null}. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
* @return a mutable List of arguments; never {@code null} but may contain | |
* {@code null}. | |
* @return a mutable List of arguments; never {@code null} but may contain | |
* {@code null} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just wondering: have you considered Iterable<? extends @Nullable Object>
rather than using a plain List
?
Based on my experience with checkerframework's @Nullable
, I would suggest List<? extends @Nullable Object>
rather than List<Object>
.
I've asked jspecify to clarify the documentation anyways: jspecify/jspecify#748
At the same time, it would be nice to add tests that pass something like List<String>
to the newly added methods.
For instance, from(Files.readAllLines("path"))
. I guess the code won't compile if the method uses List<Object>
signatures.
* @see #argumentsFrom(List) | ||
*/ | ||
@API(status = EXPERIMENTAL, since = "6.0") | ||
static Arguments from(List<@Nullable Object> arguments) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this use generic variance?
Otherwise users would not be able to pass a list with non-nullable values.
static Arguments from(List<@Nullable Object> arguments) { | |
static Arguments from(List<?> arguments) { |
* @see #argumentSet(String, Object...) | ||
*/ | ||
@API(status = EXPERIMENTAL, since = "6.0") | ||
static Arguments argumentsFrom(List<@Nullable Object> arguments) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
static Arguments argumentsFrom(List<@Nullable Object> arguments) { | |
static Arguments argumentsFrom(List<?> arguments) { |
One more thing: |
I didn't know that but sounds like you're right, according to the spec:
Therefore, I think using
The use case we're addressing here is constructing new |
* @param arguments the arguments to be used for an invocation of the test | ||
* method; must not be {@code null} but may contain {@code null}. | ||
* @return an instance of {@code Arguments}; never {@code null}. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is It really worth documenting never {@code null}.
? I'm afraid it adds excessive verbosity.
I think the best practice is non-null
by default, so WDYT of documenting only the places where nulls can appear rather than trying to document every possible case?
* @param arguments the arguments to be used for an invocation of the test | |
* method; must not be {@code null} but may contain {@code null}. | |
* @return an instance of {@code Arguments}; never {@code null}. | |
* @param arguments the arguments to be used for an invocation of the test | |
* method; it may contain {@code null} elements. | |
* @return an instance of {@code Arguments} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It may be excessive but clear. Moreover, we'd have to change that throughout the entire code base.
@marcphilipp , sorry for asking the same thing twice, however, could you please clarify why do you mean To me the second case of #4535 sounds like a natural case for using
I've no issues if Of course, it would be great if Java had something like If you mean you force |
The use case we're trying to address here is to go from an existing
We'll discuss that in one of our next team calls. |
Overview
This PR adds List-based support to the
Arguments
API for parameterized tests.New additions:
Arguments.of(List<@Nullable Object>)
Arguments.arguments(List<@Nullable Object>)
(alias)Arguments.argumentSet(String, List<@Nullable Object>)
Arguments.toList()
— returns a mutableList<@Nullable Object>
These additions make it easier to dynamically build arguments from collections when using
@ParameterizedTest
.All additions are tested in
ArgumentsTests.java
.Fixes #4535
I hereby agree to the terms of the JUnit Contributor License Agreement.
Definition of Done
@API
annotations