6 Commits

Author SHA1 Message Date
Riley Schneider
ec0abd85b9 Merge remote-tracking branch 'origin/database' into database
# Conflicts:
#	.gradle/8.14/executionHistory/executionHistory.lock
#	.gradle/8.14/fileHashes/fileHashes.bin
#	.gradle/8.14/fileHashes/fileHashes.lock
#	.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	.gradle/buildOutputCleanup/cache.properties
#	build/classes/java/main/hhn/temp/project/provider/DatabaseManager.class
#	build/tmp/compileJava/previous-compilation-data.bin
#	src/main/java/hhn/temp/project/provider/SimpleDatabaseManager.java
#	test/hhn/temp/project/BadCasesTest.java
#	test/hhn/temp/project/DatabaseBadCasesTest.java
#	test/hhn/temp/project/DatabaseGoodCasesTest.java
#	test/hhn/temp/project/GoodCasesTest.java
2025-12-03 18:20:36 +01:00
Riley Schneider
04f2087456 First runnable tests for Database / Commented out Good/BadCasesTests (not relevant to this branch) 2025-12-03 18:19:48 +01:00
8c4849fdf0 Just adding the report so I can rebase 2025-12-03 17:43:40 +01:00
a5378868ea Changed a small setting so test results are actually displayed 2025-12-03 17:39:42 +01:00
9641825200 Wrote the first BadCasesTests 2025-12-03 17:36:12 +01:00
d5a9825ec1 Wrote the first GoodCasesTests 2025-12-03 17:29:56 +01:00
19 changed files with 711 additions and 44 deletions

View File

@@ -1,2 +1,2 @@
#Wed Dec 03 17:36:43 CET 2025 #Wed Dec 03 17:27:55 CET 2025
gradle.version=9.1.0 gradle.version=8.14

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@@ -1,4 +0,0 @@
package hhn.temp.project;
public class Admin extends Worker{
}

View File

@@ -1,13 +1,10 @@
package hhn.temp.project.provider; package hhn.temp.project.provider;
import java.sql.SQLException;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.sql.*;
public class SimpleDatabaseManager<E> implements DatabaseManager<E> { public class SimpleDatabaseManager<E> implements DatabaseManager<E> {
private Connection connection;
@Override @Override
public void saveObjects(Collection<E> objects) { public void saveObjects(Collection<E> objects) {
@@ -29,8 +26,7 @@ public class SimpleDatabaseManager<E> implements DatabaseManager<E> {
} }
@Override @Override
public void connect() throws SQLException { public void connect() {
throw new SQLException(); //...
} }
} }

View File

@@ -1,37 +1,38 @@
package hhn.temp.project; package hhn.temp.project;
import hhn.temp.project.AssignmentManager;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class BadCasesTest { public class BadCasesTest {
/*AssignmentManager manager;
@BeforeEach @BeforeEach
public void setup() { public void setup() {
AssignmentManager manager = new AssignmentManager(); manager = new AssignmentManager();
} }
@Test @Test
@DisplayName("Assert that added tasks can't be Null") @DisplayName("Assert that added tasks can't be Null")
public void assertNewTasksAreNotNull() { public void assertNewTasksAreNotNull() {
int workerId = manager.createWorker("Alfred");
assertThrows(manager.addTask(workerId, null, null) instanceof IllegalArgumentException);
} }
@Test @Test
@DisplayName("Assert List isn't empty after adding a task") @DisplayName("Assert List isn't empty after adding a task")
public void assertListNowEmptyAfterAdd() { public void assertListNowEmptyAfterAdd() {
int workerId = manager.createWorker("Alfred");
int taskId = manager.addTask(workerId, "Run", "Jog 10 Miles");
assertTrue(manager.getTaskList().size >= 1);
} }
@Test @Test
@DisplayName("Assert only existing tasks can be edited") @DisplayName("Assert only existing tasks can be edited")
public void assertEditOnlyExistingTasks() { public void assertEditOnlyExistingTasks() {
int workerId = manager.createWorker("Alfred");
} assertThrows(manager.editTask(workerId, 99969, "I", "am Illegal") instanceof IllegalArgumentException);
@Test }*/
@DisplayName("Assert Worker can only edit own tasks")
public void assertWorkerMayOnlyEditOwnTasks() {
}
} }

View File

@@ -1,51 +1,62 @@
package hhn.temp.project; package hhn.temp.project;
import hhn.temp.project.AssignmentManager;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class GoodCasesTest { public class GoodCasesTest {
/*AssignmentManager manager;
@BeforeEach @BeforeEach
public void setup() { public void setup() {
AssignmentManager manager = new AssignmentManager(); manager = new AssignmentManager();
} }
@Test @Test
@DisplayName("Assert that a Worker can add a Task") @DisplayName("Assert that a Worker can add a Task")
public void assertWorkerCanAddTask() { public void assertWorkerCanAddTask() {
int workerId = manager.createWorker("Alfred");
int taskId = manager.addTask(workerId, "Run", "Jog 10 Miles");
assertNotNull(manager.getTask(taskId));
assertEquals(manager.getTask(taskId).getName(), "Run");
} }
@Test @Test
@DisplayName("Assert that added Tasks are added to the List") @DisplayName("Assert that added Tasks are added to the List")
public void assertTasksShowInList() { public void assertTasksShowInList() {
int sizeCount = manager.getTaskList().size();
int workerId = manager.createWorker("Alfred");
int taskId = manager.addTask(workerId, "Run", "Jog 10 Miles");
assertEquals(sizeCount + 1, manager.getTaskList().size);
} }
@Test @Test
@DisplayName("Assert existing Tasks can be edited") @DisplayName("Assert existing Tasks can be edited")
public void assertExistingTasksCanBeEdited() { public void assertExistingTasksCanBeEdited() {
int workerId = manager.createWorker("Alfred");
int taskId = manager.addTask(workerId, "Run", "Jog 10 Miles");
manager.editTask(workerId, taskId, "Walk", "Walk 3 Miles");
assertEquals(manager.getTask(taskId).getName(), "Walk");
assertEquals(manager.getTask(taskId).getDescription(), "Walk 3 Miles");
} }
@Test @Test
@DisplayName("Assert that Worker can remove own Task") @DisplayName("Assert that Worker can remove Task")
public void assertWorkerCanRemoveOwnTask() { public void assertWorkerCanRemoveOwnTask() {
int sizeCount = manager.getTaskList().size();
} int workerId = manager.createWorker("Alfred");
int taskId = manager.addTask(workerId, "Run", "Jog 10 Miles");
@Test assertEquals(sizeCount + 1, manager.getTaskList().size);
@DisplayName("Assert that Admin can remove every Task") manager.removeTask(taskId);
public void assertAdminCanRemoveEveryTask() { assertEquals(sizeCount - 1, manager.getTaskList().size);
} }
@Test @Test
@DisplayName("Assert deleted Tasks no longer show up in the List") @DisplayName("Assert deleted Tasks no longer show up in the List")
public void assertDeletedTasksDisappear() { public void assertDeletedTasksDisappear() {
int workerId = manager.createWorker("Alfred");
} int taskId = manager.addTask(workerId, "Run", "Jog 10 Miles");
manager.removeTask(taskId);
assertThrows(manager.getTask(taskId) instanceof IllegalArgumentException);
}*/
} }