--- old/test/java/util/stream/bootlib/java.base/java/util/stream/LambdaTestHelpers.java 2016-01-23 18:28:30.423762500 +0600 +++ new/test/java/util/stream/bootlib/java.base/java/util/stream/LambdaTestHelpers.java 2016-01-23 18:28:30.148727600 +0600 @@ -47,6 +47,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; +import static org.testng.Assert.assertFalse; /** * LambdaTestHelpers -- assertion methods and useful objects for lambda test cases @@ -400,6 +401,20 @@ assertEquals(toBoxedMultiset(actual), toBoxedMultiset(expected)); } + public static void assertContains(Optional actual, Iterator it) { + if (actual.isPresent()) { + T r = actual.get(); + boolean contained = false; + while (!contained && it.hasNext()) { + contained = Objects.equals(r, it.next()); + } + assertTrue(contained); + } + else { + assertFalse(it.hasNext()); + } + } + public static void launderAssertion(Runnable r, Supplier additionalInfo) { try { r.run();