8288495: [test] Make OutputAnalyzer exception more informative

Reviewed-by: lmesnik, naoto, jpai, dholmes

Author: Roger Riggs

test/lib-test/jdk/test/lib/process/OutputAnalyzerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, 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
@@ -24,12 +24,12 @@
 /*
  * @test
  * @summary Test the OutputAnalyzer utility class
- * @modules java.management
  * @library /test/lib
  * @run main OutputAnalyzerTest
  */
 
 import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
 
 public class OutputAnalyzerTest {
 
@@ -216,6 +216,32 @@ public static void main(String args[]) throws Exception {
                 throw new Exception("firstMatch(String, int) failed to match. Expected: " + aa + " got: " + result);
             }
         }
+
+        {
+            try {
+                // Verify the exception message
+                OutputAnalyzer out = ProcessTools.executeProcess("true");
+                out.shouldHaveExitValue(1);
+                throw new RuntimeException("'shouldHaveExitValue' should have thrown an exception");
+            } catch (Throwable ex) {
+                if (!ex.getMessage().equals("Expected to get exit value of [1], exit value is: [0]")) {
+                    throw new RuntimeException("Unexpected message: " + ex.getMessage());
+                }
+            }
+        }
+
+        {
+            try {
+                // Verify the exception message
+                OutputAnalyzer out = ProcessTools.executeProcess("true");
+                out.shouldNotHaveExitValue(0);
+                throw new RuntimeException("'shouldNotHaveExitValue' should have thrown an exception");
+            } catch (Throwable ex) {
+                if (!ex.getMessage().equals("Unexpected to get exit value of [0]")) {
+                    throw new RuntimeException("Unexpected message: " + ex.getMessage());
+                }
+            }
+        }
     }
 
 }

test/lib/jdk/test/lib/process/OutputAnalyzer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, 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
@@ -218,7 +218,7 @@ public OutputAnalyzer shouldContain(String expectedString) {
         String stderr = getStderr();
         if (!stdout.contains(expectedString) && !stderr.contains(expectedString)) {
             reportDiagnosticSummary();
-            throw new RuntimeException("'" + expectedString + "' missing from stdout/stderr \n");
+            throw new RuntimeException("'" + expectedString + "' missing from stdout/stderr");
         }
         return this;
     }
@@ -233,7 +233,7 @@ public OutputAnalyzer stdoutShouldContain(String expectedString) {
         String stdout = getStdout();
         if (!stdout.contains(expectedString)) {
             reportDiagnosticSummary();
-            throw new RuntimeException("'" + expectedString + "' missing from stdout \n");
+            throw new RuntimeException("'" + expectedString + "' missing from stdout");
         }
         return this;
     }
@@ -248,7 +248,7 @@ public OutputAnalyzer stderrShouldContain(String expectedString) {
         String stderr = getStderr();
         if (!stderr.contains(expectedString)) {
             reportDiagnosticSummary();
-            throw new RuntimeException("'" + expectedString + "' missing from stderr \n");
+            throw new RuntimeException("'" + expectedString + "' missing from stderr");
         }
         return this;
     }
@@ -264,11 +264,11 @@ public OutputAnalyzer shouldNotContain(String notExpectedString) {
         String stderr = getStderr();
         if (stdout.contains(notExpectedString)) {
             reportDiagnosticSummary();
-            throw new RuntimeException("'" + notExpectedString + "' found in stdout \n");
+            throw new RuntimeException("'" + notExpectedString + "' found in stdout");
         }
         if (stderr.contains(notExpectedString)) {
             reportDiagnosticSummary();
-            throw new RuntimeException("'" + notExpectedString + "' found in stderr \n");
+            throw new RuntimeException("'" + notExpectedString + "' found in stderr");
         }
         return this;
     }
@@ -302,7 +302,7 @@ public OutputAnalyzer stdoutShouldNotContain(String notExpectedString) {
         String stdout = getStdout();
         if (stdout.contains(notExpectedString)) {
             reportDiagnosticSummary();
-            throw new RuntimeException("'" + notExpectedString + "' found in stdout \n");
+            throw new RuntimeException("'" + notExpectedString + "' found in stdout");
         }
         return this;
     }
@@ -317,7 +317,7 @@ public OutputAnalyzer stderrShouldNotContain(String notExpectedString) {
         String stderr = getStderr();
         if (stderr.contains(notExpectedString)) {
             reportDiagnosticSummary();
-            throw new RuntimeException("'" + notExpectedString + "' found in stderr \n");
+            throw new RuntimeException("'" + notExpectedString + "' found in stderr");
         }
         return this;
     }
@@ -338,7 +338,7 @@ public OutputAnalyzer shouldMatch(String regexp) {
         if (!stdoutMatcher.find() && !stderrMatcher.find()) {
             reportDiagnosticSummary();
             throw new RuntimeException("'" + regexp
-                  + "' missing from stdout/stderr \n");
+                  + "' missing from stdout/stderr");
         }
         return this;
     }
@@ -356,7 +356,7 @@ public OutputAnalyzer stdoutShouldMatch(String regexp) {
         if (!matcher.find()) {
             reportDiagnosticSummary();
             throw new RuntimeException("'" + regexp
-                  + "' missing from stdout \n");
+                  + "' missing from stdout");
         }
         return this;
     }
@@ -374,7 +374,7 @@ public OutputAnalyzer stderrShouldMatch(String pattern) {
         if (!matcher.find()) {
             reportDiagnosticSummary();
             throw new RuntimeException("'" + pattern
-                  + "' missing from stderr \n");
+                  + "' missing from stderr");
         }
         return this;
     }
@@ -393,15 +393,15 @@ public OutputAnalyzer shouldNotMatch(String regexp) {
         if (matcher.find()) {
             reportDiagnosticSummary();
             throw new RuntimeException("'" + regexp
-                    + "' found in stdout: '" + matcher.group() + "' \n");
+                    + "' found in stdout: '" + matcher.group() + "'");
         }
 
         String stderr = getStderr();
         matcher = pattern.matcher(stderr);
         if (matcher.find()) {
             reportDiagnosticSummary();
             throw new RuntimeException("'" + regexp
-                    + "' found in stderr: '" + matcher.group() + "' \n");
+                    + "' found in stderr: '" + matcher.group() + "'");
         }
 
         return this;
@@ -420,7 +420,7 @@ public OutputAnalyzer stdoutShouldNotMatch(String regexp) {
         if (matcher.find()) {
             reportDiagnosticSummary();
             throw new RuntimeException("'" + regexp
-                    + "' found in stdout \n");
+                    + "' found in stdout");
         }
         return this;
     }
@@ -438,7 +438,7 @@ public OutputAnalyzer stderrShouldNotMatch(String regexp) {
         if (matcher.find()) {
             reportDiagnosticSummary();
             throw new RuntimeException("'" + regexp
-                    + "' found in stderr \n");
+                    + "' found in stderr");
         }
         return this;
     }
@@ -487,7 +487,7 @@ public OutputAnalyzer shouldHaveExitValue(int expectedExitValue) {
         if (getExitValue() != expectedExitValue) {
             reportDiagnosticSummary();
             throw new RuntimeException("Expected to get exit value of ["
-                    + expectedExitValue + "]\n");
+                    + expectedExitValue + "], exit value is: [" + getExitValue() + "]");
         }
         return this;
     }
@@ -502,7 +502,7 @@ public OutputAnalyzer shouldNotHaveExitValue(int notExpectedExitValue) {
         if (getExitValue() == notExpectedExitValue) {
             reportDiagnosticSummary();
             throw new RuntimeException("Unexpected to get exit value of ["
-                    + notExpectedExitValue + "]\n");
+                    + notExpectedExitValue + "]");
         }
         return this;
     }
@@ -637,7 +637,7 @@ public OutputAnalyzer stderrShouldMatchIgnoreVMWarnings(String pattern) {
         if (!matcher.find()) {
             reportDiagnosticSummary();
             throw new RuntimeException("'" + pattern
-                  + "' missing from stderr \n");
+                  + "' missing from stderr");
         }
         return this;
     }