diff options
Diffstat (limited to 'src/Q9')
| -rw-r--r-- | src/Q9/Robot.java | 3 | ||||
| -rw-r--r-- | src/Q9/RobotTest.java | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/src/Q9/Robot.java b/src/Q9/Robot.java index 638b581..ed0c28c 100644 --- a/src/Q9/Robot.java +++ b/src/Q9/Robot.java @@ -54,7 +54,8 @@ public class Robot { boolean r1InCell = r1.atPosition(row, column); boolean r2InCell = r2.atPosition(row, column); - if (r1InCell) grid += "|1"; + if (r1InCell && r2InCell) grid += "|X"; + else if (r1InCell) grid += "|1"; else if (r2InCell) grid += "|2"; else grid += "| "; } diff --git a/src/Q9/RobotTest.java b/src/Q9/RobotTest.java index 9290993..921a2de 100644 --- a/src/Q9/RobotTest.java +++ b/src/Q9/RobotTest.java @@ -42,4 +42,27 @@ public class RobotTest extends TestCase { assertEquals(expected, result); } + + public void test_printGrid_withCollision() { + Robot r1 = new Robot(5, 5); + Robot r2 = new Robot(5, 5); + + String expected = + "| | | | | | | | | | |\n" + + "| | | | | | | | | | |\n" + + "| | | | | | | | | | |\n" + + "| | | | | | | | | | |\n" + + "| | | | | | | | | | |\n" + + "| | | | | |X| | | | |\n" + + "| | | | | | | | | | |\n" + + "| | | | | | | | | | |\n" + + "| | | | | | | | | | |\n" + + "| | | | | | | | | | |\n"; + String result = Robot.printGrid(r1, r2); + + System.out.println(expected); + System.out.println(result); + + assertEquals(expected, result); + } } |