diff options
| author | Tharre <tharre3@gmail.com> | 2018-05-24 03:45:53 +0200 |
|---|---|---|
| committer | Tharre <tharre3@gmail.com> | 2018-05-24 03:45:53 +0200 |
| commit | 351ea799e6c757c7a3c3ea960175976f4bfa627e (patch) | |
| tree | 10cf2572c27c24540def07dc426428c2cbfc283b /src/test/java/at/ac/tuwien/sepm/assignment | |
| parent | 80a8d2dc7df2f6760bf2c499d50e9dee4432eb8b (diff) | |
| download | sepm-groupproject-351ea799e6c757c7a3c3ea960175976f4bfa627e.tar.gz sepm-groupproject-351ea799e6c757c7a3c3ea960175976f4bfa627e.tar.xz sepm-groupproject-351ea799e6c757c7a3c3ea960175976f4bfa627e.zip | |
Fix conflict with OperationDAOTest #25963
Diffstat (limited to 'src/test/java/at/ac/tuwien/sepm/assignment')
| -rw-r--r-- | src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDAOTest.java | 9 |
1 files changed, 7 insertions, 2 deletions
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 = |