test/jdk/tools/jpackage/share/InstallDirTest.java

@@ -124,15 +124,11 @@
         .addInitializer(cmd -> {
             cmd.addArguments("--install-dir", installDir);
             cmd.saveConsoleOutput(true);
         })
         .addBundleVerifier((cmd, result) -> {
-            String errorMessage = JPackageCommand.filterOutput(
-                    result.getOutput().stream()).filter(line -> line.contains(
-                    errorMessageSubstring)).findFirst().orElse(null);
-            TKit.assertNotNull(errorMessage, String.format(
-                    "Check output contains [%s] substring",
-                    errorMessageSubstring));
+            TKit.assertTextStream(errorMessageSubstring).apply(
+                    result.getOutput().stream());
         })
         .run();
     }
 }