From 013684773b24a58e421718b34d90d56b4d451974 Mon Sep 17 00:00:00 2001 From: Niraj Rana Bhat <nranabha@myune.edu.au> Date: Wed, 2 Aug 2023 14:08:11 +0000 Subject: [PATCH] Bugs fixed on DotsAndBoxesGrid.java and unit tests successfully passed --- src/main/java/dotsandboxes/DotsAndBoxesGrid.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/dotsandboxes/DotsAndBoxesGrid.java b/src/main/java/dotsandboxes/DotsAndBoxesGrid.java index a9e7c5b..f0a8380 100644 --- a/src/main/java/dotsandboxes/DotsAndBoxesGrid.java +++ b/src/main/java/dotsandboxes/DotsAndBoxesGrid.java @@ -111,8 +111,7 @@ public class DotsAndBoxesGrid { } // A box is complete if the north and south horizontals and the east and west verticals have all been drawn. - // FIXME: You'll need to fix this code (after writing a test first). - return true; + return horizontals[x][y] && horizontals[x][y + 1] && verticals[x][y] && verticals[x + 1][y]; } /** Tries to claim a box for a player. If the box is complete, sets the ownership and returns true. */ @@ -139,8 +138,9 @@ public class DotsAndBoxesGrid { throw new IndexOutOfBoundsException(String.format("y was %d, which is out of range. Range is 0 to %d", y, height)); } - // FIXME: You need to throw an exception if the line was already drawn. - + if (this.horizontals[x][y]){ + throw new IllegalStateException("Horizontal line is already drawn here"); + } this.horizontals[x][y] = true; // Try to claim the north or south boxes @@ -170,7 +170,9 @@ public class DotsAndBoxesGrid { throw new IndexOutOfBoundsException(String.format("y was %d, which is out of range. Range is 0 to %d", y, height - 1)); } - // You need to throw an exception if the line was already drawn. + if (this.verticals[x][y]){ + throw new IllegalStateException("Vertical line is already drawn here"); + } this.verticals[x][y] = true; // Try to claim the north or south boxes -- GitLab