aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung')
-rw-r--r--src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAOTest.java (renamed from src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/H2RegistrationDAOTest.java)6
-rw-r--r--src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceImplTest.java (renamed from src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/SimpleRegistrationServiceTest.java)8
2 files changed, 6 insertions, 8 deletions
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/H2RegistrationDAOTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAOTest.java
index 1180bfa..980c429 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/H2RegistrationDAOTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAOTest.java
@@ -21,7 +21,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-public class H2RegistrationDAOTest {
+public class RegistrationDatabaseDAOTest {
// Base taken from EmployeePersistenceTest
@@ -32,8 +32,8 @@ public class H2RegistrationDAOTest {
private RegistrationDAO registrationDAO;
- public H2RegistrationDAOTest() throws PersistenceException {
- this.registrationDAO = new H2RegistrationDAO(new JDBCConnectionManager(JDBC_URL));
+ public RegistrationDatabaseDAOTest() throws PersistenceException {
+ this.registrationDAO = new RegistrationDatabaseDAO(new JDBCConnectionManager(JDBC_URL));
}
@BeforeClass
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/SimpleRegistrationServiceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceImplTest.java
index b1ef38f..7171f83 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/SimpleRegistrationServiceTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/RegistrationServiceImplTest.java
@@ -1,7 +1,5 @@
package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service;
-import static org.junit.Assert.*;
-
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;
@@ -25,7 +23,7 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
-public class SimpleRegistrationServiceTest {
+public class RegistrationServiceImplTest {
@Mock RegistrationDAO daoMock;
@@ -36,7 +34,7 @@ public class SimpleRegistrationServiceTest {
@Test
public void addValidRegistrationsShouldSucceed()
throws InvalidRegistrationException, ServiceException, InvalidVehicleException {
- RegistrationService registrationService = new SimpleRegistrationService(daoMock);
+ RegistrationService registrationService = new RegistrationServiceImpl(daoMock);
List<Registration> registrations = new LinkedList<>();
Vehicle vehicle =
Vehicle.builder()
@@ -92,7 +90,7 @@ public class SimpleRegistrationServiceTest {
public void addOnlyOnePersonToRTWShouldFail()
throws InvalidRegistrationException, ServiceException, InvalidVehicleException {
thrown.expect(InvalidRegistrationException.class);
- RegistrationService registrationService = new SimpleRegistrationService(daoMock);
+ RegistrationService registrationService = new RegistrationServiceImpl(daoMock);
List<Registration> registrations = new LinkedList<>();
Vehicle vehicle =
Vehicle.builder()