--- a/test/jdk/tools/jpackage/macosx/base/SigningCheck.java Wed Oct 16 09:57:23 2019 -0400
+++ b/test/jdk/tools/jpackage/macosx/base/SigningCheck.java Wed Oct 16 10:32:08 2019 -0400
@@ -88,13 +88,12 @@
.setExecutable("security")
.addArguments("dump-trust-settings")
.executeAndGetOutput();
- result.stream().peek(TKit::trace);
- result.stream()
- .filter(line -> line.trim().endsWith(name)).findFirst().orElseThrow(
- () -> {
- throw TKit.throwSkippedException("Certifcate not trusted by current user: "
- + name);
- });
+ result.stream().forEachOrdered(TKit::trace);
+ TKit.assertTextStream(name)
+ .predicate((line, what) -> line.trim().endsWith(what))
+ .orElseThrow(() -> TKit.throwSkippedException(
+ "Certifcate not trusted by current user: " + name))
+ .apply(result.stream());
}
}