--- a/test/hotspot/jtreg/serviceability/sa/TestType.java	Mon Feb 04 17:35:38 2019 -0800
+++ b/test/hotspot/jtreg/serviceability/sa/TestType.java	Tue Feb 05 00:43:38 2019 +0530
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
@@ -23,14 +23,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.io.IOException;
-import java.util.stream.Collectors;
-import java.io.OutputStream;
+import java.util.Map;
+import java.util.HashMap;
 import jdk.test.lib.apps.LingeredApp;
-import jdk.test.lib.JDKToolLauncher;
-import jdk.test.lib.Platform;
-import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.Utils;
+import jtreg.SkippedException;
 
 /**
  * @test
@@ -44,84 +41,41 @@
 
 public class TestType {
 
-    private static void testClhsdbForType(
-                        long lingeredAppPid,
-                        String commandString,
-                        String[] expectedOutputStrings) throws Exception {
-
-        Process p;
-        JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jhsdb");
-        launcher.addToolArg("clhsdb");
-        launcher.addToolArg("--pid");
-        launcher.addToolArg(Long.toString(lingeredAppPid));
+    public static void main (String... args) throws Exception {
 
-        ProcessBuilder pb = new ProcessBuilder();
-        pb.command(launcher.getCommand());
-        System.out.println(
-            pb.command().stream().collect(Collectors.joining(" ")));
-
-        try {
-            p = pb.start();
-        } catch (Exception attachE) {
-            throw new Error("Couldn't start jhsdb or attach to LingeredApp : " + attachE);
-        }
-
-        // Issue the 'type' commands at the clhsdb prompt.
-        OutputStream input = p.getOutputStream();
+        System.out.println("Starting TestType test");
+        LingeredApp app = null;
         try {
-            input.write((commandString + "\n").getBytes());
-            input.write("quit\n".getBytes());
-            input.flush();
-        } catch (IOException ioe) {
-            throw new Error("Problem issuing the 'type' command ", ioe);
-        }
-
-        OutputAnalyzer output = new OutputAnalyzer(p);
+            ClhsdbLauncher test = new ClhsdbLauncher();
+            List<String> vmArgs = new ArrayList<String>(Utils.getVmOptions());
 
-        try {
-            p.waitFor();
-        } catch (InterruptedException ie) {
-            p.destroyForcibly();
-            throw new Error("Problem awaiting the child process: " + ie);
-        }
-
-        output.shouldHaveExitValue(0);
-        System.out.println(output.getOutput());
+            app = LingeredApp.startApp(vmArgs);
+            System.out.println ("Started LingeredApp with pid " + app.getPid());
+            List<String> cmds = List.of("type", "type InstanceKlass");
 
-        for (String expectedOutputString: expectedOutputStrings) {
-            output.shouldContain(expectedOutputString);
-        }
-    }
-
-    public static void main (String... args) throws Exception {
-        LingeredApp app = null;
-
-        try {
-            List<String> vmArgs = new ArrayList<String>();
-            vmArgs.addAll(Utils.getVmOptions());
+            Map<String, List<String>> expStrMap = new HashMap<>();
             // Strings to check for in the output of 'type'. The 'type'
             // command prints out entries from 'gHotSpotVMTypes', which
             // is a table containing the hotspot types, their supertypes,
             // sizes, etc, which are of interest to the SA.
-            String[] defaultOutputStrings =
-                {"type G1CollectedHeap CollectedHeap",
-                 "type ConstantPoolCache MetaspaceObj",
-                 "type ConstantPool Metadata",
-                 "type CompilerThread JavaThread",
-                 "type CardGeneration Generation",
-                 "type ArrayKlass Klass",
-                 "type InstanceKlass Klass"};
+            expStrMap.put("type", List.of(
+                "type G1CollectedHeap CollectedHeap",
+                "type ConstantPoolCache MetaspaceObj",
+                "type ConstantPool Metadata",
+                "type CompilerThread JavaThread",
+                "type CardGeneration Generation",
+                "type ArrayKlass Klass",
+                "type InstanceKlass Klass"));
             // String to check for in the output of "type InstanceKlass"
-            String[] instanceKlassOutputString = {"type InstanceKlass Klass"};
-
-            app = LingeredApp.startApp(vmArgs);
-            System.out.println ("Started LingeredApp with pid " + app.getPid());
-            testClhsdbForType(app.getPid(), "type", defaultOutputStrings);
-            testClhsdbForType(app.getPid(),
-                              "type InstanceKlass",
-                              instanceKlassOutputString);
+            expStrMap.put("type InstanceKlass", List.of("type InstanceKlass Klass"));
+            test.run(app.getPid(), cmds, expStrMap, null);
+        } catch (SkippedException se) {
+            throw se;
+        } catch (Exception ex) {
+            throw new RuntimeException("Test ERROR " + ex, ex);
         } finally {
             LingeredApp.stopApp(app);
         }
+        System.out.println("Test PASSED");
     }
 }