Fixed bug with ConnectPipe and done more tests

HwProject/src/Pump.java

@@ -250,7 +250,7 @@ public int repair()
     @Override
     public int connectPipe(Pipe pipe)
     {
-        if (connectedPipes.size() < maxConnectedPipes - 1)
+        if (connectedPipes.size() < maxConnectedPipes)
         {
             return super.connectPipe(pipe);
         }

HwProject/tests/DrainTest.java

@@ -63,9 +63,6 @@ public void testPickUpPipe() {
 
     @AfterEach
     public void cleanUp() {
-        TestPump.setInstanceNr(0);
-        TestPipe.setInstanceNr(0);
-        TestSource.setInstanceNr(0);
-        TestDrain.setInstanceNr(0);
+        TestCleanup.cleanup();
     }
 }

HwProject/tests/HelperClasses/TestPipe.java

@@ -1,24 +1,43 @@
-package HwProject.tests.HelperClasses;
-
-import HwProject.src.Pipe;
-
-/**
- *    Pipe subclass for testing, only added setters and getters for each private and protected field
- */
-public class TestPipe extends Pipe {
-    public TestPipe() {
-        super();
-    }
-
-    public int getWaterLevel() {
-        return waterLevel;
-    }
-
-    public void setWaterLevel(int waterLevel) {
-        this.waterLevel = waterLevel;
-    }
-
-    public static void setInstanceNr(int i) {
-        instanceNr = i;
-    }
-}
+package tests.HelperClasses;
+
+import src.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ *    Pipe subclass for testing, only added setters and getters for each private and protected field
+ */
+public class TestPipe extends Pipe {
+    public TestPipe() {
+        super();
+    }
+
+    public int getWaterLevel() {
+        return waterLevel;
+    }
+
+    public void setWaterLevel(int waterLevel) {
+        this.waterLevel = waterLevel;
+    }
+
+    public boolean getSplippy() {
+        return this.isSlippy;
+    }
+
+    public StickyStates getSticky() {
+        return this.stickyState;
+    }
+
+    public static void setInstanceNr(int i) {
+        instanceNr = i;
+    }
+
+    public ArrayList<Player> getPlayers() {
+        return players;
+    }
+
+    public boolean getDamage() {
+        return isDamaged;
+    }
+}

HwProject/tests/PumpTest.java

@@ -140,9 +140,6 @@ void testDisconnectPipe() {
 
     @AfterEach
     public void cleanUp() {
-        TestPump.setInstanceNr(0);
-        TestPipe.setInstanceNr(0);
-        TestSource.setInstanceNr(0);
-        TestDrain.setInstanceNr(0);
+        TestCleanup.cleanup();
     }
 }

HwProject/tests/SourceTest.java

@@ -58,9 +58,6 @@ public void testStepCallsPushWater() {
 
     @AfterEach
     public void cleanUp() {
-        TestPump.setInstanceNr(0);
-        TestPipe.setInstanceNr(0);
-        TestSource.setInstanceNr(0);
-        TestDrain.setInstanceNr(0);
+        TestCleanup.cleanup();
     }
 }

src/SaboteurTest.java

@@ -0,0 +1,81 @@
+package src;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import tests.HelperClasses.TestCleanup;
+import tests.HelperClasses.TestSaboteur;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class SaboteurTest {
+    private Game game;
+
+    private TestSaboteur saboteur;
+
+    @BeforeEach
+    public void setUp() {
+        game = new Game(System.out);
+        Pipe.SetGame(game);
+        Drain.SetGame(game);
+        saboteur = new TestSaboteur("Saboteur1", game.GetFieldByID("Drain1"));
+    }
+
+    @Test
+    void move() {
+        saboteur.Move(game.GetFieldByID("Pipe12"));
+        assertEquals(game.GetFieldByID("Pipe12"), saboteur.getPosition());
+
+        TestSaboteur saboteur2 = new TestSaboteur("Saboteur2", game.GetFieldByID("Drain1"));
+        saboteur2.Move(game.GetFieldByID("Pipe12"));
+        assertEquals(game.GetFieldByID("Drain1"), saboteur2.getPosition());
+    }
+
+    @Test
+    void setPumpDirection() {
+        saboteur.Move(game.GetFieldByID("Pipe12"));
+        saboteur.Move(game.GetFieldByID("Pump5"));
+        saboteur.SetPumpDirection((Pipe) game.GetFieldByID("Pipe3"), (Pipe) game.GetFieldByID("Pipe10"));
+        assertEquals(game.GetFieldByID("Pipe10"), ((Pump) game.GetFieldByID("Pump5")).output);
+        assertEquals(game.GetFieldByID("Pipe3"), ((Pump) game.GetFieldByID("Pump5")).input);
+    }
+
+    @Test
+    void damage() {
+        saboteur.Move(game.GetFieldByID("Pipe12"));
+        saboteur.Damage();
+        assertTrue(((Pipe) game.GetFieldByID("Pipe12")).isDamaged);
+    }
+
+    @Test
+    void makeSlippy() {
+        saboteur.Move(game.GetFieldByID("Pipe12"));
+        saboteur.MakeSlippy();
+        assertTrue(((Pipe) game.GetFieldByID("Pipe12")).isSlippy);
+    }
+
+    @Test
+    void makeSticky() {
+    }
+
+    @Test
+    void testSetPumpDirection() {
+    }
+
+    @Test
+    void testDamage() {
+    }
+
+    @Test
+    void testMakeSlippy() {
+    }
+
+    @Test
+    void testMakeSticky() {
+    }
+
+    @AfterEach
+    public void cleanUp() {
+        TestCleanup.cleanup();
+    }
+}

tests/HelperClasses/TestCleanup.java

@@ -0,0 +1,11 @@
+package tests.HelperClasses;
+
+public class TestCleanup {
+
+    public static void cleanup() {
+        TestPump.setInstanceNr(0);
+        TestPipe.setInstanceNr(0);
+        TestSource.setInstanceNr(0);
+        TestDrain.setInstanceNr(0);
+    }
+}

tests/HelperClasses/TestSaboteur.java

@@ -0,0 +1,12 @@
+package tests.HelperClasses;
+import src.*;
+public class TestSaboteur extends Saboteur {
+
+    public TestSaboteur(String ID, Field position) {
+        super(ID, position);
+    }
+
+    public Field getPosition() {
+        return position;
+    }
+}