8333765: [17u] Six sun/tools/jstatd testcases fail after JDK-8233725

Signed-off-by: sendaoYan <yansendao.ysd@alibaba-inc.com>
sendaoYan · Jun 7, 2024 · ac4ea5f · ac4ea5f
1 parent af699ff
commit ac4ea5f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/test/jdk/sun/tools/jstatd/JstatdTest.java b/test/jdk/sun/tools/jstatd/JstatdTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -356,7 +356,7 @@ private void runTest(boolean useShortSyntax) throws Throwable {
 
         // Verify output from jstatd
         OutputAnalyzer output = jstatdThread.getOutput();
-        List<String> stdout = output.asLinesWithoutVMWarnings();
+        List<String> stdout = output.asLinesWithoutAnythingWarnings();
         output.reportDiagnosticSummary();
         assertEquals(stdout.size(), 1, "Output should contain one line");
         assertTrue(stdout.get(0).startsWith("jstatd started"), "List should start with 'jstatd started'");

diff --git a/test/lib/jdk/test/lib/process/OutputAnalyzer.java b/test/lib/jdk/test/lib/process/OutputAnalyzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,8 @@ public final class OutputAnalyzer {
 
     private static final String jvmwarningmsg = ".* VM warning:.*";
 
+    private static final String anythingwarningmsg = ".*WARNING:.*";
+
     private static final String deprecatedmsg = ".* VM warning:.* deprecated.*";
 
     private final OutputBuffer buffer;
@@ -654,6 +656,18 @@ public List<String> asLinesWithoutVMWarnings() {
                      .collect(Collectors.toList());
     }
 
+    /**
+     * Returns the contents of the output buffer (stdout and stderr), without anything
+     * warning msgs, as list of strings. Output is split by newlines.
+     *
+     * @return Contents of the output buffer as list of strings
+     */
+    public List<String> asLinesWithoutAnythingWarnings() {
+        return Arrays.stream(getOutput().split("\\R"))
+                     .filter(Pattern.compile(anythingwarningmsg).asPredicate().negate())
+                     .collect(Collectors.toList());
+    }
+
     /**
      * @see #shouldMatchByLine(String, String, String)
      */