1 files changed, 18 insertions, 18 deletions
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceImplTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceImplTest.java
index f3efbef..88642ee 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceImplTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceImplTest.java
@@ -1,23 +1,26 @@
 package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
 
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.when;
 
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.RegistrationDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDAO;
 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.dto.Registration;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Builder;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.ConstructionType;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Status;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.VehicleType;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidRegistrationException;
 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;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
-import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 import org.junit.Before;
@@ -31,35 +34,32 @@ import org.mockito.junit.MockitoRule;
 
 public class RegistrationServiceImplTest {
 
-    @Mock RegistrationDAO daoMock;
+    @Mock private RegistrationDAO registrationDAO;
 
-    @Mock VehicleService vehicleService;
+    @Mock private VehicleDAO vehicleDAO;
 
     @Rule public MockitoRule mockitoRule = MockitoJUnit.rule();
 
     @Rule public ExpectedException thrown = ExpectedException.none();
 
     @Before
-    public void setUp() throws ServiceException {
+    public void setUp() throws ElementNotFoundException, PersistenceException {
         MockitoAnnotations.initMocks(this);
-        when(vehicleService.list(any()))
-                .thenReturn(
-                        Arrays.asList(
-                                Vehicle.builder()
-                                        .id(1)
-                                        .name("RTW-1")
-                                        .constructionType(ConstructionType.HOCHDACH)
-                                        .status(Status.ABGEMELDET)
-                                        .type(VehicleType.RTW)
-                                        .hasNef(true)
-                                        .build()));
+        Builder b =
+                Vehicle.builder()
+                        .name("RTW-1")
+                        .constructionType(ConstructionType.HOCHDACH)
+                        .status(Status.ABGEMELDET)
+                        .type(VehicleType.RTW)
+                        .hasNef(true);
+        when(vehicleDAO.get(anyLong())).thenAnswer(ans -> b.id(ans.getArgument(0)).build());
     }
 
     @Test
     public void addValidRegistrationsShouldSucceed()
             throws InvalidRegistrationException, ServiceException, InvalidVehicleException {
         RegistrationService registrationService =
-                new RegistrationServiceImpl(daoMock, vehicleService);
+                new RegistrationServiceImpl(registrationDAO, vehicleDAO);
         List<Registration> registrations = new LinkedList<>();
         Vehicle vehicle =
                 Vehicle.builder()
@@ -116,7 +116,7 @@ public class RegistrationServiceImplTest {
             throws InvalidRegistrationException, ServiceException, InvalidVehicleException {
         thrown.expect(InvalidRegistrationException.class);
         RegistrationService registrationService =
-                new RegistrationServiceImpl(daoMock, vehicleService);
+                new RegistrationServiceImpl(registrationDAO, vehicleDAO);
         List<Registration> registrations = new LinkedList<>();
         Vehicle vehicle =
                 Vehicle.builder()