Skip to content
Snippets Groups Projects
Commit 415eb83a authored by Scott Crooks's avatar Scott Crooks
Browse files

Merge branch '1-fix-errors-in-assignment' into 'main'

Resolve "Fix errors in assignment"

Closes #1

See merge request !1
parents c46bd751 57597a4a
No related branches found
No related tags found
1 merge request!1Resolve "Fix errors in assignment"
......@@ -110,9 +110,13 @@ public class DotsAndBoxesGrid {
return false;
}
// 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;
// Could be shorter but this is more readable
boolean north = horizontals[x][y];
boolean south = horizontals[x][y + 1];
boolean west = verticals[x][y];
boolean east = verticals[x + 1][y];
return north && south && west && east;
}
/** Tries to claim a box for a player. If the box is complete, sets the ownership and returns true. */
......@@ -139,7 +143,8 @@ 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.
// You need to throw an exception if the line was already drawn.
if (horizontals[x][y]) throw new IllegalArgumentException("Line is already taken.");
this.horizontals[x][y] = true;
......@@ -171,6 +176,7 @@ public class DotsAndBoxesGrid {
}
// You need to throw an exception if the line was already drawn.
if (verticals[x][y]) throw new IllegalArgumentException("Line is already taken.");
this.verticals[x][y] = true;
// Try to claim the north or south boxes
......
......@@ -28,4 +28,60 @@ public class DotsAndBoxesGridTest {
}
// FIXME: You need to write tests for the two known bugs in the code.
@Test
public void testBoxCompleteFull() {
DotsAndBoxesGrid grid = new DotsAndBoxesGrid(3, 3, 2);
grid.drawHorizontal(0, 0, 1);
grid.drawHorizontal(0, 1, 1);
grid.drawVertical(0, 0, 1);
grid.drawVertical(1, 0, 1);
assertTrue(grid.boxComplete(0, 0));
}
@Test
public void testBoxCompletePartial() {
DotsAndBoxesGrid grid = new DotsAndBoxesGrid(3, 3, 2);
grid.drawHorizontal(1, 1, 1);
grid.drawVertical(1, 1, 1);
grid.drawVertical(2, 1, 1);
assertFalse(grid.boxComplete(1, 1));
}
@Test
public void testDrawVerticalOnce() {
DotsAndBoxesGrid grid = new DotsAndBoxesGrid(3, 3, 2);
assertFalse(grid.drawVertical(1, 1, 1));
}
@Test
public void testVerticalCannotBeRedrawn() {
DotsAndBoxesGrid grid = new DotsAndBoxesGrid(3, 3, 2);
grid.drawVertical(1, 1, 1);
Exception exception = assertThrows(IllegalArgumentException.class, () -> {
grid.drawVertical(1, 1, 2);
});
assertTrue(exception instanceof IllegalArgumentException);
}
@Test
public void testDrawHorizontalOnce() {
DotsAndBoxesGrid grid = new DotsAndBoxesGrid(3, 3, 2);
assertFalse(grid.drawHorizontal(1, 1, 1));
}
@Test
public void testHorizontalCannotBeRedrawn() {
DotsAndBoxesGrid grid = new DotsAndBoxesGrid(3, 3, 2);
grid.drawHorizontal(1, 1, 1);
Exception exception = assertThrows(IllegalArgumentException.class, () -> {
grid.drawHorizontal(1, 1, 2);
});
assertTrue(exception instanceof IllegalArgumentException);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment