--- a/jdk/test/java/util/stream/bootlib/java.base/java/util/SpliteratorTestHelper.java Thu May 04 09:43:09 2017 +0100
+++ b/jdk/test/java/util/stream/bootlib/java.base/java/util/SpliteratorTestHelper.java Thu May 04 20:24:12 2017 +0800
@@ -26,8 +26,6 @@
import java.util.stream.LambdaTestHelpers;
import static org.testng.Assert.*;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
/**
* Assertion methods for spliterators, to be called from other tests
@@ -224,22 +222,22 @@
// directly test the primitive methods
if (sp instanceof Spliterator.OfInt) {
Spliterator.OfInt psp = (Spliterator.OfInt) sp;
- executeAndCatch(NullPointerException.class, () -> psp.forEachRemaining((IntConsumer) null));
- executeAndCatch(NullPointerException.class, () -> psp.tryAdvance((IntConsumer) null));
+ assertThrowsNPE(() -> psp.forEachRemaining((IntConsumer) null));
+ assertThrowsNPE(() -> psp.tryAdvance((IntConsumer) null));
}
else if (sp instanceof Spliterator.OfLong) {
Spliterator.OfLong psp = (Spliterator.OfLong) sp;
- executeAndCatch(NullPointerException.class, () -> psp.forEachRemaining((LongConsumer) null));
- executeAndCatch(NullPointerException.class, () -> psp.tryAdvance((LongConsumer) null));
+ assertThrowsNPE(() -> psp.forEachRemaining((LongConsumer) null));
+ assertThrowsNPE(() -> psp.tryAdvance((LongConsumer) null));
}
else if (sp instanceof Spliterator.OfDouble) {
Spliterator.OfDouble psp = (Spliterator.OfDouble) sp;
- executeAndCatch(NullPointerException.class, () -> psp.forEachRemaining((DoubleConsumer) null));
- executeAndCatch(NullPointerException.class, () -> psp.tryAdvance((DoubleConsumer) null));
+ assertThrowsNPE(() -> psp.forEachRemaining((DoubleConsumer) null));
+ assertThrowsNPE(() -> psp.tryAdvance((DoubleConsumer) null));
}
else {
- executeAndCatch(NullPointerException.class, () -> sp.forEachRemaining(null));
- executeAndCatch(NullPointerException.class, () -> sp.tryAdvance(null));
+ assertThrowsNPE(() -> sp.forEachRemaining(null));
+ assertThrowsNPE(() -> sp.tryAdvance(null));
}
}
@@ -653,21 +651,8 @@
}
}
- public static void executeAndCatch(Class<? extends Exception> expected, Runnable r) {
- Exception caught = null;
- try {
- r.run();
- }
- catch (Exception e) {
- caught = e;
- }
-
- assertNotNull(caught,
- String.format("No Exception was thrown, expected an Exception of %s to be thrown",
- expected.getName()));
- assertTrue(expected.isInstance(caught),
- String.format("Exception thrown %s not an instance of %s",
- caught.getClass().getName(), expected.getName()));
+ public static void assertThrowsNPE(ThrowingRunnable r) {
+ assertThrows(NullPointerException.class, r);
}
public static<U> void mixedTraverseAndSplit(Consumer<U> b, Spliterator<U> splTop) {