Skip to content

Commit 0d49899

Browse files
committed
Simplify Stream check in FieldArgumentsProvider
1 parent aac45b9 commit 0d49899

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/FieldArgumentsProvider.java

+3-12
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
import java.util.Iterator;
2020
import java.util.function.Predicate;
2121
import java.util.function.Supplier;
22-
import java.util.stream.DoubleStream;
23-
import java.util.stream.IntStream;
24-
import java.util.stream.LongStream;
22+
import java.util.stream.BaseStream;
2523
import java.util.stream.Stream;
2624

2725
import org.junit.jupiter.api.extension.ExtensionContext;
@@ -107,15 +105,8 @@ private static Object readField(Field field, Object testInstance) {
107105
Preconditions.notNull(value,
108106
() -> format("The value of field [%s] in class [%s] must not be null", fieldName, declaringClass));
109107

110-
boolean isStream = value instanceof Stream//
111-
|| value instanceof DoubleStream//
112-
|| value instanceof IntStream//
113-
|| value instanceof LongStream;
114-
115-
Preconditions.condition(!isStream,
116-
() -> format(
117-
"The value of field [%s] in class [%s] must not be a Stream, IntStream, LongStream, or DoubleStream",
118-
fieldName, declaringClass));
108+
Preconditions.condition(!(value instanceof BaseStream),
109+
() -> format("The value of field [%s] in class [%s] must not be a stream", fieldName, declaringClass));
119110

120111
Preconditions.condition(!(value instanceof Iterator),
121112
() -> format("The value of field [%s] in class [%s] must not be an Iterator", fieldName, declaringClass));

junit-jupiter-params/src/test/java/org/junit/jupiter/params/provider/FieldArgumentsProviderTests.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -434,8 +434,7 @@ void throwsExceptionWhenLocalFieldHasStreamReturnType(String field) {
434434

435435
var exception = assertThrows(PreconditionViolationException.class, () -> provideArguments(field).toArray());
436436

437-
assertThat(exception.getMessage()).isEqualTo(
438-
"The value of field [%s] in class [%s] must not be a Stream, IntStream, LongStream, or DoubleStream",
437+
assertThat(exception.getMessage()).isEqualTo("The value of field [%s] in class [%s] must not be a stream",
439438
field, factoryClass);
440439
}
441440

0 commit comments

Comments
 (0)