diff --git a/.gradle/8.14/executionHistory/executionHistory.bin b/.gradle/8.14/executionHistory/executionHistory.bin index 6a5210f0..3497c161 100644 Binary files a/.gradle/8.14/executionHistory/executionHistory.bin and b/.gradle/8.14/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.14/executionHistory/executionHistory.lock b/.gradle/8.14/executionHistory/executionHistory.lock index 3353b4ae..12a812dc 100644 Binary files a/.gradle/8.14/executionHistory/executionHistory.lock and b/.gradle/8.14/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.14/fileHashes/fileHashes.bin b/.gradle/8.14/fileHashes/fileHashes.bin index 6d7b787e..593de86a 100644 Binary files a/.gradle/8.14/fileHashes/fileHashes.bin and b/.gradle/8.14/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.14/fileHashes/fileHashes.lock b/.gradle/8.14/fileHashes/fileHashes.lock index e12de6f6..ffde176c 100644 Binary files a/.gradle/8.14/fileHashes/fileHashes.lock and b/.gradle/8.14/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.14/fileHashes/resourceHashesCache.bin b/.gradle/8.14/fileHashes/resourceHashesCache.bin index 8dcf4d23..2416311d 100644 Binary files a/.gradle/8.14/fileHashes/resourceHashesCache.bin and b/.gradle/8.14/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 56923cab..aa759ee6 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/build/classes/java/main/hhn/temp/project/AssignmentManager.class b/build/classes/java/main/hhn/temp/project/AssignmentManager.class index 18bb7804..118b4b11 100644 Binary files a/build/classes/java/main/hhn/temp/project/AssignmentManager.class and b/build/classes/java/main/hhn/temp/project/AssignmentManager.class differ diff --git a/build/classes/java/main/hhn/temp/project/Task.class b/build/classes/java/main/hhn/temp/project/Task.class index c12dac23..c837cc35 100644 Binary files a/build/classes/java/main/hhn/temp/project/Task.class and b/build/classes/java/main/hhn/temp/project/Task.class differ diff --git a/build/classes/java/main/hhn/temp/project/Worker.class b/build/classes/java/main/hhn/temp/project/Worker.class index 155a0cda..119008c1 100644 Binary files a/build/classes/java/main/hhn/temp/project/Worker.class and b/build/classes/java/main/hhn/temp/project/Worker.class differ diff --git a/build/classes/java/test/hhn/temp/project/GoodCasesTest.class b/build/classes/java/test/hhn/temp/project/GoodCasesTest.class index d33dc2b5..76246c73 100644 Binary files a/build/classes/java/test/hhn/temp/project/GoodCasesTest.class and b/build/classes/java/test/hhn/temp/project/GoodCasesTest.class differ diff --git a/build/jacoco/test.exec b/build/jacoco/test.exec index c914d072..9c7dda03 100644 Binary files a/build/jacoco/test.exec and b/build/jacoco/test.exec differ diff --git a/build/reports/tests/test/classes/hhn.temp.project.BadCasesTest.html b/build/reports/tests/test/classes/hhn.temp.project.BadCasesTest.html index 97b7f9a7..f736b509 100644 --- a/build/reports/tests/test/classes/hhn.temp.project.BadCasesTest.html +++ b/build/reports/tests/test/classes/hhn.temp.project.BadCasesTest.html @@ -41,7 +41,7 @@
-
0.096s
+
0.021s

duration

@@ -81,25 +81,25 @@ Assert Add Task is programmed defensively assertAddTaskOnlyAcceptsValidParameters() -0.007s +0.002s passed Assert only existing tasks can be edited assertEditOnlyExistingTasks() -0.003s +0.004s passed Assert non-existent commands are recognized as such assertInvalidCommandsDontCrash() -0.015s +0.001s passed Assert List isn't empty after adding a task assertListNowEmptyAfterAdd() -0.045s +0.004s passed @@ -111,13 +111,13 @@ Assert that Remove Task is programmed defensively assertRemoveTaskOnlyAcceptsValidParameters() -0.014s +0.002s passed Assert that removing a non-existent worker throws an Exception assertRemovingNonExistentWorkerFails() -0.006s +0.002s passed @@ -143,7 +143,7 @@ Generated by -Gradle 8.14 at 04.01.2026, 16:08:46

+Gradle 8.14 at 04.01.2026, 16:32:20

diff --git a/build/reports/tests/test/classes/hhn.temp.project.GoodCasesTest.html b/build/reports/tests/test/classes/hhn.temp.project.GoodCasesTest.html index 0ed2f764..34111ba9 100644 --- a/build/reports/tests/test/classes/hhn.temp.project.GoodCasesTest.html +++ b/build/reports/tests/test/classes/hhn.temp.project.GoodCasesTest.html @@ -41,7 +41,7 @@
-
0.083s
+
0.051s

duration

@@ -121,49 +121,49 @@ Check that every required surface command actually works assertCommandsAreRecognized() -0.012s +0.004s passed Assert deleted Tasks no longer show up in the List assertDeletedTasksDisappear() -0.003s +0.001s passed Check that editing is possible through UI assertEditingTasksIsPossibleThroughUi() -0.026s +0.008s failed Assert existing Tasks can be edited assertExistingTasksCanBeEdited() -0.001s +0.003s passed Check that every task command works assertFinishingTasksIsPossibleThroughUi() -0.006s +0.005s passed Check Getters assertGettersWorkCorrectly() -0.007s +0.014s passed Assert that removing a worker removes the worker from the worker list assertRemoveWorkerActuallyRemoves() -0.003s +0.005s failed Assert that removing Workers is possible through the UI assertRemovingWorkersIsPossibleThroughUI() -0.005s +0.002s passed @@ -175,25 +175,25 @@ Assert that Task State is actually changed when submitted as finished assertTaskStateChanges() -0.011s +0.004s passed Assert that added Tasks are added to the List assertTasksShowInList() -0.002s +0.001s passed Assert that a Worker can add a Task assertWorkerCanAddTask() -0.003s +0.001s passed Assert that Worker can remove Task assertWorkerCanRemoveOwnTask() -0.002s +0.001s passed @@ -244,7 +244,7 @@ Unknown command. Type 'help' for available commands. Generated by -Gradle 8.14 at 04.01.2026, 16:08:46

+Gradle 8.14 at 04.01.2026, 16:32:20

diff --git a/build/reports/tests/test/index.html b/build/reports/tests/test/index.html index 5d1594bf..ac37d130 100644 --- a/build/reports/tests/test/index.html +++ b/build/reports/tests/test/index.html @@ -38,7 +38,7 @@
-
0.911s
+
1.810s

duration

@@ -113,7 +113,7 @@ 25 5 0 -0.911s +1.810s 80% @@ -140,7 +140,7 @@ 8 0 0 -0.096s +0.021s 100% @@ -150,7 +150,7 @@ 1 0 0 -0.037s +0.027s 100% @@ -160,7 +160,7 @@ 3 3 0 -0.695s +1.711s 0% @@ -170,7 +170,7 @@ 13 2 0 -0.083s +0.051s 84% @@ -184,7 +184,7 @@ Generated by -Gradle 8.14 at 04.01.2026, 16:08:46

+Gradle 8.14 at 04.01.2026, 16:32:20

diff --git a/build/reports/tests/test/packages/hhn.temp.project.html b/build/reports/tests/test/packages/hhn.temp.project.html index eb358303..0b27113d 100644 --- a/build/reports/tests/test/packages/hhn.temp.project.html +++ b/build/reports/tests/test/packages/hhn.temp.project.html @@ -40,7 +40,7 @@
-
0.911s
+
1.810s

duration

@@ -111,7 +111,7 @@ 8 0 0 -0.096s +0.021s 100% @@ -121,7 +121,7 @@ 1 0 0 -0.037s +0.027s 100% @@ -131,7 +131,7 @@ 3 3 0 -0.695s +1.711s 0% @@ -141,7 +141,7 @@ 13 2 0 -0.083s +0.051s 84% @@ -154,7 +154,7 @@ Generated by -Gradle 8.14 at 04.01.2026, 16:08:46

+Gradle 8.14 at 04.01.2026, 16:32:20

diff --git a/build/test-results/test/TEST-hhn.temp.project.BadCasesTest.xml b/build/test-results/test/TEST-hhn.temp.project.BadCasesTest.xml index c500e876..2715170c 100644 --- a/build/test-results/test/TEST-hhn.temp.project.BadCasesTest.xml +++ b/build/test-results/test/TEST-hhn.temp.project.BadCasesTest.xml @@ -1,12 +1,12 @@ - + - - - - - - + + + + + + - + - - + + org.opentest4j.AssertionFailedError: expected: <Walk> but was: <Run> at app//org.junit.jupiter.api.AssertionFailureBuilder.build(AssertionFailureBuilder.java:151) at app//org.junit.jupiter.api.AssertionFailureBuilder.buildAndThrow(AssertionFailureBuilder.java:132) @@ -16,14 +16,14 @@ at java.base@17.0.2/java.util.ArrayList.forEach(ArrayList.java:1511) - - - - - - - - + + + + + + + + org.opentest4j.AssertionFailedError: Expected java.lang.IllegalArgumentException to be thrown, but nothing was thrown. at app//org.junit.jupiter.api.AssertionFailureBuilder.build(AssertionFailureBuilder.java:152) at app//org.junit.jupiter.api.AssertThrows.assertThrows(AssertThrows.java:73) @@ -36,8 +36,8 @@ - - + + workerMap; - Map taskMap; - int workerIdCounter; - int taskIdCounter; - UserCommands userInterface; + private Map workerMap; + private Map taskMap; + private int workerIdCounter; + private int taskIdCounter; + private UserCommands userInterface; public AssignmentManager() { workerMap = new HashMap<>(); @@ -19,6 +19,10 @@ public class AssignmentManager { int taskIdCounter = 0; userInterface = new UserCommands(this); } + public Map getTaskMap() { + return taskMap; + } + public Map getWorkerMap() {return workerMap;} public int createWorker(String name) { Worker worker = new Worker(name, ++workerIdCounter); @@ -45,9 +49,6 @@ public class AssignmentManager { } return taskMap.get(taskId); } - public Map getTaskMap() { - return taskMap; - } public void editTask(int workerId, int taskId, String name, String description) { if (!workerMap.containsKey(workerId) || !taskMap.containsKey(taskId)) { throw new IllegalArgumentException("Task Id or Worker Id does not exist"); @@ -79,6 +80,7 @@ public class AssignmentManager { public UserCommands getUserCommands() { return userInterface; } + public void startCLI() { userInterface.start(); } diff --git a/src/main/java/hhn/temp/project/Task.java b/src/main/java/hhn/temp/project/Task.java index f4d015bb..d963d84f 100644 --- a/src/main/java/hhn/temp/project/Task.java +++ b/src/main/java/hhn/temp/project/Task.java @@ -1,11 +1,11 @@ package hhn.temp.project; public class Task { - String name; - String description; - int taskId; - int workerId; - TaskState state; + private String name; + private String description; + private int taskId; + private int workerId; + private TaskState state; public Task(int taskId, int workerId, String name, String description) { this.name = name; this.description = description; diff --git a/src/main/java/hhn/temp/project/Worker.java b/src/main/java/hhn/temp/project/Worker.java index 38fde70f..85242408 100644 --- a/src/main/java/hhn/temp/project/Worker.java +++ b/src/main/java/hhn/temp/project/Worker.java @@ -1,8 +1,8 @@ package hhn.temp.project; public class Worker { - String name; - int workerId; + private String name; + private int workerId; public Worker(String name, int workerId) { this.name = name; this.workerId = workerId; diff --git a/test/hhn/temp/project/GoodCasesTest.java b/test/hhn/temp/project/GoodCasesTest.java index e7549c99..3dabeaf9 100644 --- a/test/hhn/temp/project/GoodCasesTest.java +++ b/test/hhn/temp/project/GoodCasesTest.java @@ -69,9 +69,9 @@ public class GoodCasesTest { public void assertGettersWorkCorrectly() { int workerId = manager.createWorker("Alfred"); int taskId = manager.addTask(workerId, "Run", "Jog 10 Miles"); - assertEquals("Alfred", manager.workerMap.get(workerId).getName()); + assertEquals("Alfred", manager.getWorkerMap().get(workerId).getName()); //This one may be somewhat nonsensical, but it ensures the getId works so one may iterate over the workerMap - assertEquals(manager.workerMap.get(workerId).getId(), workerId); + assertEquals(manager.getWorkerMap().get(workerId).getId(), workerId); assertEquals(manager.getTask(taskId).getTaskId(), taskId); assertEquals(manager.getTask(taskId).getWorkerId(), workerId); @@ -150,6 +150,6 @@ public class GoodCasesTest { public void assertRemoveWorkerActuallyRemoves() { int workerId = manager.createWorker("Alfred"); manager.removeWorker(workerId); - assertThrows(IllegalArgumentException.class, () -> manager.workerMap.containsKey(workerId)); + assertThrows(IllegalArgumentException.class, () -> manager.getWorkerMap().containsKey(workerId)); } }