test: refactor Position class

Author: javier-godoy

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

@@ -19,7 +19,6 @@
  */
 package com.flowingcode.vaadin.addons.xterm.integration;
 
-import static com.flowingcode.vaadin.addons.xterm.integration.Position.at;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.junit.Assert.assertThat;
@@ -33,31 +32,31 @@ public class ConsoleFeatureIT extends AbstractViewTest {
   public void testFeature() throws InterruptedException {
     XTermElement term = $(XTermElement.class).first();
 
-    int y = term.cursorPosition().y;
+    Position pos = term.cursorPosition();
 
     term.sendKeys("HELLO");
     assertThat(term.currentLine(), is("HELLO"));
-    assertThat(term.cursorPosition(), is(at(5, y)));
+    assertThat(term.cursorPosition(), is(pos.plus(5, 0)));
 
     term.sendKeys(Keys.ARROW_LEFT);
-    assertThat(term.cursorPosition(), is(at(4, y)));
+    assertThat(term.cursorPosition(), is(pos.plus(4, 0)));
 
     term.sendKeys(Keys.ARROW_RIGHT);
-    assertThat(term.cursorPosition(), is(at(5, y)));
+    assertThat(term.cursorPosition(), is(pos.plus(5, 0)));
 
     term.sendKeys(Keys.HOME);
-    assertThat(term.cursorPosition(), is(at(0, y)));
+    assertThat(term.cursorPosition(), is(pos.plus(0, 0)));
 
     term.sendKeys(Keys.END);
-    assertThat(term.cursorPosition(), is(at(5, y)));
+    assertThat(term.cursorPosition(), is(pos.plus(5, 0)));
 
     term.sendKeys(Keys.BACK_SPACE);
     assertThat(term.currentLine(), is("HELL"));
-    assertThat(term.cursorPosition(), is(at(4, y)));
+    assertThat(term.cursorPosition(), is(pos.plus(4, 0)));
 
     term.sendKeys(Keys.HOME, Keys.DELETE);
     assertThat(term.currentLine(), is("ELL"));
-    assertThat(term.cursorPosition(), is(at(0, y)));
+    assertThat(term.cursorPosition(), is(pos.plus(0, 0)));
 
     term.sendKeys("A");
     assertThat(term.currentLine(), is("AELL"));
@@ -75,11 +74,11 @@ public void testFeature() throws InterruptedException {
 
     term.sendKeys("\n");
     assertThat(term.currentLine(), is(""));
-    assertThat(term.cursorPosition(), is(at(0, ++y)));
+    assertThat(term.cursorPosition(), is(pos.advance(0, 1)));
 
     term.sendKeys(text);
     term.sendKeys(Keys.HOME);
-    assertThat(term.cursorPosition(), is(at(0, y)));
+    assertThat(term.cursorPosition(), is(pos));
     assertThat(term.currentLine(), is(text));
 
     term.sendKeys("A");
@@ -91,10 +90,10 @@ public void testFeature() throws InterruptedException {
     assertThat(term.lineAtOffset(+1), is(text.substring(cols - 2)));
 
     term.sendKeys(Keys.END);
-    assertThat(term.cursorPosition(), is(at(2, y + 1)));
+    assertThat(term.cursorPosition(), is(pos.plus(2, 1)));
 
     term.sendKeys(Keys.HOME);
-    assertThat(term.cursorPosition(), is(at(0, y)));
+    assertThat(term.cursorPosition(), is(pos));
 
     term.sendKeys(Keys.DELETE);
     assertThat(term.currentLine(), is("B" + text.substring(0, cols - 1)));

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

@@ -29,8 +29,16 @@
 class Position {
   int x, y;
 
-  static Position at(int x, int y) {
-    return new Position(x, y);
+  /**Increments the position by <code>dx,dy</code>.*/
+  public Position advance(int dx, int dy) {
+    this.x+=dx;
+    this.y+=dy;
+    return this;
   }
 
+  /**Return a new position that is equal to this position plus <code>dx,dy</code>.*/
+  public Position plus(int dx, int dy) {
+    return new Position(this.x+dx, this.y+dy);
+  }
+  
 }

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

@@ -1,6 +1,5 @@
 package com.flowingcode.vaadin.addons.xterm.integration;
 
-import static com.flowingcode.vaadin.addons.xterm.integration.Position.at;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.junit.Assert.assertThat;
@@ -13,10 +12,10 @@ public class TerminalHistoryIT extends AbstractViewTest {
   public void testArrowKeys() {
     XTermElement term = $(XTermElement.class).first();
 
-    int y = term.cursorPosition().y;
+    Position pos = term.cursorPosition();
     term.sendKeys("foo1\nfoo2\n");
 
-    assertThat(term.cursorPosition(), is(at(0, y += 2)));
+    assertThat(term.cursorPosition(), is(pos.advance(0, 2)));
     assertThat(term.lineAtOffset(0), isEmptyString());
 
     term.sendKeys(Keys.ARROW_UP);
@@ -39,10 +38,10 @@ public void testArrowKeys() {
   public void testArrowKeysAndRestore() {
     XTermElement term = $(XTermElement.class).first();
 
-    int y = term.cursorPosition().y;
+    Position pos = term.cursorPosition();
     term.sendKeys("foo1\nfoo2\n");
 
-    assertThat(term.cursorPosition(), is(at(0, y += 2)));
+    assertThat(term.cursorPosition(), is(pos.advance(0, 2)));
     assertThat(term.lineAtOffset(0), isEmptyString());
 
     term.sendKeys("bar");

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

@@ -19,7 +19,6 @@
  */
 package com.flowingcode.vaadin.addons.xterm.integration;
 
-import static com.flowingcode.vaadin.addons.xterm.integration.Position.at;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertThat;
@@ -68,22 +67,22 @@ public void componentWorks() {
   public void writeText() throws InterruptedException {
     XTermElement term = $(XTermElement.class).first();
 
-    int y = term.cursorPosition().y;
+    Position pos = term.cursorPosition();
 
     term.sendKeys("HELLO");
     assertThat(term.currentLine(), is("HELLO"));
-    assertThat(term.cursorPosition(), is(at(5, y)));
+    assertThat(term.cursorPosition(), is(pos.plus(5, 0)));
 
     term.sendKeys("HELLO");
     assertThat(term.currentLine(), is("HELLOHELLO"));
-    assertThat(term.cursorPosition(), is(at(10, y)));
+    assertThat(term.cursorPosition(), is(pos.plus(10, 0)));
 
     term.sendKeys("\n");
     assertThat(term.currentLine(), is(""));
-    assertThat(term.cursorPosition(), is(at(0, ++y)));
+    assertThat(term.cursorPosition(), is(pos.advance(0, 1)));
 
     term.sendKeys("HELLO\nWORLD");
     assertThat(term.currentLine(), is("WORLD"));
-    assertThat(term.cursorPosition(), is(at(5, ++y)));
+    assertThat(term.cursorPosition(), is(pos.advance(0, 1).plus(5, 0)));
   }
 }