From 9ac7253f2b35a65af08597e09f0ad91e9dda1b9e Mon Sep 17 00:00:00 2001
From: Relurk1 <keshavg80@gmail.com>
Date: Tue, 14 Nov 2023 16:55:34 -0500
Subject: [PATCH] Changes and additions to test suite

This commit includes:
- A change for readability made in the case rule, replacing Integer objects with NurikabeType
- Adding false test cases where necessary
- Updating test cases where necessary
---
 .../BlackBetweenRegionsDirectRuleTest.java    | 24 +++++++++++++++
 .../rules/BlackOrWhiteCaseRuleTest.java       | 10 +++----
 .../BlackSquareContradictionRuleTest.java     | 22 +++++++++++++-
 .../rules/CornerBlackDirectRuleTest.java      | 30 +++++++++++++++++--
 .../rules/FillinBlackDirectRuleTest.java      | 23 ++++++++++++++
 .../rules/FillinWhiteDirectRuleTest.java      | 26 ++++++++++++++++
 .../IsolateBlackContradictionRuleTest.java    | 22 +++++++++++++-
 .../rules/NoNumbersContradictionRuleTest.java | 26 +++++++++++++---
 .../PreventBlackSquareDirectRuleTest.java     | 20 +++++++++++++
 .../rules/SurroundRegionDirectRuleTest.java   | 22 ++++++++++++++
 .../TooFewSpacesContradictionRuleTest.java    | 23 ++++++++++++++
 .../TooManySpacesContradictionRuleTest.java   | 25 ++++++++++++++++
 .../rules/WhiteBottleNeckDirectRuleTest.java  | 26 ++++++++++++++++
 .../FalseBlackBetweenRegions                  | 13 ++++++++
 .../FalseBlackSquare                          | 11 +++++++
 .../CornerBlackDirectRule/FalseCornerBlack    | 12 ++++++++
 .../FillinBlackDirectRule/FalseFillinBlack    | 12 ++++++++
 .../FillinWhiteDirectRule/FalseFillinWhite    | 12 ++++++++
 .../FalseIsolateBlack                         | 10 +++++++
 .../{NoNumberReachable => FalseNoNumber}      |  0
 .../NoNumberContradictionRule/FalseNoNumber2  | 18 +++++++++++
 .../{NoNumberSurroundBlack => SimpleNoNumber} |  0
 .../FalseBlackSquare                          | 10 +++++++
 .../FalseSurroundRegion                       | 10 +++++++
 .../FalseTooFewSpaces                         | 17 +++++++++++
 .../MultipleNumberRegion                      | 11 +++++++
 .../WhiteBottleNeckDirectRule/FalseBottleNeck | 11 +++++++
 27 files changed, 432 insertions(+), 14 deletions(-)
 create mode 100644 src/test/resources/puzzles/nurikabe/rules/BlackBetweenRegionsDirectRule/FalseBlackBetweenRegions
 create mode 100644 src/test/resources/puzzles/nurikabe/rules/BlackSquareContradictionRule/FalseBlackSquare
 create mode 100644 src/test/resources/puzzles/nurikabe/rules/CornerBlackDirectRule/FalseCornerBlack
 create mode 100644 src/test/resources/puzzles/nurikabe/rules/FillinBlackDirectRule/FalseFillinBlack
 create mode 100644 src/test/resources/puzzles/nurikabe/rules/FillinWhiteDirectRule/FalseFillinWhite
 create mode 100644 src/test/resources/puzzles/nurikabe/rules/IsolateBlackContradictionRule/FalseIsolateBlack
 rename src/test/resources/puzzles/nurikabe/rules/NoNumberContradictionRule/{NoNumberReachable => FalseNoNumber} (100%)
 create mode 100644 src/test/resources/puzzles/nurikabe/rules/NoNumberContradictionRule/FalseNoNumber2
 rename src/test/resources/puzzles/nurikabe/rules/NoNumberContradictionRule/{NoNumberSurroundBlack => SimpleNoNumber} (100%)
 create mode 100644 src/test/resources/puzzles/nurikabe/rules/PreventBlackSquareDirectRule/FalseBlackSquare
 create mode 100644 src/test/resources/puzzles/nurikabe/rules/SurroundRegionDirectRule/FalseSurroundRegion
 create mode 100644 src/test/resources/puzzles/nurikabe/rules/TooFewSpacesContradictionRule/FalseTooFewSpaces
 create mode 100644 src/test/resources/puzzles/nurikabe/rules/TooManySpacesContradictionRule/MultipleNumberRegion
 create mode 100644 src/test/resources/puzzles/nurikabe/rules/WhiteBottleNeckDirectRule/FalseBottleNeck

diff --git a/src/test/java/puzzles/nurikabe/rules/BlackBetweenRegionsDirectRuleTest.java b/src/test/java/puzzles/nurikabe/rules/BlackBetweenRegionsDirectRuleTest.java
index a6652ea60..7e8b5eb83 100644
--- a/src/test/java/puzzles/nurikabe/rules/BlackBetweenRegionsDirectRuleTest.java
+++ b/src/test/java/puzzles/nurikabe/rules/BlackBetweenRegionsDirectRuleTest.java
@@ -163,4 +163,28 @@ public void BlackBetweenRegionsDirectRule_VerticalBlackBetweenRegionsTest() thro
             }
         }
     }
+
+    /**
+     * Tests the Black Between Regions direct rule for a false application of the rule, where a black tile is enclosed by one region
+     */
+    @Test
+    public void BlackBetweenRegionsDirectRule_FalseBlackBetweenRegionsTest() throws InvalidFileFormatException{
+        TestUtilities.importTestBoard("puzzles/nurikabe/rules/BlackBetweenRegionsDirectRule/FalseBlackBetweenRegions",nurikabe);
+        TreeNode rootNode = nurikabe.getTree().getRootNode();
+        TreeTransition transition = rootNode.getChildren().get(0);
+        transition.setRule(RULE);
+
+        NurikabeBoard board = (NurikabeBoard) transition.getBoard();
+        NurikabeCell cell = board.getCell(1,1);
+        cell.setData(NurikabeType.BLACK.toValue());
+        board.addModifiedData(cell);
+
+        Assert.assertNotNull(RULE.checkRule(transition));
+
+        for(int i=0; i<board.getHeight(); i++){
+            for(int k=0; k<board.getWidth(); k++){
+                Assert.assertNotNull(RULE.checkRuleAt(transition,board.getCell(k,i)));
+            }
+        }
+    }
 }
diff --git a/src/test/java/puzzles/nurikabe/rules/BlackOrWhiteCaseRuleTest.java b/src/test/java/puzzles/nurikabe/rules/BlackOrWhiteCaseRuleTest.java
index 55001e6d2..755b166cd 100644
--- a/src/test/java/puzzles/nurikabe/rules/BlackOrWhiteCaseRuleTest.java
+++ b/src/test/java/puzzles/nurikabe/rules/BlackOrWhiteCaseRuleTest.java
@@ -50,12 +50,12 @@ public void TooFewSpacesContradictionRule_TwoSurroundBlackTest() throws InvalidF
         NurikabeBoard caseBoard = (NurikabeBoard) cases.get(0);
         NurikabeBoard caseBoard2 = (NurikabeBoard) cases.get(1);
 
-        Integer v1 = new Integer(0);
-        Integer v2 = new Integer(-1);
+        NurikabeType board1Type = caseBoard.getCell(0,0).getType();
+        NurikabeType board2Type = caseBoard2.getCell(0,0).getType();
 
-        Assert.assertTrue((caseBoard.getCell(0,0).getData().equals(v1) || caseBoard.getCell(0,0).equals(v2)) &&
-                (caseBoard2.getCell(0,0).getData().equals(v1) || caseBoard2.getCell(0,0).getData().equals(v2)));
-        Assert.assertFalse(caseBoard.getCell(0,0).getData().equals(caseBoard2.getCell(0,0).getData()));
+        Assert.assertTrue((board1Type.equals(NurikabeType.BLACK) || board1Type.equals(NurikabeType.WHITE)) &&
+                (board2Type.equals(NurikabeType.BLACK) || board2Type.equals(NurikabeType.WHITE)));
+        Assert.assertFalse(board1Type.equals(board2Type));
 
         Assert.assertEquals(caseBoard.getHeight(),caseBoard2.getHeight(), board.getHeight());
         Assert.assertEquals(caseBoard.getWidth(),caseBoard2.getWidth(), board.getWidth());
diff --git a/src/test/java/puzzles/nurikabe/rules/BlackSquareContradictionRuleTest.java b/src/test/java/puzzles/nurikabe/rules/BlackSquareContradictionRuleTest.java
index f688918e8..b06d0e32c 100644
--- a/src/test/java/puzzles/nurikabe/rules/BlackSquareContradictionRuleTest.java
+++ b/src/test/java/puzzles/nurikabe/rules/BlackSquareContradictionRuleTest.java
@@ -85,7 +85,27 @@ public void BlackSquareContradictionRule_CornerSquareTest() throws InvalidFileFo
                     Assert.assertNotNull(RULE.checkRuleAt(transition,board.getCell(k,i)));
                 }
             }
-            System.out.println();
+        }
+    }
+
+    /**
+     * Tests the Black Square contradiction rule for a false contradiction
+     */
+    @Test
+    public void BlackSquareContradictionRule_FalseBlackSquareTest() throws InvalidFileFormatException{
+        TestUtilities.importTestBoard("puzzles/nurikabe/rules/BlackSquareContradictionRule/FalseBlackSquare", nurikabe);
+        TreeNode rootNode = nurikabe.getTree().getRootNode();
+        TreeTransition transition = rootNode.getChildren().get(0);
+        transition.setRule(RULE);
+
+        NurikabeBoard board = (NurikabeBoard) transition.getBoard();
+
+        Assert.assertNotNull(RULE.checkContradiction((NurikabeBoard) transition.getBoard()));
+
+        for (int i = 0; i < board.getHeight(); i++) {
+            for (int k = 0; k < board.getWidth(); k++) {
+                Assert.assertNotNull(RULE.checkRuleAt(transition,board.getCell(k,i)));
+            }
         }
     }
 }
diff --git a/src/test/java/puzzles/nurikabe/rules/CornerBlackDirectRuleTest.java b/src/test/java/puzzles/nurikabe/rules/CornerBlackDirectRuleTest.java
index 2173921ad..df8a3d44e 100644
--- a/src/test/java/puzzles/nurikabe/rules/CornerBlackDirectRuleTest.java
+++ b/src/test/java/puzzles/nurikabe/rules/CornerBlackDirectRuleTest.java
@@ -33,7 +33,7 @@ public static void setUp() {
      */
     @Test
     public void CornerBlackContradictionRule_SimpleCornerBlackTest() throws InvalidFileFormatException {
-        TestUtilities.importTestBoard("puzzles/nurikabe/rules/TooFewSpacesContradictionRule/TwoSurroundBlack", nurikabe);
+        TestUtilities.importTestBoard("puzzles/nurikabe/rules/CornerBlackDirectRule/SimpleCornerBlack", nurikabe);
         TreeNode rootNode = nurikabe.getTree().getRootNode();
         TreeTransition transition = rootNode.getChildren().get(0);
         NurikabeBoard board = (NurikabeBoard) transition.getBoard();
@@ -43,12 +43,12 @@ public void CornerBlackContradictionRule_SimpleCornerBlackTest() throws InvalidF
         cell.setData(NurikabeType.BLACK.toValue());
         board.addModifiedData(cell);
 
-        Assert.assertNotNull(RULE.checkRule(transition));
+        Assert.assertNull(RULE.checkRule(transition));
 
         for(int i = 0; i < board.getHeight(); i++) {
             for(int k = 0; k < board.getWidth(); k++) {
                 Point point  = new Point(k, i);
-                if(point.equals(cell)) {
+                if(point.equals(cell.getLocation())) {
                     Assert.assertNull(RULE.checkRuleAt(transition, board.getCell(k, i)));
                 }
                 else {
@@ -57,4 +57,28 @@ public void CornerBlackContradictionRule_SimpleCornerBlackTest() throws InvalidF
             }
         }
     }
+
+    /**
+     * Tests the Corner Black direct rule for a false application of the rule
+     */
+    @Test
+    public void CornerBlackContradictionRule_FalseCornerBlackTest() throws InvalidFileFormatException {
+        TestUtilities.importTestBoard("puzzles/nurikabe/rules/CornerBlackDirectRule/FalseCornerBlack", nurikabe);
+        TreeNode rootNode = nurikabe.getTree().getRootNode();
+        TreeTransition transition = rootNode.getChildren().get(0);
+        NurikabeBoard board = (NurikabeBoard) transition.getBoard();
+        transition.setRule(RULE);
+
+        NurikabeCell cell = board.getCell(2, 0);
+        cell.setData(NurikabeType.BLACK.toValue());
+        board.addModifiedData(cell);
+
+        Assert.assertNotNull(RULE.checkRule(transition));
+
+        for(int i = 0; i < board.getHeight(); i++) {
+            for(int k = 0; k < board.getWidth(); k++) {
+                Assert.assertNotNull(RULE.checkRuleAt(transition,board.getCell(k,i)));
+            }
+        }
+    }
 }
diff --git a/src/test/java/puzzles/nurikabe/rules/FillinBlackDirectRuleTest.java b/src/test/java/puzzles/nurikabe/rules/FillinBlackDirectRuleTest.java
index 3b9e15fa5..41bccb82d 100644
--- a/src/test/java/puzzles/nurikabe/rules/FillinBlackDirectRuleTest.java
+++ b/src/test/java/puzzles/nurikabe/rules/FillinBlackDirectRuleTest.java
@@ -117,4 +117,27 @@ public void FillinBlackDirectRule_CornerTest2() throws InvalidFileFormatExceptio
             }
         }
     }
+
+    /**
+     * Tests the Fillin Black direct rule for a false application of the rule
+     */
+    @Test
+    public void FillinBlackDirectRule_FalseTest() throws InvalidFileFormatException{
+        TestUtilities.importTestBoard("puzzles/nurikabe/rules/FillinBlackDirectRule/FalseFillinBlack", nurikabe);
+        TreeNode rootNode = nurikabe.getTree().getRootNode();
+        TreeTransition transition = rootNode.getChildren().get(0);
+        transition.setRule(RULE);
+
+        NurikabeBoard board = (NurikabeBoard) transition.getBoard();
+        NurikabeCell cell = board.getCell(1, 1);
+        cell.setData(NurikabeType.BLACK.toValue());
+        board.addModifiedData(cell);
+
+        Assert.assertNotNull(RULE.checkRule(transition));
+        for(int i=0; i<board.getHeight(); i++){
+            for(int k=0; k<board.getWidth(); k++){
+                Assert.assertNotNull(RULE.checkRuleAt(transition,board.getCell(k,i)));
+            }
+        }
+    }
 }
diff --git a/src/test/java/puzzles/nurikabe/rules/FillinWhiteDirectRuleTest.java b/src/test/java/puzzles/nurikabe/rules/FillinWhiteDirectRuleTest.java
index 6e23d8779..47accdf17 100644
--- a/src/test/java/puzzles/nurikabe/rules/FillinWhiteDirectRuleTest.java
+++ b/src/test/java/puzzles/nurikabe/rules/FillinWhiteDirectRuleTest.java
@@ -115,4 +115,30 @@ public void FillinWhiteDirectRule_CornerTest2() throws InvalidFileFormatExceptio
             }
         }
     }
+
+    /**
+     * Tests the Fillin White direct rule for a false application of the rule
+     */
+    @Test
+    public void FillinWhiteDirectRule_FalseTest() throws InvalidFileFormatException {
+        TestUtilities.importTestBoard("puzzles/nurikabe/rules/FillinWhiteDirectRule/FalseFillinWhite", nurikabe);
+        TreeNode rootNode = nurikabe.getTree().getRootNode();
+        TreeTransition transition = rootNode.getChildren().get(0);
+        transition.setRule(RULE);
+
+        NurikabeBoard board = (NurikabeBoard) transition.getBoard();
+        NurikabeCell cell = board.getCell(1,1);
+        cell.setData(NurikabeType.WHITE.toValue());
+        board.addModifiedData(cell);
+
+        Assert.assertNotNull(RULE.checkRule(transition));
+
+        Point location = new Point(1, 1);
+        for(int i = 0; i < board.getHeight(); i++) {
+            for(int k = 0; k < board.getWidth(); k++) {
+                Assert.assertNotNull(RULE.checkRuleAt(transition,board.getCell(k,i)));
+            }
+        }
+    }
+
 }
diff --git a/src/test/java/puzzles/nurikabe/rules/IsolateBlackContradictionRuleTest.java b/src/test/java/puzzles/nurikabe/rules/IsolateBlackContradictionRuleTest.java
index ce578d853..26216fde1 100644
--- a/src/test/java/puzzles/nurikabe/rules/IsolateBlackContradictionRuleTest.java
+++ b/src/test/java/puzzles/nurikabe/rules/IsolateBlackContradictionRuleTest.java
@@ -27,7 +27,7 @@ public static void setUp() {
     }
 
     /**
-     * Tests the Isolate Black contradiction rule for a black squares in the corner, separated by a diagonal of white squares
+     * Tests the Isolate Black contradiction rule for a black square in the corner, separated by a diagonal of white squares
      */
     @Test
     public void IsolateBlackContradictionRule_SimpleIsolateBlackTest() throws InvalidFileFormatException {
@@ -85,4 +85,24 @@ public void IsolateBlackContradictionRule_DiagonalBlackTest() throws InvalidFile
             }
         }
     }
+
+    /**
+     * Tests the Isolate Black contradiction rule for a false contradiction
+     */
+    @Test
+    public void IsolateBlackContradictionRule_FalseIsolateBlackTest() throws InvalidFileFormatException {
+        TestUtilities.importTestBoard("puzzles/nurikabe/rules/IsolateBlackContradictionRule/FalseIsolateBlack",nurikabe);
+        TreeNode rootNode = nurikabe.getTree().getRootNode();
+        TreeTransition transition = rootNode.getChildren().get(0);
+        transition.setRule(RULE);
+
+        NurikabeBoard board = (NurikabeBoard) transition.getBoard();
+
+        Assert.assertNotNull(RULE.checkRule(transition));
+        for(int i=0; i<board.getHeight(); i++){
+            for(int k=0; k<board.getWidth(); k++){
+                Assert.assertNotNull(RULE.checkRuleAt(transition,board.getCell(k,i)));
+            }
+        }
+    }
 }
diff --git a/src/test/java/puzzles/nurikabe/rules/NoNumbersContradictionRuleTest.java b/src/test/java/puzzles/nurikabe/rules/NoNumbersContradictionRuleTest.java
index c2294a54f..ebba034d1 100644
--- a/src/test/java/puzzles/nurikabe/rules/NoNumbersContradictionRuleTest.java
+++ b/src/test/java/puzzles/nurikabe/rules/NoNumbersContradictionRuleTest.java
@@ -5,6 +5,7 @@
 import legup.TestUtilities;
 import edu.rpi.legup.model.tree.TreeNode;
 import edu.rpi.legup.model.tree.TreeTransition;
+import org.codehaus.jackson.annotate.JsonTypeInfo;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -30,7 +31,7 @@ public static void setUp() {
      */
     @Test
     public void NoNumberContradictionRule_NoNumberSurroundBlack() throws InvalidFileFormatException {
-        TestUtilities.importTestBoard("puzzles/nurikabe/rules/NoNumberContradictionRule/NoNumberSurroundBlack", nurikabe);
+        TestUtilities.importTestBoard("puzzles/nurikabe/rules/NoNumberContradictionRule/SimpleNoNumber", nurikabe);
         TreeNode rootNode = nurikabe.getTree().getRootNode();
         TreeTransition transition = rootNode.getChildren().get(0);
         transition.setRule(RULE);
@@ -53,15 +54,32 @@ public void NoNumberContradictionRule_NoNumberSurroundBlack() throws InvalidFile
     }
 
     /**
-     * Tests the No Number contradiction rule for multiple white regions not completely enclosed by black squares
+     * Tests the No Number contradiction rule for a false contradiction
      */
     @Test
-    public void NoNumberContradictionRule_NoNumberReachable() throws InvalidFileFormatException {
-        TestUtilities.importTestBoard("puzzles/nurikabe/rules/NoNumberContradictionRule/NoNumberReachable", nurikabe);
+    public void NoNumberContradictionRule_FalseNoNumber() throws InvalidFileFormatException {
+        TestUtilities.importTestBoard("puzzles/nurikabe/rules/NoNumberContradictionRule/FalseNoNumber", nurikabe);
         TreeNode rootNode = nurikabe.getTree().getRootNode();
         TreeTransition transition = rootNode.getChildren().get(0);
         transition.setRule(RULE);
 
+        Assert.assertNotNull(RULE.checkRule(transition));
+        NurikabeBoard board = (NurikabeBoard) transition.getBoard();
+        for (int i = 0; i < board.getHeight(); i++) {
+            for (int k = 0; k < board.getWidth(); k++) {
+                Assert.assertNotNull(RULE.checkRuleAt(transition, board.getCell(k, i)));
+            }
+        }
+    }
+
+    @Test
+    public void NoNumberContradictionRule_FalseNoNumber2() throws InvalidFileFormatException {
+        TestUtilities.importTestBoard("puzzles/nurikabe/rules/NoNumberContradictionRule/FalseNoNumber2", nurikabe);
+        TreeNode rootNode = nurikabe.getTree().getRootNode();
+        TreeTransition transition = rootNode.getChildren().get(0);
+        transition.setRule(RULE);
+
+        Assert.assertNotNull(RULE.checkRule(transition));
         NurikabeBoard board = (NurikabeBoard) transition.getBoard();
         for (int i = 0; i < board.getHeight(); i++) {
             for (int k = 0; k < board.getWidth(); k++) {
diff --git a/src/test/java/puzzles/nurikabe/rules/PreventBlackSquareDirectRuleTest.java b/src/test/java/puzzles/nurikabe/rules/PreventBlackSquareDirectRuleTest.java
index 61ed711e4..474db1728 100644
--- a/src/test/java/puzzles/nurikabe/rules/PreventBlackSquareDirectRuleTest.java
+++ b/src/test/java/puzzles/nurikabe/rules/PreventBlackSquareDirectRuleTest.java
@@ -146,4 +146,24 @@ public void PreventBlackSquareDirectRule_TopRightWhiteBlackSquareTest() throws I
             }
         }
     }
+
+    /**
+     * Tests the Prevent Black Square direct rule for a false contradiction
+     */
+    @Test
+    public void PreventBlackSquareDirectRule_FalseTest() throws InvalidFileFormatException{
+        TestUtilities.importTestBoard("puzzles/nurikabe/rules/PreventBlackSquareDirectRule/FalseBlackSquare", nurikabe);
+        TreeNode rootNode = nurikabe.getTree().getRootNode();
+        TreeTransition transition = rootNode.getChildren().get(0);
+        transition.setRule(RULE);
+
+        NurikabeBoard board = (NurikabeBoard) transition.getBoard();
+
+
+        for (int i = 0; i < board.getHeight(); i++) {
+            for (int k = 0; k < board.getWidth(); k++) {
+                Assert.assertNotNull(RULE.checkRuleAt(transition,board.getCell(k,i)));
+            }
+        }
+    }
 }
diff --git a/src/test/java/puzzles/nurikabe/rules/SurroundRegionDirectRuleTest.java b/src/test/java/puzzles/nurikabe/rules/SurroundRegionDirectRuleTest.java
index fc2956f19..240c0b3f2 100644
--- a/src/test/java/puzzles/nurikabe/rules/SurroundRegionDirectRuleTest.java
+++ b/src/test/java/puzzles/nurikabe/rules/SurroundRegionDirectRuleTest.java
@@ -99,4 +99,26 @@ public void SurroundRegionDirectRule_SurroundRegionBlackInCornerTest() throws In
             }
         }
     }
+
+
+    /**
+     * Tests the Surround Region direct rule for a false application of the rule
+     */
+    @Test
+    public void SurroundRegionDirectRule_FalseSurroundRegionBlackTest() throws InvalidFileFormatException {
+        TestUtilities.importTestBoard("puzzles/nurikabe/rules/SurroundRegionDirectRule/FalseSurroundRegion", nurikabe);
+        TreeNode rootNode = nurikabe.getTree().getRootNode();
+        TreeTransition transition = rootNode.getChildren().get(0);
+        transition.setRule(RULE);
+
+        NurikabeBoard board = (NurikabeBoard) transition.getBoard();
+
+        for (int i = 0; i < board.getHeight(); i++) {
+            for (int k = 0; k < board.getWidth(); k++) {
+                Assert.assertNotNull(RULE.checkRuleAt(transition,board.getCell(k,i)));
+            }
+        }
+    }
+
+
 }
diff --git a/src/test/java/puzzles/nurikabe/rules/TooFewSpacesContradictionRuleTest.java b/src/test/java/puzzles/nurikabe/rules/TooFewSpacesContradictionRuleTest.java
index a230e4e68..02d7af6bd 100644
--- a/src/test/java/puzzles/nurikabe/rules/TooFewSpacesContradictionRuleTest.java
+++ b/src/test/java/puzzles/nurikabe/rules/TooFewSpacesContradictionRuleTest.java
@@ -81,4 +81,27 @@ public void TooFewSpacesContradictionRule_InsufficientSpaceTest() throws Invalid
             }
         }
     }
+
+    /**
+     * Tests the Too Few Spaces contradiction rule for a false contradiction
+     */
+    @Test
+    public void TooFewSpacesContradictionRule_FalseTooFewSpaces() throws InvalidFileFormatException {
+        TestUtilities.importTestBoard("puzzles/nurikabe/rules/TooFewSpacesContradictionRule/FalseTooFewSpaces", nurikabe);
+        TreeNode rootNode = nurikabe.getTree().getRootNode();
+        TreeTransition transition = rootNode.getChildren().get(0);
+        transition.setRule(RULE);
+
+        NurikabeBoard board = (NurikabeBoard) transition.getBoard();
+        NurikabeCell cell1 = board.getCell(1,1);
+
+
+        Assert.assertNotNull(RULE.checkContradiction((NurikabeBoard)transition.getBoard()));
+        for(int i=0; i<board.getHeight(); i++){
+            for(int k=0; k<board.getWidth(); k++){
+                Assert.assertNotNull(RULE.checkRuleAt(transition,board.getCell(k,i)));
+            }
+        }
+
+    }
 }
diff --git a/src/test/java/puzzles/nurikabe/rules/TooManySpacesContradictionRuleTest.java b/src/test/java/puzzles/nurikabe/rules/TooManySpacesContradictionRuleTest.java
index 194e1b9b4..7e3c5b708 100644
--- a/src/test/java/puzzles/nurikabe/rules/TooManySpacesContradictionRuleTest.java
+++ b/src/test/java/puzzles/nurikabe/rules/TooManySpacesContradictionRuleTest.java
@@ -5,6 +5,7 @@
 import legup.TestUtilities;
 import edu.rpi.legup.model.tree.TreeNode;
 import edu.rpi.legup.model.tree.TreeTransition;
+import org.codehaus.jackson.annotate.JsonTypeInfo;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -73,4 +74,28 @@ public void TooManySpacesContradictionRule_ExtraDiagonalSpace() throws InvalidFi
             }
         }
     }
+
+    /**
+     * Tests the Too Many Spaces contradiction rule for a contradiction.with multiple numbers, wherein one of the numbers is larger than the region
+     */
+    @Test
+    public void TooManySpacesContradictionRule_MultipleNumberRegion() throws InvalidFileFormatException {
+        TestUtilities.importTestBoard("puzzles/nurikabe/rules/TooManySpacesContradictionRule/MultipleNumberRegion", nurikabe);
+        TreeNode rootNode = nurikabe.getTree().getRootNode();
+        TreeTransition transition = rootNode.getChildren().get(0);
+        transition.setRule(RULE);
+
+        NurikabeBoard board = (NurikabeBoard) transition.getBoard();
+
+        Assert.assertNull(RULE.checkContradiction(board));
+        for(int i=0; i<board.getHeight(); i++){
+            for(int k=0; k<board.getWidth(); k++){
+                Point point = new Point(k,i);
+                if(point.equals(board.getCell(2,1).getLocation())){
+                    Assert.assertNull(RULE.checkRuleAt(transition,board.getCell(k,i)));
+                }
+            }
+        }
+
+    }
 }
diff --git a/src/test/java/puzzles/nurikabe/rules/WhiteBottleNeckDirectRuleTest.java b/src/test/java/puzzles/nurikabe/rules/WhiteBottleNeckDirectRuleTest.java
index a08dbffcd..cf3d9226b 100644
--- a/src/test/java/puzzles/nurikabe/rules/WhiteBottleNeckDirectRuleTest.java
+++ b/src/test/java/puzzles/nurikabe/rules/WhiteBottleNeckDirectRuleTest.java
@@ -80,4 +80,30 @@ public void WhiteBottleNeckDirectRule_NurikabeBoard1Test() throws InvalidFileFor
             }
         }
     }
+
+    /**
+     * Tests the White BottleNeck direct rule for a more false bottle neck
+     */
+    @Test
+    public void WhiteBottleNeckDirectRule_FalseBottleNeck() throws InvalidFileFormatException {
+        TestUtilities.importTestBoard("puzzles/nurikabe/rules/WhiteBottleNeckDirectRule/FalseBottleNeck", nurikabe);
+        TreeNode rootNode = nurikabe.getTree().getRootNode();
+        TreeTransition transition = rootNode.getChildren().get(0);
+        NurikabeBoard board = (NurikabeBoard) transition.getBoard();
+        transition.setRule(RULE);
+
+        NurikabeCell cell = board.getCell(2, 1);
+        cell.setData(NurikabeType.WHITE.toValue());
+        board.addModifiedData(cell);
+
+        Assert.assertNotNull(RULE.checkRule(transition));
+
+        for (int i = 0; i < board.getHeight(); i++) {
+            for (int k = 0; k < board.getWidth(); k++) {
+                Assert.assertNotNull(RULE.checkRuleAt(transition, board.getCell(k, i)));
+            }
+        }
+    }
+
+
 }
diff --git a/src/test/resources/puzzles/nurikabe/rules/BlackBetweenRegionsDirectRule/FalseBlackBetweenRegions b/src/test/resources/puzzles/nurikabe/rules/BlackBetweenRegionsDirectRule/FalseBlackBetweenRegions
new file mode 100644
index 000000000..5aecd1575
--- /dev/null
+++ b/src/test/resources/puzzles/nurikabe/rules/BlackBetweenRegionsDirectRule/FalseBlackBetweenRegions
@@ -0,0 +1,13 @@
+<Legup>
+    <puzzle name="Nurikabe">
+        <board width="3" height="3">
+            <cells>
+                <cell value="5" x="0" y="0"/>
+                <cell value="0" x="1" y="0"/>
+                <cell value="0" x="2" y="0"/>
+                <cell value="0" x="0" y="1"/>
+                <cell value="0" x="2" y="1"/>
+            </cells>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file
diff --git a/src/test/resources/puzzles/nurikabe/rules/BlackSquareContradictionRule/FalseBlackSquare b/src/test/resources/puzzles/nurikabe/rules/BlackSquareContradictionRule/FalseBlackSquare
new file mode 100644
index 000000000..813114443
--- /dev/null
+++ b/src/test/resources/puzzles/nurikabe/rules/BlackSquareContradictionRule/FalseBlackSquare
@@ -0,0 +1,11 @@
+<Legup>
+    <puzzle name="Nurikabe">
+        <board width="4" height="4">
+            <cells>
+                <cell value="-1" x="1" y="1"/>
+                <cell value="-1" x="1" y="2"/>
+                <cell value="-1" x="2" y="1"/>
+            </cells>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file
diff --git a/src/test/resources/puzzles/nurikabe/rules/CornerBlackDirectRule/FalseCornerBlack b/src/test/resources/puzzles/nurikabe/rules/CornerBlackDirectRule/FalseCornerBlack
new file mode 100644
index 000000000..0599fdfa4
--- /dev/null
+++ b/src/test/resources/puzzles/nurikabe/rules/CornerBlackDirectRule/FalseCornerBlack
@@ -0,0 +1,12 @@
+<Legup>
+    <puzzle name="Nurikabe">
+        <board width="3" height="3">
+            <cells>
+                <cell value="-1" x="0" y="0"/>
+                <cell value="-1" x="0" y="1"/>
+                <cell value="2" x="1" y="1"/>
+                <cell value="-1" x="0" y="2"/>
+            </cells>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file
diff --git a/src/test/resources/puzzles/nurikabe/rules/FillinBlackDirectRule/FalseFillinBlack b/src/test/resources/puzzles/nurikabe/rules/FillinBlackDirectRule/FalseFillinBlack
new file mode 100644
index 000000000..731e2dc74
--- /dev/null
+++ b/src/test/resources/puzzles/nurikabe/rules/FillinBlackDirectRule/FalseFillinBlack
@@ -0,0 +1,12 @@
+<Legup>
+    <puzzle name="Nurikabe">
+        <board width="3" height="3">
+            <cells>
+                <cell value="-1" x="1" y="0"/>
+                <cell value="-1" x="1" y="2"/>
+                <cell value="-1" x="0" y="1"/>
+                <cell value="2" x="2" y="2"/>
+            </cells>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file
diff --git a/src/test/resources/puzzles/nurikabe/rules/FillinWhiteDirectRule/FalseFillinWhite b/src/test/resources/puzzles/nurikabe/rules/FillinWhiteDirectRule/FalseFillinWhite
new file mode 100644
index 000000000..f2599c71f
--- /dev/null
+++ b/src/test/resources/puzzles/nurikabe/rules/FillinWhiteDirectRule/FalseFillinWhite
@@ -0,0 +1,12 @@
+<Legup>
+    <puzzle name="Nurikabe">
+        <board width="3" height="3">
+            <cells>
+                <cell value="0" x="1" y="0"/>
+                <cell value="0" x="2" y="1"/>
+                <cell value="0" x="0" y="1"/>
+                <cell value="2" x="0" y="0"/>
+            </cells>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file
diff --git a/src/test/resources/puzzles/nurikabe/rules/IsolateBlackContradictionRule/FalseIsolateBlack b/src/test/resources/puzzles/nurikabe/rules/IsolateBlackContradictionRule/FalseIsolateBlack
new file mode 100644
index 000000000..b4eb09302
--- /dev/null
+++ b/src/test/resources/puzzles/nurikabe/rules/IsolateBlackContradictionRule/FalseIsolateBlack
@@ -0,0 +1,10 @@
+<Legup>
+    <puzzle name="Nurikabe">
+        <board width="3" height="3">
+            <cells>
+                <cell value="-1" x="0" y="0"/>
+                <cell value="-1" x="2" y="0"/>
+            </cells>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file
diff --git a/src/test/resources/puzzles/nurikabe/rules/NoNumberContradictionRule/NoNumberReachable b/src/test/resources/puzzles/nurikabe/rules/NoNumberContradictionRule/FalseNoNumber
similarity index 100%
rename from src/test/resources/puzzles/nurikabe/rules/NoNumberContradictionRule/NoNumberReachable
rename to src/test/resources/puzzles/nurikabe/rules/NoNumberContradictionRule/FalseNoNumber
diff --git a/src/test/resources/puzzles/nurikabe/rules/NoNumberContradictionRule/FalseNoNumber2 b/src/test/resources/puzzles/nurikabe/rules/NoNumberContradictionRule/FalseNoNumber2
new file mode 100644
index 000000000..be1fc64f7
--- /dev/null
+++ b/src/test/resources/puzzles/nurikabe/rules/NoNumberContradictionRule/FalseNoNumber2
@@ -0,0 +1,18 @@
+<Legup>
+    <puzzle name="Nurikabe">
+        <board width="4" height="4">
+            <cells>
+                <cell value="0" x="1" y="1"/>
+                <cell value="3" x="2" y="2"/>
+                <cell value="-1" x="1" y="0"/>
+                <cell value="-1" x="2" y="0"/>
+                <cell value="-1" x="1" y="3"/>
+                <cell value="-1" x="2" y="3"/>
+                <cell value="-1" x="0" y="1"/>
+                <cell value="-1" x="0" y="2"/>
+                <cell value="-1" x="3" y="1"/>
+                <cell value="-1" x="3" y="2"/>
+            </cells>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file
diff --git a/src/test/resources/puzzles/nurikabe/rules/NoNumberContradictionRule/NoNumberSurroundBlack b/src/test/resources/puzzles/nurikabe/rules/NoNumberContradictionRule/SimpleNoNumber
similarity index 100%
rename from src/test/resources/puzzles/nurikabe/rules/NoNumberContradictionRule/NoNumberSurroundBlack
rename to src/test/resources/puzzles/nurikabe/rules/NoNumberContradictionRule/SimpleNoNumber
diff --git a/src/test/resources/puzzles/nurikabe/rules/PreventBlackSquareDirectRule/FalseBlackSquare b/src/test/resources/puzzles/nurikabe/rules/PreventBlackSquareDirectRule/FalseBlackSquare
new file mode 100644
index 000000000..2fd8e7d35
--- /dev/null
+++ b/src/test/resources/puzzles/nurikabe/rules/PreventBlackSquareDirectRule/FalseBlackSquare
@@ -0,0 +1,10 @@
+<Legup>
+    <puzzle name="Nurikabe">
+        <board width="3" height="3">
+            <cells>
+                <cell value="-1" x="0" y="0"/>
+                <cell value="-1" x="1" y="0"/>
+            </cells>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file
diff --git a/src/test/resources/puzzles/nurikabe/rules/SurroundRegionDirectRule/FalseSurroundRegion b/src/test/resources/puzzles/nurikabe/rules/SurroundRegionDirectRule/FalseSurroundRegion
new file mode 100644
index 000000000..5e0b04f68
--- /dev/null
+++ b/src/test/resources/puzzles/nurikabe/rules/SurroundRegionDirectRule/FalseSurroundRegion
@@ -0,0 +1,10 @@
+<Legup>
+    <puzzle name="Nurikabe">
+        <board width="3" height="3">
+            <cells>
+                <cell value="1" x="1" y="1"/>
+
+            </cells>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file
diff --git a/src/test/resources/puzzles/nurikabe/rules/TooFewSpacesContradictionRule/FalseTooFewSpaces b/src/test/resources/puzzles/nurikabe/rules/TooFewSpacesContradictionRule/FalseTooFewSpaces
new file mode 100644
index 000000000..ca3e9be84
--- /dev/null
+++ b/src/test/resources/puzzles/nurikabe/rules/TooFewSpacesContradictionRule/FalseTooFewSpaces
@@ -0,0 +1,17 @@
+<Legup>
+    <puzzle name="Nurikabe">
+        <board width="5" height="5">
+            <cells>
+                <cell value="-1" x="1" y="0"/>
+                <cell value="-1" x="0" y="1"/>
+                <cell value="2" x="1" y="1"/>
+                <cell value="-1" x="2" y="1"/>
+                <cell value="-1" x="0" y="2"/>
+                <cell value="0" x="1" y="2"/>
+                <cell value="-1" x="2" y="2"/>
+                <cell value="4" x="4" y="2"/>
+                <cell value="-1" x="1" y="3"/>
+            </cells>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file
diff --git a/src/test/resources/puzzles/nurikabe/rules/TooManySpacesContradictionRule/MultipleNumberRegion b/src/test/resources/puzzles/nurikabe/rules/TooManySpacesContradictionRule/MultipleNumberRegion
new file mode 100644
index 000000000..3ec126199
--- /dev/null
+++ b/src/test/resources/puzzles/nurikabe/rules/TooManySpacesContradictionRule/MultipleNumberRegion
@@ -0,0 +1,11 @@
+<Legup>
+    <puzzle name="Nurikabe">
+        <board width="3" height="3">
+            <cells>
+                <cell value="3" x="0" y="1"/>
+                <cell value="0" x="1" y="1"/>
+                <cell value="2" x="2" y="1"/>
+            </cells>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file
diff --git a/src/test/resources/puzzles/nurikabe/rules/WhiteBottleNeckDirectRule/FalseBottleNeck b/src/test/resources/puzzles/nurikabe/rules/WhiteBottleNeckDirectRule/FalseBottleNeck
new file mode 100644
index 000000000..521576aeb
--- /dev/null
+++ b/src/test/resources/puzzles/nurikabe/rules/WhiteBottleNeckDirectRule/FalseBottleNeck
@@ -0,0 +1,11 @@
+<Legup>
+    <puzzle name="Nurikabe">
+        <board width="3" height="3">
+            <cells>
+                <cell value="2" x="1" y="1"/>
+                <cell value="-1" x="1" y="0"/>
+                <cell value="-1" x="1" y="2"/>
+            </cells>
+        </board>
+    </puzzle>
+</Legup>
\ No newline at end of file