--- old/test/jdk/com/sun/jdi/lib/jdb/JdbCommand.java	2018-10-16 20:53:08.000000000 -0700
+++ new/test/jdk/com/sun/jdi/lib/jdb/JdbCommand.java	2018-10-16 20:53:07.000000000 -0700
@@ -118,6 +118,7 @@
 public class JdbCommand {
     final String cmd;
     boolean allowExit = false;
+    boolean replyIsSimplePrompt = false;
 
     public JdbCommand(String cmd) {
         this.cmd = cmd;
@@ -128,6 +129,11 @@
         return this;
     }
 
+    public JdbCommand replyIsSimplePrompt() {
+        replyIsSimplePrompt = true;
+        return this;
+    }
+
 
     public static JdbCommand run(String ... params) {
         return new JdbCommand("run " + Arrays.stream(params).collect(Collectors.joining(" ")));
@@ -145,10 +151,18 @@
     public static JdbCommand stopAt(String targetClass, int lineNum) {
         return new JdbCommand("stop at " + targetClass + ":" + lineNum);
     }
+    public static JdbCommand stopThreadAt(String targetClass, int lineNum) {
+        return new JdbCommand("stop thread at " + targetClass + ":" + lineNum);
+    }
+    public static JdbCommand stopGoAt(String targetClass, int lineNum) {
+        return new JdbCommand("stop go at " + targetClass + ":" + lineNum);
+    }
     public static JdbCommand stopIn(String targetClass, String methodName) {
         return new JdbCommand("stop in " + targetClass + "." + methodName);
     }
-
+    public static JdbCommand thread(int threadNumber) {
+        return new JdbCommand("thread " + threadNumber);
+    }
     // clear <class id>:<line>   -- clear a breakpoint at a line
     public static JdbCommand clear(String targetClass, int lineNum) {
         return new JdbCommand("clear " + targetClass + ":" + lineNum);