test/jdk/sun/tools/jps/JpsHelper.java

rev 51638 : [mq]: 8210112
rev 51639 : [mq]: 8210112-1

*** 33,47 ****
  import java.nio.file.Paths;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.List;
  
  import jdk.testlibrary.Asserts;
  import jdk.testlibrary.JDKToolLauncher;
- import jdk.testlibrary.OutputAnalyzer;
  import jdk.testlibrary.Utils;
- import jdk.testlibrary.ProcessTools;
  
  /**
   * The helper class for running jps utility and verifying output from it
   */
  public final class JpsHelper {
--- 33,47 ----
  import java.nio.file.Paths;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.List;
  
+ import jdk.test.lib.process.OutputAnalyzer;
+ import jdk.test.lib.process.ProcessTools;
  import jdk.testlibrary.Asserts;
  import jdk.testlibrary.JDKToolLauncher;
  import jdk.testlibrary.Utils;
  
  /**
   * The helper class for running jps utility and verifying output from it
   */
  public final class JpsHelper {
*** 182,195 ****
       * The output can look like:
       * 35536 Jps
       * 35417 Main
       * 31103 org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar
       */
!     public static void verifyJpsOutput(OutputAnalyzer output, String regex) throws Exception {
          output.shouldHaveExitValue(0);
!         int matchedCount = output.stdoutShouldMatchByLine(regex);
!         assertGreaterThan(matchedCount , 0, "Found no lines matching pattern: " + regex);
          output.stderrShouldNotMatch("[E|e]xception");
          output.stderrShouldNotMatch("[E|e]rror");
      }
  
      /**
--- 182,194 ----
       * The output can look like:
       * 35536 Jps
       * 35417 Main
       * 31103 org.eclipse.equinox.launcher_1.3.0.v20120522-1813.jar
       */
!     public static void verifyJpsOutput(OutputAnalyzer output, String regex) {
          output.shouldHaveExitValue(0);
!         output.stdoutShouldMatchByLine(regex);
          output.stderrShouldNotMatch("[E|e]xception");
          output.stderrShouldNotMatch("[E|e]rror");
      }
  
      /**