Commit 4b65f2f

mo khan <mo@mokhan.ca>
2019-08-05 19:51:53
decouple from old constant names
master
1 parent 775ea70
Changed files (1)
src
Q9
MovingRobotTest.java
src/Q9/MovingRobotTest.java
@@ -30,106 +30,106 @@ public class MovingRobotTest extends TestCase {
 
   public void test_validateNextMove_whenAtZeroZero() {
     this.subject = new MovingRobot(0, 0);
-    assertFalse(subject.validateNextMove(Robot.UP));
-    assertFalse(subject.validateNextMove(Robot.RIGHT_UP_CORNER));
-    assertTrue(subject.validateNextMove(Robot.RIGHT));
-    assertTrue(subject.validateNextMove(Robot.RIGHT_DOWN_CORNER));
-    assertTrue(subject.validateNextMove(Robot.DOWN));
-    assertFalse(subject.validateNextMove(Robot.LEFT_DOWN_CORNER));
-    assertFalse(subject.validateNextMove(Robot.LEFT));
-    assertFalse(subject.validateNextMove(Robot.LEFT_UP_CORNER));
+    assertFalse(subject.validateNextMove(Robot.NORTH));
+    assertFalse(subject.validateNextMove(Robot.NORTH_EAST));
+    assertTrue(subject.validateNextMove(Robot.EAST));
+    assertTrue(subject.validateNextMove(Robot.SOUTH_EAST));
+    assertTrue(subject.validateNextMove(Robot.SOUTH));
+    assertFalse(subject.validateNextMove(Robot.SOUTH_WEST));
+    assertFalse(subject.validateNextMove(Robot.WEST));
+    assertFalse(subject.validateNextMove(Robot.NORTH_WEST));
   }
 
   public void test_validateNextMove_whenAtZeroOne() {
     this.subject = new MovingRobot(0, 1);
 
-    assertTrue(subject.validateNextMove(Robot.UP));
-    assertTrue(subject.validateNextMove(Robot.RIGHT_UP_CORNER));
-    assertTrue(subject.validateNextMove(Robot.RIGHT));
-    assertTrue(subject.validateNextMove(Robot.RIGHT_DOWN_CORNER));
-    assertTrue(subject.validateNextMove(Robot.DOWN));
-    assertFalse(subject.validateNextMove(Robot.LEFT_DOWN_CORNER));
-    assertFalse(subject.validateNextMove(Robot.LEFT));
-    assertFalse(subject.validateNextMove(Robot.LEFT_UP_CORNER));
+    assertTrue(subject.validateNextMove(Robot.NORTH));
+    assertTrue(subject.validateNextMove(Robot.NORTH_EAST));
+    assertTrue(subject.validateNextMove(Robot.EAST));
+    assertTrue(subject.validateNextMove(Robot.SOUTH_EAST));
+    assertTrue(subject.validateNextMove(Robot.SOUTH));
+    assertFalse(subject.validateNextMove(Robot.SOUTH_WEST));
+    assertFalse(subject.validateNextMove(Robot.WEST));
+    assertFalse(subject.validateNextMove(Robot.NORTH_WEST));
   }
 
   public void test_validateNextMove_whenAtNineZero() {
     this.subject = new MovingRobot(9, 0);
 
-    assertFalse(subject.validateNextMove(Robot.UP));
-    assertFalse(subject.validateNextMove(Robot.RIGHT_UP_CORNER));
-    assertFalse(subject.validateNextMove(Robot.RIGHT));
-    assertFalse(subject.validateNextMove(Robot.RIGHT_DOWN_CORNER));
-    assertTrue(subject.validateNextMove(Robot.DOWN));
-    assertTrue(subject.validateNextMove(Robot.LEFT_DOWN_CORNER));
-    assertTrue(subject.validateNextMove(Robot.LEFT));
-    assertFalse(subject.validateNextMove(Robot.LEFT_UP_CORNER));
+    assertFalse(subject.validateNextMove(Robot.NORTH));
+    assertFalse(subject.validateNextMove(Robot.NORTH_EAST));
+    assertFalse(subject.validateNextMove(Robot.EAST));
+    assertFalse(subject.validateNextMove(Robot.SOUTH_EAST));
+    assertTrue(subject.validateNextMove(Robot.SOUTH));
+    assertTrue(subject.validateNextMove(Robot.SOUTH_WEST));
+    assertTrue(subject.validateNextMove(Robot.WEST));
+    assertFalse(subject.validateNextMove(Robot.NORTH_WEST));
   }
 
   public void test_validateNextMove_whenAtNineNine() {
     this.subject = new MovingRobot(9, 9);
-    assertTrue(subject.validateNextMove(Robot.UP));
-    assertFalse(subject.validateNextMove(Robot.RIGHT_UP_CORNER));
-    assertFalse(subject.validateNextMove(Robot.RIGHT));
-    assertFalse(subject.validateNextMove(Robot.RIGHT_DOWN_CORNER));
-    assertFalse(subject.validateNextMove(Robot.DOWN));
-    assertFalse(subject.validateNextMove(Robot.LEFT_DOWN_CORNER));
-    assertTrue(subject.validateNextMove(Robot.LEFT));
-    assertTrue(subject.validateNextMove(Robot.LEFT_UP_CORNER));
+    assertTrue(subject.validateNextMove(Robot.NORTH));
+    assertFalse(subject.validateNextMove(Robot.NORTH_EAST));
+    assertFalse(subject.validateNextMove(Robot.EAST));
+    assertFalse(subject.validateNextMove(Robot.SOUTH_EAST));
+    assertFalse(subject.validateNextMove(Robot.SOUTH));
+    assertFalse(subject.validateNextMove(Robot.SOUTH_WEST));
+    assertTrue(subject.validateNextMove(Robot.WEST));
+    assertTrue(subject.validateNextMove(Robot.NORTH_WEST));
   }
 
   public void test_validateNextMove_whenAtZeroNine() {
     this.subject = new MovingRobot(0, 9);
-    assertTrue(subject.validateNextMove(Robot.UP));
-    assertTrue(subject.validateNextMove(Robot.RIGHT_UP_CORNER));
-    assertTrue(subject.validateNextMove(Robot.RIGHT));
-    assertFalse(subject.validateNextMove(Robot.RIGHT_DOWN_CORNER));
-    assertFalse(subject.validateNextMove(Robot.DOWN));
-    assertFalse(subject.validateNextMove(Robot.LEFT_DOWN_CORNER));
-    assertFalse(subject.validateNextMove(Robot.LEFT));
-    assertFalse(subject.validateNextMove(Robot.LEFT_UP_CORNER));
+    assertTrue(subject.validateNextMove(Robot.NORTH));
+    assertTrue(subject.validateNextMove(Robot.NORTH_EAST));
+    assertTrue(subject.validateNextMove(Robot.EAST));
+    assertFalse(subject.validateNextMove(Robot.SOUTH_EAST));
+    assertFalse(subject.validateNextMove(Robot.SOUTH));
+    assertFalse(subject.validateNextMove(Robot.SOUTH_WEST));
+    assertFalse(subject.validateNextMove(Robot.WEST));
+    assertFalse(subject.validateNextMove(Robot.NORTH_WEST));
   }
 
   public void test_move_whenAtZeroZero() {
     subject = new MovingRobot(0, 0);
 
     for (int i = 0; i < 9; i++) {
-      subject.move(Robot.RIGHT);
+      subject.move(Robot.EAST);
       assertEquals(i + 1, subject.getX());
       assertEquals(0, subject.getY());
     }
 
     for (int i = 0; i < 9; i++) {
-      subject.move(Robot.DOWN);
+      subject.move(Robot.SOUTH);
       assertEquals(9, subject.getX());
       assertEquals(i + 1, subject.getY());
     }
 
     for (int i = 9; i > 0; i--) {
-      subject.move(Robot.LEFT);
+      subject.move(Robot.WEST);
       assertEquals(i - 1, subject.getX());
       assertEquals(9, subject.getY());
     }
 
     for (int i = 9; i > 0; i--) {
-      subject.move(Robot.UP);
+      subject.move(Robot.NORTH);
       assertEquals(0, subject.getX());
       assertEquals(i - 1, subject.getY());
     }
 
-    subject.move(Robot.UP);
+    subject.move(Robot.NORTH);
     assertEquals(0, subject.getX());
     assertEquals(0, subject.getY());
 
-    subject.move(Robot.LEFT_UP_CORNER);
+    subject.move(Robot.NORTH_WEST);
     assertEquals(0, subject.getX());
     assertEquals(0, subject.getY());
 
-    subject.move(Robot.LEFT);
+    subject.move(Robot.WEST);
     assertEquals(0, subject.getX());
     assertEquals(0, subject.getY());
 
-    subject.move(Robot.LEFT_DOWN_CORNER);
+    subject.move(Robot.SOUTH_WEST);
     assertEquals(0, subject.getX());
     assertEquals(0, subject.getY());
   }
@@ -173,10 +173,10 @@ public class MovingRobotTest extends TestCase {
   public void test_printMoves() {
     subject = new MovingRobot(0, 0);
 
-    subject.move(Robot.RIGHT);
-    assertEquals(String.format("%d", Robot.RIGHT), subject.printMoves());
+    subject.move(Robot.EAST);
+    assertEquals(String.format("%d", Robot.EAST), subject.printMoves());
 
-    subject.move(Robot.RIGHT);
-    assertEquals(String.format("%d,%d", Robot.RIGHT, Robot.RIGHT), subject.printMoves());
+    subject.move(Robot.EAST);
+    assertEquals(String.format("%d,%d", Robot.EAST, Robot.EAST), subject.printMoves());
   }
 }