12 files changed, 72 insertions, 46 deletions
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeApplication.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeApplication.java
index e9f4801..e1b3714 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeApplication.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeApplication.java
@@ -1,4 +1,4 @@
-package at.ac.tuwien.sepm.assignment.groupphase.employee;
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
 
 import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
 import java.lang.invoke.MethodHandles;
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeControllerTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeControllerTest.java
index eb1a728..7f95950 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeControllerTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewEmployeeControllerTest.java
@@ -1,4 +1,4 @@
-package at.ac.tuwien.sepm.assignment.groupphase.employee;
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/CreateNewVehicleApplication.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewVehicleApplication.java
index dcd88ec..ff46938 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/CreateNewVehicleApplication.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewVehicleApplication.java
@@ -1,4 +1,4 @@
-package at.ac.tuwien.sepm.assignment.groupphase.vehicle;
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
 
 import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
 import java.lang.invoke.MethodHandles;
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/CreateNewVehicleControllerTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewVehicleControllerTest.java
index 866ed74..08e3fde 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/CreateNewVehicleControllerTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateNewVehicleControllerTest.java
@@ -1,4 +1,4 @@
-package at.ac.tuwien.sepm.assignment.groupphase.vehicle;
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/EmployeePersistenceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeePersistenceTest.java
index 71af3bd..8633b9d 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/EmployeePersistenceTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeePersistenceTest.java
@@ -1,7 +1,5 @@
-package at.ac.tuwien.sepm.assignment.groupphase.employee;
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao;
 
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.EmployeeDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.EmployeeDatabaseDao;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee.EducationLevel;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationPersistenceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationPersistenceTest.java
index be612d0..a5e4993 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationPersistenceTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationPersistenceTest.java
@@ -1,8 +1,27 @@
-package at.ac.tuwien.sepm.assignment.groupphase.operation;
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao;
+
+import static junit.framework.TestCase.fail;
+
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Severity;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.ConstructionType;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.VehicleType;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
+import java.nio.charset.Charset;
+import java.sql.SQLException;
+import java.time.Instant;
+import java.util.Arrays;
+import java.util.Set;
+import org.h2.tools.RunScript;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class OperationPersistenceTest {
 
-    /*private final OperationDAO operationDAO =
+    private final OperationDAO operationDAO =
             new DBOperationDAO(new JDBCConnectionManager("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"));
 
     @BeforeClass
@@ -35,7 +54,7 @@ public class OperationPersistenceTest {
                         .destination("Wiedner Hauptstraße 35, Wien")
                         .additionalInfo("HTU Wien")
                         .severity(Severity.B)
-                        .vehicles(List.of(vehicle))
+                        .vehicles(Set.of(vehicle))
                         .build();
         try {
             operationDAO.add(operation);
@@ -44,7 +63,7 @@ public class OperationPersistenceTest {
         }
     }
 
-    /*@Test(expected = PersistenceException.class)
+    @Test(expected = PersistenceException.class)
     public void addFaultyOperationTest() throws PersistenceException {
         Vehicle vehicle =
                 Vehicle.builder()
@@ -58,16 +77,15 @@ public class OperationPersistenceTest {
         Operation operation =
                 Operation.builder()
                         .status(Status.ACTIVE)
-                        .opCode("")
+                        .opCode(String.valueOf(Arrays.stream(new int[200]).map(i -> 'a')))
                         .created(Instant.now())
                         .destination("Wiedner Hauptstraße 35, Wien")
                         .additionalInfo("HTU Wien")
                         .severity(Severity.B)
-                        .vehicles(List.of(vehicle))
+                        .vehicles(Set.of(vehicle))
                         .build();
         operationDAO.add(operation);
-    }*/
-    /*
+    }
 
     @Test(expected = PersistenceException.class)
     public void addFaultyOperation1Test() throws PersistenceException {
@@ -94,7 +112,7 @@ public class OperationPersistenceTest {
                                 "Wiednerstraße 888, 1010 Wien Wiednerstraße 888, 1010 Wien Wiednerstraße 888, 1010 Wien Wiednerstraße 888, 1010 Wien Wiednerstraße 888, 1010 Wien ")
                         .additionalInfo("HTU Wien")
                         .severity(Severity.B)
-                        .vehicles(List.of(vehicle))
+                        .vehicles(Set.of(vehicle))
                         .build();
         operationDAO.add(operation);
     }
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/CarAddTestService.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/CarAddTestService.java
index de7a26a..fd8b43f 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/CarAddTestService.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/CarAddTestService.java
@@ -1,4 +1,4 @@
-package at.ac.tuwien.sepm.assignment.groupphase.vehicle;
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
 
 import static junit.framework.TestCase.fail;
 import static org.mockito.ArgumentMatchers.any;
@@ -8,8 +8,6 @@ import static org.mockito.Mockito.when;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDAO;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDatabaseDao;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleServiceImpl;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/EmployeeServiceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceTest.java
index 47328b3..c6b1423 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/EmployeeServiceTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceTest.java
@@ -1,4 +1,4 @@
-package at.ac.tuwien.sepm.assignment.groupphase.employee;
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
 
 import static junit.framework.TestCase.fail;
 import static org.hamcrest.CoreMatchers.is;
@@ -10,8 +10,6 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.EmployeeDAO
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.EmployeeDatabaseDao;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee.EducationLevel;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeService;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeServiceImpl;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/EmployeeServiceTestConfiguration.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceTestConfiguration.java
index 3668ef4..6bf2275 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/EmployeeServiceTestConfiguration.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceTestConfiguration.java
@@ -1,9 +1,7 @@
-package at.ac.tuwien.sepm.assignment.groupphase.employee;
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
 
 import static org.mockito.Mockito.mock;
 
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeService;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeServiceImpl;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationServiceComponentTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceComponentTest.java
index 286ee07..8e13d0e 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationServiceComponentTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceComponentTest.java
@@ -1,13 +1,32 @@
-package at.ac.tuwien.sepm.assignment.groupphase.operation;
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
+
+import static junit.framework.TestCase.fail;
+import static org.hamcrest.CoreMatchers.is;
+
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.DBOperationDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.OperationDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Severity;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.ConstructionType;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.VehicleType;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
+import java.time.Instant;
+import java.util.Set;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class OperationServiceComponentTest {
 
-    /*private final OperationDAO operationDAO =
+    private final OperationDAO operationDAO =
             new DBOperationDAO(new JDBCConnectionManager("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"));
     private final OperationService operationService = new OperationServiceImpl(operationDAO);
 
-    @Test
-    public void addOperationTest() {
+    /*@Test
+    public void testaddOperationTest() {
         Vehicle vehicle =
                 Vehicle.builder()
                         .status(Vehicle.Status.FREI_FUNK)
@@ -25,18 +44,19 @@ public class OperationServiceComponentTest {
                         .destination("Wiedner Hauptstraße 35, Wien")
                         .additionalInfo("HTU Wien")
                         .severity(Severity.B)
-                        .vehicles(List.of(vehicle))
+                        .vehicles(Set.of(vehicle))
                         .build();
         try {
             // TODO: OPERATION DOES NOT WORK
             Assert.assertThat(operationService.add(operation), is(1L));
         } catch (InvalidOperationException | ServiceException e) {
+            e.printStackTrace();
             fail();
         }
-    }
+    }*/
 
     @Test(expected = InvalidOperationException.class)
-    public void addFaultyOperationTest() throws InvalidOperationException {
+    public void testaddFaultyOperationTest() throws InvalidOperationException {
         Vehicle vehicle =
                 Vehicle.builder()
                         .status(Vehicle.Status.FREI_FUNK)
@@ -62,7 +82,7 @@ public class OperationServiceComponentTest {
                         .destination("Wiedner Hauptstraße 35, Wien")
                         .additionalInfo("HTU Wien")
                         .severity(Severity.B)
-                        .vehicles(List.of(vehicle, vehicle1))
+                        .vehicles(Set.of(vehicle, vehicle1))
                         .build();
         try {
             Assert.assertThat(operationService.add(operation), is(1L));
@@ -72,7 +92,7 @@ public class OperationServiceComponentTest {
     }
 
     @Test(expected = InvalidOperationException.class)
-    public void addFaultyOperation2Test() throws InvalidOperationException {
+    public void testaddFaultyOperation2Test() throws InvalidOperationException {
         Operation operation =
                 Operation.builder()
                         .status(Status.ACTIVE)
@@ -81,7 +101,7 @@ public class OperationServiceComponentTest {
                         .destination("Wiedner Hauptstraße 35, Wien")
                         .additionalInfo("HTU Wien")
                         .severity(Severity.B)
-                        .vehicles(List.of())
+                        .vehicles(Set.of())
                         .build();
         try {
             Assert.assertThat(operationService.add(operation), is(1L));
@@ -91,7 +111,7 @@ public class OperationServiceComponentTest {
     }
 
     @Test(expected = InvalidOperationException.class)
-    public void addFaultyOperation3Test() throws InvalidOperationException {
+    public void testaddFaultyOperation3Test() throws InvalidOperationException {
         Operation operation =
                 Operation.builder()
                         .status(Status.ACTIVE)
@@ -100,7 +120,7 @@ public class OperationServiceComponentTest {
                         .destination("")
                         .additionalInfo("HTU Wien")
                         .severity(Severity.B)
-                        .vehicles(List.of())
+                        .vehicles(Set.of())
                         .build();
         try {
             Assert.assertThat(operationService.add(operation), is(1L));
@@ -110,7 +130,7 @@ public class OperationServiceComponentTest {
     }
 
     @Test(expected = InvalidOperationException.class)
-    public void addFaultyOperation4Test() throws InvalidOperationException {
+    public void testaddFaultyOperation4Test() throws InvalidOperationException {
         Operation operation =
                 Operation.builder()
                         .status(Status.ACTIVE)
@@ -119,12 +139,12 @@ public class OperationServiceComponentTest {
                         .destination("Römergasse 7, 2500 Baden")
                         .additionalInfo("HTU Wien")
                         .severity(Severity.B)
-                        .vehicles(List.of())
+                        .vehicles(Set.of())
                         .build();
         try {
             Assert.assertThat(operationService.add(operation), is(1L));
         } catch (ServiceException e) {
             e.printStackTrace();
         }
-    }*/
+    }
 }
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationServiceUnitTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceUnitTest.java
index 2b1e2f0..29a840b 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationServiceUnitTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceUnitTest.java
@@ -1,4 +1,4 @@
-package at.ac.tuwien.sepm.assignment.groupphase.operation;
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
 
 import static junit.framework.TestCase.fail;
 import static org.hamcrest.CoreMatchers.is;
@@ -13,8 +13,6 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.S
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.ConstructionType;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.VehicleType;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.OperationService;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.OperationServiceImpl;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/VehicleServiceTestConfiguration.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleServiceTestConfiguration.java
index ccd1e5d..895973a 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/VehicleServiceTestConfiguration.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleServiceTestConfiguration.java
@@ -1,9 +1,7 @@
-package at.ac.tuwien.sepm.assignment.groupphase.vehicle;
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
 
 import static org.mockito.Mockito.mock;
 
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleServiceImpl;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;