Merge pull request 'Changed Tests so they don't permanently insert workers and tasks into the database' (#7) from ScannerImplementation into main

Reviewed-on: #7

Reviewing myself, bad practice ^^

test/hhn/temp/project/BadCasesTest.java

@@ -19,6 +19,7 @@ public class BadCasesTest {
     public void assertNewTasksAreNotNull() {
         int workerId = manager.createWorker("Alfred");
         assertThrows(IllegalArgumentException.class, () -> manager.addTask(workerId, null, null));
+        manager.removeWorker(workerId);
     }
     @Test
     @DisplayName("Assert List isn't empty after adding a task")
@@ -26,6 +27,8 @@ public class BadCasesTest {
         int workerId = manager.createWorker("Alfred");
         int taskId = manager.addTask(workerId, "Run", "Jog 10 Miles");
         assertFalse(manager.getTaskMap().isEmpty());
+        manager.removeWorker(workerId);
+        manager.removeTask(taskId);
     }
     @Test
     @DisplayName("Assert only existing tasks can be edited")
@@ -33,6 +36,7 @@ public class BadCasesTest {
         int workerId = manager.createWorker("Alfred");
         assertThrows(IllegalArgumentException.class, () -> manager.editTask(workerId, 99969, "I", "am Illegal"));
         assertThrows(IllegalArgumentException.class, () -> manager.editTask(22200, 99969, "I", "am Illegal"));
+        manager.removeWorker(workerId);
     }
     @Test
     @DisplayName("Assert Add Task is programmed defensively")
@@ -40,6 +44,7 @@ public class BadCasesTest {
         int workerId = manager.createWorker("Alfred");
         assertThrows(IllegalArgumentException.class, () -> manager.addTask( 20203,"I", "am Illegal"));
         assertThrows(IllegalArgumentException.class, () -> manager.addTask( workerId,null, null));
+        manager.removeWorker(workerId);
     }
     @Test
     @DisplayName("Assert that Remove Task is programmed defensively")
@@ -67,5 +72,7 @@ public class BadCasesTest {
         } catch (Exception e) {
             fail("Should not crash just because a command is invalid");
         }
+        manager.removeWorker(workerId);
+        manager.removeTask(taskId);
     }
 }

test/hhn/temp/project/DatabaseBadCasesTest.java

@@ -15,7 +15,7 @@ public class DatabaseBadCasesTest {
   public void setup() throws SQLException {
     databaseManager = new SimpleDatabaseManager();
     databaseManager.connect();
-    //databaseManager.clearDatabase();
+    databaseManager.clearDatabase();
   }
 
   @Test
@@ -27,9 +27,6 @@ public class DatabaseBadCasesTest {
     databaseManager.saveTask(task);
 
     databaseManager.saveTask(taskFaker);
-
-    databaseManager.deleteTask(task.getTaskId());
-    databaseManager.deleteTask(taskFaker.getTaskId());
   }
 
   @Test
@@ -41,8 +38,5 @@ public class DatabaseBadCasesTest {
     databaseManager.saveWorker(worker);
 
     databaseManager.saveWorker(workerFaker);
-
-    databaseManager.deleteWorker(worker.getId());
-    databaseManager.deleteWorker(workerFaker.getId());
   }
 }

test/hhn/temp/project/DatabaseGoodCasesTest.java

@@ -19,7 +19,7 @@ public class DatabaseGoodCasesTest {
   public void setup() throws SQLException {
     databaseManager = new SimpleDatabaseManager();
     databaseManager.connect();
-    //databaseManager.clearDatabase();
+    databaseManager.clearDatabase();
   }
 
   @Test
@@ -37,7 +37,7 @@ public class DatabaseGoodCasesTest {
     assertEquals(task.getName(), reTask.getName());
     assertEquals(task.getWorkerId(), reTask.getWorkerId());
 
-    databaseManager.deleteTask(task.getTaskId());
+    assertEquals(1, databaseManager.getTotalNumberOfTasks());
   }
 
   @Test
@@ -53,11 +53,9 @@ public class DatabaseGoodCasesTest {
 
     assertEquals(worker.getId(), reWorker.getId());
     assertEquals(worker.getName(), reWorker.getName());
-
-    databaseManager.deleteWorker(worker.getId());
   }
 
-  /*@Test
+  @Test
   @DisplayName("Clearing the database (Task and Worker) test")
   public void clearDatabaseTest() throws SQLException, InterruptedException {
     Task task1 = new Task(10, 5, "Hello", "World");
@@ -81,5 +79,5 @@ public class DatabaseGoodCasesTest {
 
     assertEquals(0, databaseManager.getTotalNumberOfTasks());
     assertEquals(0, databaseManager.getTotalNumberOfWorkers());
-  }*/
+  }
 }

test/hhn/temp/project/GoodCasesTest.java

@@ -23,6 +23,8 @@ public class GoodCasesTest {
         int taskId = manager.addTask(workerId, "Run", "Jog 10 Miles");
         assertNotNull(manager.getTask(taskId));
         assertEquals("Run", manager.getTask(taskId).getName());
+        manager.removeWorker(workerId);
+        manager.removeTask(taskId);
     }
 
     @Test
@@ -32,6 +34,8 @@ public class GoodCasesTest {
         int workerId = manager.createWorker("Alfred");
         int taskId = manager.addTask(workerId, "Run", "Jog 10 Miles");
         assertEquals(sizeCount + 1, manager.getTaskMap().size());
+        manager.removeWorker(workerId);
+        manager.removeTask(taskId);
     }
 
     @Test
@@ -42,6 +46,8 @@ public class GoodCasesTest {
         manager.editTask(workerId, taskId, "Walk", "Walk 3 Miles");
         assertEquals("Walk", manager.getTask(taskId).getName());
         assertEquals("Walk 3 Miles", manager.getTask(taskId).getDescription());
+        manager.removeWorker(workerId);
+        manager.removeTask(taskId);
     }
 
     @Test
@@ -53,6 +59,7 @@ public class GoodCasesTest {
         assertEquals(sizeCount + 1, manager.getTaskMap().size());
         manager.removeTask(taskId);
         assertEquals(sizeCount, manager.getTaskMap().size());
+        manager.removeWorker(workerId);
     }
 
     @Test
@@ -62,6 +69,7 @@ public class GoodCasesTest {
         int taskId = manager.addTask(workerId, "Run", "Jog 10 Miles");
         manager.removeTask(taskId);
         assertThrows(IllegalArgumentException.class, () -> manager.getTask(taskId));
+        manager.removeWorker(workerId);
     }
 
     @Test
@@ -74,6 +82,8 @@ public class GoodCasesTest {
         assertEquals(manager.getWorkerMap().get(workerId).getId(), workerId);
         assertEquals(manager.getTask(taskId).getTaskId(), taskId);
         assertEquals(manager.getTask(taskId).getWorkerId(), workerId);
+        manager.removeWorker(workerId);
+        manager.removeTask(taskId);
 
     }
 
@@ -86,6 +96,8 @@ public class GoodCasesTest {
         assertSame(TaskState.FINISHED, manager.getTask(taskId).getTaskState());
         manager.unfinishTask(workerId, taskId);
         assertSame(TaskState.IN_PROGRESS, manager.getTask(taskId).getTaskState());
+        manager.removeWorker(workerId);
+        manager.removeTask(taskId);
     }
 
     @Test
@@ -120,6 +132,7 @@ public class GoodCasesTest {
         assertDoesNotThrow(() -> manager.getUserCommands().handleInput("remove"));
         assertDoesNotThrow(() -> manager.getUserCommands().handleInput("back"));
         assertDoesNotThrow(() -> manager.getUserCommands().handleInput("edit"));
+        manager.removeWorker(workerId);
     }
     @Test
     @DisplayName("Check that editing is possible through UI")
@@ -133,6 +146,8 @@ public class GoodCasesTest {
         assertEquals("Walk", manager.getTask(taskId).getName());
         assertEquals("Walk 3 Miles", manager.getTask(taskId).getDescription());
         manager.getUserCommands().handleInput("back");
+        manager.removeWorker(workerId);
+        manager.removeTask(taskId);
     }
     @Test
     @DisplayName("Assert that removing Workers is possible through the UI")
@@ -144,6 +159,8 @@ public class GoodCasesTest {
         assertDoesNotThrow(() -> manager.getUserCommands().handleInput("remove"));
         manager.getUserCommands().handleInput(workerId2 + "");
         assertDoesNotThrow(() -> manager.getUserCommands().handleInput("back"));
+        manager.removeWorker(workerId);
+        manager.removeWorker(workerId2);
     }
     @Test
     @DisplayName("Assert that removing a worker removes the worker from the worker list")