From 600080d4fa34d1e9e41928db6e28e7c3331eba2a Mon Sep 17 00:00:00 2001 From: Felix Kehrer Date: Mon, 11 Jun 2018 23:57:49 +0200 Subject: move original operation so it can be used multiple times #27303 --- .../einsatzverwaltung/dao/OperationDAOTest.java | 49 ++++++++++++---------- 1 file changed, 26 insertions(+), 23 deletions(-) (limited to 'src') 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 ede2613..c7f5b46 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 @@ -32,6 +32,8 @@ public class OperationDAOTest extends JdbcTestCase { private final Operation o; + private final Operation originalOperation; + public OperationDAOTest() throws PersistenceException { // TODO: fix once everything properly uses dependency injection EmployeeDAO employeeDAO = new EmployeeDatabaseDAO(getJdbcConnectionManager()); @@ -65,6 +67,29 @@ public class OperationDAOTest extends JdbcTestCase { .destination("New destination") .additionalInfo("New information") .build(); + + Vehicle vehicle = + Vehicle.builder() + .id(4) + .name("BKTW-2") + .constructionType(ConstructionType.HOCHDACH) + .type(VehicleType.BKTW) + .hasNef(false) + .status(Vehicle.Status.ZUM_BERUFUNGSORT) + .registrations(new LinkedList<>()) + .build(); + + originalOperation = + Operation.builder() + .id(1) + .opCode("ALP-95E7") + .severity(Severity.E) + .created(Instant.parse("2000-01-01T00:00:00.0Z")) + .destination("Wiedner Hauptstraße 35, Wien") + .additionalInfo("Additional information") + .status(Status.ACTIVE) + .vehicles(Set.of(vehicle)) + .build(); } @BeforeClass @@ -104,29 +129,7 @@ public class OperationDAOTest extends JdbcTestCase { public void testListOperations() throws Exception { Set operationSet = operationDAO.list(EnumSet.allOf(Status.class)); - Vehicle vehicle = - Vehicle.builder() - .id(4) - .name("BKTW-2") - .constructionType(ConstructionType.HOCHDACH) - .type(VehicleType.BKTW) - .hasNef(false) - .status(Vehicle.Status.ZUM_BERUFUNGSORT) - .registrations(new LinkedList<>()) - .build(); - Operation operation = - Operation.builder() - .id(1) - .opCode("ALP-95E7") - .severity(Severity.E) - .created(Instant.parse("2000-01-01T00:00:00.0Z")) - .destination("Wiedner Hauptstraße 35, Wien") - .additionalInfo("Additional information") - .status(Status.ACTIVE) - .vehicles(Set.of(vehicle)) - .build(); - - assertEquals(Set.of(operation), operationSet); + assertEquals(Set.of(originalOperation), operationSet); } @Test -- cgit v1.2.3-70-g09d2