From be80ff84430b5f28613ec5b99cbc6b5e5d3ee45b Mon Sep 17 00:00:00 2001 From: Felix Kehrer Date: Mon, 7 May 2018 18:53:28 +0200 Subject: Changed interface back to how it was before --- .../service/RegistrationServiceImplTest.java | 34 +++++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) (limited to 'src/test/java/at') 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 7171f83..f3efbef 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,5 +1,8 @@ package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.when; + import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.RegistrationDAO; import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee; import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee.EducationLevel; @@ -14,12 +17,15 @@ 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; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; @@ -27,14 +33,33 @@ public class RegistrationServiceImplTest { @Mock RegistrationDAO daoMock; + @Mock VehicleService vehicleService; + @Rule public MockitoRule mockitoRule = MockitoJUnit.rule(); @Rule public ExpectedException thrown = ExpectedException.none(); + @Before + public void setUp() throws ServiceException { + 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())); + } + @Test public void addValidRegistrationsShouldSucceed() throws InvalidRegistrationException, ServiceException, InvalidVehicleException { - RegistrationService registrationService = new RegistrationServiceImpl(daoMock); + RegistrationService registrationService = + new RegistrationServiceImpl(daoMock, vehicleService); List registrations = new LinkedList<>(); Vehicle vehicle = Vehicle.builder() @@ -83,14 +108,15 @@ public class RegistrationServiceImplTest { registrations.add(registration1); registrations.add(registration2); registrations.add(registration3); - registrationService.add(vehicle, registrations); + registrationService.add(vehicle.id(), registrations); } @Test public void addOnlyOnePersonToRTWShouldFail() throws InvalidRegistrationException, ServiceException, InvalidVehicleException { thrown.expect(InvalidRegistrationException.class); - RegistrationService registrationService = new RegistrationServiceImpl(daoMock); + RegistrationService registrationService = + new RegistrationServiceImpl(daoMock, vehicleService); List registrations = new LinkedList<>(); Vehicle vehicle = Vehicle.builder() @@ -117,6 +143,6 @@ public class RegistrationServiceImplTest { .employee(employee) .build(); registrations.add(registration); - registrationService.add(vehicle, registrations); + registrationService.add(vehicle.id(), registrations); } } -- cgit v1.2.3-70-g09d2