From 351ea799e6c757c7a3c3ea960175976f4bfa627e Mon Sep 17 00:00:00 2001 From: Tharre Date: Thu, 24 May 2018 03:45:53 +0200 Subject: Fix conflict with OperationDAOTest #25963 --- .../groupphase/einsatzverwaltung/dao/OperationDAOTest.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung') 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 da20030..d2a6b7e 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 @@ -27,8 +27,13 @@ public class OperationDAOTest extends JdbcTestCase { private final Operation o; - public OperationDAOTest() { - VehicleDAO vehicleDAO = new VehicleDatabaseDao(getJdbcConnectionManager()); + public OperationDAOTest() throws PersistenceException { + // TODO: fix once everything properly uses dependency injection + EmployeeDAO employeeDAO = new EmployeeDatabaseDao(getJdbcConnectionManager()); + RegistrationDatabaseDAO registrationDatabaseDAO = + new RegistrationDatabaseDAO(getJdbcConnectionManager(), employeeDAO); + VehicleDAO vehicleDAO = + new VehicleDatabaseDao(getJdbcConnectionManager(), registrationDatabaseDAO); this.operationDAO = new DBOperationDAO(getJdbcConnectionManager(), vehicleDAO); Vehicle v1 = -- cgit v1.2.3-70-g09d2