From a110ad3ebdb8f0ee2f7de6b533a488fae2fd9775 Mon Sep 17 00:00:00 2001 From: TheMetabaron Date: Wed, 26 Jul 2017 20:21:07 -0700 Subject: [PATCH 1/2] First few tests are passing, woohoo! --- .../java/edu/pdx/cs410J/katas/Minesweeper.java | 16 +++++++++++++--- .../pdx/cs410J/katas/RaggedBoardException.java | 2 +- .../cs410J/katas/ZeroSizedBoardException.java | 2 +- .../edu/pdx/cs410J/katas/MinesweeperTest.java | 9 ++------- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/minesweeper/src/main/java/edu/pdx/cs410J/katas/Minesweeper.java b/minesweeper/src/main/java/edu/pdx/cs410J/katas/Minesweeper.java index 3fe6bf0..dbaa5fe 100644 --- a/minesweeper/src/main/java/edu/pdx/cs410J/katas/Minesweeper.java +++ b/minesweeper/src/main/java/edu/pdx/cs410J/katas/Minesweeper.java @@ -2,12 +2,22 @@ public class Minesweeper { - public Minesweeper(int row, int column) { + private int row; + private int column; + private int currentRow; + public Minesweeper(int row, int column) throws ZeroSizedBoardException { + if((row == 0) || (column == 0)) { + throw new ZeroSizedBoardException(); + } + currentRow = 1; } - public void addRow(String row) { - + public void addRow(String inputRow) { + if(inputRow.length() != column || (currentRow > row)){ + throw new RaggedBoardException(); + } + currentRow++; } public String solve() { diff --git a/minesweeper/src/main/java/edu/pdx/cs410J/katas/RaggedBoardException.java b/minesweeper/src/main/java/edu/pdx/cs410J/katas/RaggedBoardException.java index 955cf7b..4cbfc89 100644 --- a/minesweeper/src/main/java/edu/pdx/cs410J/katas/RaggedBoardException.java +++ b/minesweeper/src/main/java/edu/pdx/cs410J/katas/RaggedBoardException.java @@ -1,4 +1,4 @@ package edu.pdx.cs410J.katas; -public class RaggedBoardException extends Throwable { +public class RaggedBoardException extends RuntimeException { } diff --git a/minesweeper/src/main/java/edu/pdx/cs410J/katas/ZeroSizedBoardException.java b/minesweeper/src/main/java/edu/pdx/cs410J/katas/ZeroSizedBoardException.java index 714ed09..52636ff 100644 --- a/minesweeper/src/main/java/edu/pdx/cs410J/katas/ZeroSizedBoardException.java +++ b/minesweeper/src/main/java/edu/pdx/cs410J/katas/ZeroSizedBoardException.java @@ -1,4 +1,4 @@ package edu.pdx.cs410J.katas; -public class ZeroSizedBoardException extends Throwable { +public class ZeroSizedBoardException extends RuntimeException { } diff --git a/minesweeper/src/test/java/edu/pdx/cs410J/katas/MinesweeperTest.java b/minesweeper/src/test/java/edu/pdx/cs410J/katas/MinesweeperTest.java index c209511..1b6740f 100644 --- a/minesweeper/src/test/java/edu/pdx/cs410J/katas/MinesweeperTest.java +++ b/minesweeper/src/test/java/edu/pdx/cs410J/katas/MinesweeperTest.java @@ -11,32 +11,27 @@ */ public class MinesweeperTest { - @Ignore @Test(expected = ZeroSizedBoardException.class) public void zeroSizedBoardThrowException() { - new Minesweeper(0, 0); + new Minesweeper(0, 0); } - @Ignore @Test(expected = ZeroSizedBoardException.class) public void boardWithZeroRowsThrowsException() { new Minesweeper(0, 5); } - @Ignore @Test(expected = ZeroSizedBoardException.class) public void boardWithZeroColumnsThrowsException() { new Minesweeper(5, 0); } - @Ignore @Test(expected = RaggedBoardException.class) public void raggedInputRowThrowsException() { Minesweeper board = new Minesweeper(1, 2); board.addRow("."); } - @Ignore @Test(expected = RaggedBoardException.class) public void raggedInputColumnThrowsException() { Minesweeper board = new Minesweeper(2, 1); @@ -44,7 +39,7 @@ public void raggedInputColumnThrowsException() { board.addRow(".."); } - @Ignore + @Test public void oneSquareWithMine() { Minesweeper board = new Minesweeper(1, 1); From 30c5aa372e3877095777a790fc66be03b6817d4c Mon Sep 17 00:00:00 2001 From: TheMetabaron Date: Wed, 26 Jul 2017 20:29:51 -0700 Subject: [PATCH 2/2] First few tests are passing, woohoo! --- .../src/test/java/edu/pdx/cs410J/katas/MinesweeperTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minesweeper/src/test/java/edu/pdx/cs410J/katas/MinesweeperTest.java b/minesweeper/src/test/java/edu/pdx/cs410J/katas/MinesweeperTest.java index 1b6740f..560b51a 100644 --- a/minesweeper/src/test/java/edu/pdx/cs410J/katas/MinesweeperTest.java +++ b/minesweeper/src/test/java/edu/pdx/cs410J/katas/MinesweeperTest.java @@ -39,7 +39,7 @@ public void raggedInputColumnThrowsException() { board.addRow(".."); } - + @Ignore @Test public void oneSquareWithMine() { Minesweeper board = new Minesweeper(1, 1);