test: update integration tests for the new prompt feature

Author: javier-godoy

src/test/java/com/flowingcode/vaadin/addons/xterm/integration/ClipboardFeatureIT.java

@@ -35,6 +35,7 @@ private static int[] intArray(Object obj) {
   public void testFeature() {
     XTermElement term = $(XTermElement.class).first();
 
+    term.setPrompt(null);
     term.write("\\x1bcTEXT");
 
     int[] size =

src/test/java/com/flowingcode/vaadin/addons/xterm/integration/ConsoleFeatureIT.java

@@ -28,6 +28,13 @@
 
 public class ConsoleFeatureIT extends AbstractViewTest {
 
+  /** Returns a line that runs up to the right margin */
+  private String makeFullLine(XTermElement term, boolean hasPrompt) {
+    int cols = term.getColumnWidth();
+    int x = hasPrompt ? term.cursorPosition().x : 0;
+    return StringUtils.repeat("0123456789", cols / 10 + 1).substring(0, cols - x);
+  }
+
   @Test
   public void testFeature() throws InterruptedException {
     XTermElement term = $(XTermElement.class).first();
@@ -67,41 +74,42 @@ public void testFeature() throws InterruptedException {
     term.sendKeys(Keys.INSERT, "C");
     assertThat(term.currentLine(), is("ABCLL"));
 
-    // long line
-
-    int cols = term.getColumnWidth();
-    String text = StringUtils.repeat("0123456789", cols / 10 + 1).substring(0, cols);
 
+    // long line
     term.sendKeys("\n");
     assertThat(term.currentLine(), is(""));
     assertThat(term.cursorPosition(), is(pos.advance(0, 1)));
 
+    String prompt = term.lineAtOffset(0);
+    String text = makeFullLine(term, true);
+    int cols = text.length();
+
     term.sendKeys(text);
     term.sendKeys(Keys.HOME);
     assertThat(term.cursorPosition(), is(pos));
     assertThat(term.currentLine(), is(text));
 
     term.sendKeys("A");
-    assertThat(term.currentLine(), is("A" + text.substring(0, cols - 1)));
-    assertThat(term.lineAtOffset(+1), is(text.substring(cols - 1)));
+    assertThat(term.lineAtOffset(0), is(prompt + "A" + text.substring(0, cols - 1)));
+    assertThat(term.lineAtOffset(1), is(text.substring(cols - 1)));
 
     term.sendKeys("B");
-    assertThat(term.currentLine(), is("AB" + text.substring(0, cols - 2)));
-    assertThat(term.lineAtOffset(+1), is(text.substring(cols - 2)));
+    assertThat(term.lineAtOffset(0), is(prompt + "AB" + text.substring(0, cols - 2)));
+    assertThat(term.lineAtOffset(1), is(text.substring(cols - 2)));
 
     term.sendKeys(Keys.END);
-    assertThat(term.cursorPosition(), is(pos.plus(2, 1)));
+    assertThat(term.cursorPosition(), is(new Position(2, pos.y + 1)));
 
     term.sendKeys(Keys.HOME);
     assertThat(term.cursorPosition(), is(pos));
 
     term.sendKeys(Keys.DELETE);
-    assertThat(term.currentLine(), is("B" + text.substring(0, cols - 1)));
-    assertThat(term.lineAtOffset(+1), is(text.substring(cols - 1)));
+    assertThat(term.lineAtOffset(0), is(prompt + "B" + text.substring(0, cols - 1)));
+    assertThat(term.lineAtOffset(1), is(text.substring(cols - 1)));
 
     term.sendKeys(Keys.DELETE);
-    assertThat(term.currentLine(), is(text));
-    assertThat(term.lineAtOffset(+1), isEmptyString());
+    assertThat(term.lineAtOffset(0), is(prompt + text));
+    assertThat(term.lineAtOffset(1), isEmptyString());
   }
 
   @Test

src/test/java/com/flowingcode/vaadin/addons/xterm/integration/TerminalHistoryIT.java

@@ -16,7 +16,7 @@ public void testArrowKeys() {
     term.sendKeys("foo1\nfoo2\n");
 
     assertThat(term.cursorPosition(), is(pos.advance(0, 2)));
-    assertThat(term.lineAtOffset(0), isEmptyString());
+    assertThat(term.currentLine(), isEmptyString());
 
     term.sendKeys(Keys.ARROW_UP);
     assertThat(term.currentLine(), is("foo2"));
@@ -42,7 +42,7 @@ public void testArrowKeysAndRestore() {
     term.sendKeys("foo1\nfoo2\n");
 
     assertThat(term.cursorPosition(), is(pos.advance(0, 2)));
-    assertThat(term.lineAtOffset(0), isEmptyString());
+    assertThat(term.currentLine(), isEmptyString());
 
     term.sendKeys("bar");
     term.sendKeys(Keys.ARROW_UP);

src/test/java/com/flowingcode/vaadin/addons/xterm/integration/XTermElement.java

@@ -29,14 +29,15 @@ public int getColumnWidth() {
   }
 
   final String currentLine() {
-    return lineAtOffset(0);
+    return getPropertyString("currentLine");
   }
 
   public String lineAtOffset(int offset) {
-    String command =
-        "buffer=arguments[0].terminal._core._inputHandler._bufferService.buffer; return buffer.lines.get(buffer.ybase+buffer.y+(%s)).translateToString()";
-    command = String.format(command, offset);
-    return ((String) executeScript(command, this)).replaceFirst("\\s+$", "");
+    return ((String) executeScript(
+        "buffer=arguments[0].terminal._core._inputHandler._bufferService.buffer;"
+            + "line=buffer.lines.get(buffer.ybase+buffer.y+(arguments[1]));"
+            + "return line.translateToString().substr(0,line.getTrimmedLength());",
+        this, offset));
   }
 
   public Position cursorPosition() {