From 61900cd5aafe30af48987342f48da6044eb261f9 Mon Sep 17 00:00:00 2001
From: Daniel Ho <dho3@myune.edu.au>
Date: Tue, 19 Jul 2022 16:17:29 +1000
Subject: [PATCH] Fix assignment errors

Fix #1.
Fix correct detection of complete and incomplete boxes on grid.
Fix throwing of IllegalStateException when attempting to draw
horizontal or vertical lines over lines that were previously drawn.
---
 src/main/java/dotsandboxes/DotsAndBoxesGrid.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/dotsandboxes/DotsAndBoxesGrid.java b/src/main/java/dotsandboxes/DotsAndBoxesGrid.java
index a9e7c5b..8042a49 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 (getHorizontal(x, y) && getHorizontal(x , y + 1) && getVertical(x, y) && getVertical(x+1, y));
     }
 
     /** Tries to claim a box for a player. If the box is complete, sets the ownership and returns true. */
@@ -139,7 +138,10 @@ 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.
+        // throw exception if attempting to draw over a line that was previously drawn
+        if (getHorizontal(x, y)) {
+            throw new IllegalStateException("horizontal line already drawn");
+        }
 
         this.horizontals[x][y] = true;
 
@@ -170,7 +172,10 @@ 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.
+        // throw exception if attempting to draw over a line that was previously drawn
+        if (getVertical(x, y)) {
+            throw new IllegalStateException("vertical line already drawn");
+        }
 
         this.verticals[x][y] = true;
         // Try to claim the north or south boxes
-- 
GitLab