Change package structure/naming #25963

6 files changed, 17 insertions, 17 deletions

diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeePersistenceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeeDAOTest.java
index 5536c1c..585e5ea 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeePersistenceTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/EmployeeDAOTest.java
@@ -19,12 +19,12 @@ import org.dbunit.util.fileloader.FlatXmlDataFileLoader;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class EmployeePersistenceTest extends JdbcTestCase {
+public class EmployeeDAOTest extends JdbcTestCase {
 
     private EmployeeDAO employeePersistence;
 
-    public EmployeePersistenceTest() throws PersistenceException {
-        employeePersistence = new EmployeeDatabaseDao(getJdbcConnectionManager());
+    public EmployeeDAOTest() throws PersistenceException {
+        employeePersistence = new EmployeeDatabaseDAO(getJdbcConnectionManager());
     }
 
     @Override
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDAOTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDAOTest.java
index d2a6b7e..f173376 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDAOTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDAOTest.java
@@ -29,12 +29,12 @@ public class OperationDAOTest extends JdbcTestCase {
 
     public OperationDAOTest() throws PersistenceException {
         // TODO: fix once everything properly uses dependency injection
-        EmployeeDAO employeeDAO = new EmployeeDatabaseDao(getJdbcConnectionManager());
+        EmployeeDAO employeeDAO = new EmployeeDatabaseDAO(getJdbcConnectionManager());
         RegistrationDatabaseDAO registrationDatabaseDAO =
                 new RegistrationDatabaseDAO(getJdbcConnectionManager(), employeeDAO);
         VehicleDAO vehicleDAO =
-                new VehicleDatabaseDao(getJdbcConnectionManager(), registrationDatabaseDAO);
-        this.operationDAO = new DBOperationDAO(getJdbcConnectionManager(), vehicleDAO);
+                new VehicleDatabaseDAO(getJdbcConnectionManager(), registrationDatabaseDAO);
+        this.operationDAO = new OperationDatabaseDAO(getJdbcConnectionManager(), vehicleDAO);
 
         Vehicle v1 =
                 Vehicle.builder()
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAOTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDAOTest.java
index bdc16fb..e8ea809 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDatabaseDAOTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/RegistrationDAOTest.java
@@ -20,9 +20,9 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-public class RegistrationDatabaseDAOTest {
+public class RegistrationDAOTest {
 
-    // Base taken from EmployeePersistenceTest
+    // Base taken from EmployeeDAOTest
 
     private static final String JDBC_DRIVER = org.h2.Driver.class.getName();
     private static final String JDBC_URL = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1";
@@ -31,11 +31,11 @@ public class RegistrationDatabaseDAOTest {
 
     private RegistrationDAO registrationDAO;
 
-    public RegistrationDatabaseDAOTest() throws PersistenceException {
+    public RegistrationDAOTest() throws PersistenceException {
         JDBCConnectionManager jdbcConnectionManager = new JDBCConnectionManager(JDBC_URL);
         this.registrationDAO =
                 new RegistrationDatabaseDAO(
-                        jdbcConnectionManager, new EmployeeDatabaseDao(jdbcConnectionManager));
+                        jdbcConnectionManager, new EmployeeDatabaseDAO(jdbcConnectionManager));
         // TODO: Use Spring Dependency Injection here!
     }
 
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehiclePersistenceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDAOTest.java
index 0beb5c1..1862214 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehiclePersistenceTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDAOTest.java
@@ -18,7 +18,7 @@ import org.dbunit.dataset.xml.FlatXmlDataSetBuilder;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class VehiclePersistenceTest extends JdbcTestCase {
+public class VehicleDAOTest extends JdbcTestCase {
 
     private VehicleDAO vehicleDAO;
 
@@ -32,13 +32,13 @@ public class VehiclePersistenceTest extends JdbcTestCase {
                     .status(Status.ABGEMELDET)
                     .build();
 
-    public VehiclePersistenceTest() throws PersistenceException {
+    public VehicleDAOTest() throws PersistenceException {
         vehicleDAO =
-                new VehicleDatabaseDao(
+                new VehicleDatabaseDAO(
                         getJdbcConnectionManager(),
                         new RegistrationDatabaseDAO(
                                 getJdbcConnectionManager(),
-                                new EmployeeDatabaseDao(getJdbcConnectionManager())));
+                                new EmployeeDatabaseDAO(getJdbcConnectionManager())));
         // TODO: use Spring Dependency Injection!
     }
 
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceTest.java
index c49cd9d..90f0a44 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/EmployeeServiceTest.java
@@ -7,7 +7,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 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.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.ElementNotFoundException;
@@ -20,7 +20,7 @@ import org.junit.Test;
 
 public class EmployeeServiceTest {
 
-    private final EmployeeDAO employeePersistence = mock(EmployeeDatabaseDao.class);
+    private final EmployeeDAO employeePersistence = mock(EmployeeDatabaseDAO.class);
     private final EmployeeService employeeService = new EmployeeServiceImpl(employeePersistence);
 
     private final Employee.Builder employeeBuilder =
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/RegistrationServiceTest.java
index 95d8d77..4d3a251 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/RegistrationServiceTest.java
@@ -32,7 +32,7 @@ import org.mockito.MockitoAnnotations;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 
-public class RegistrationServiceImplTest {
+public class RegistrationServiceTest {
 
     @Mock private RegistrationDAO registrationDAO;