From 2dcc2e6be5a4d4f04e23f7fc2c5250697b11a05f Mon Sep 17 00:00:00 2001 From: Dominic Rogetzer Date: Mon, 11 Jun 2018 15:05:52 +0200 Subject: Extract two methods in RegistrationServiceTest for later use [#27302] methods are addValidRegistrations and addOnlyOnePersonToRTW. Extracted in order to avoid duplicate code, as the same code is used in integration test later on --- .../service/RegistrationServiceTest.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'src/test/java/at/ac/tuwien/sepm/assignment/groupphase') diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceTest.java index 4d3a251..c6af300 100644 --- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceTest.java +++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceTest.java @@ -58,6 +58,17 @@ public class RegistrationServiceTest { @Test public void addValidRegistrationsShouldSucceed() throws InvalidRegistrationException, ServiceException, InvalidVehicleException { + addValidRegistrations(registrationDAO, vehicleDAO); + } + + @Test + public void addOnlyOnePersonToRTWShouldFail() + throws InvalidRegistrationException, ServiceException, InvalidVehicleException { + addOnlyOnePersonToRTW(thrown, registrationDAO, vehicleDAO); + } + + static void addValidRegistrations(RegistrationDAO registrationDAO, VehicleDAO vehicleDAO) + throws InvalidVehicleException, InvalidRegistrationException, ServiceException { RegistrationService registrationService = new RegistrationServiceImpl(registrationDAO, vehicleDAO); Set registrations = new HashSet<>(); @@ -111,9 +122,9 @@ public class RegistrationServiceTest { registrationService.add(vehicle.id(), registrations); } - @Test - public void addOnlyOnePersonToRTWShouldFail() - throws InvalidRegistrationException, ServiceException, InvalidVehicleException { + static void addOnlyOnePersonToRTW( + ExpectedException thrown, RegistrationDAO registrationDAO, VehicleDAO vehicleDAO) + throws InvalidVehicleException, InvalidRegistrationException, ServiceException { thrown.expect(InvalidRegistrationException.class); RegistrationService registrationService = new RegistrationServiceImpl(registrationDAO, vehicleDAO); -- cgit v1.2.3-70-g09d2