diff options
5 files changed, 30 insertions, 7 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 d59b299..ede2613 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 @@ -15,6 +15,7 @@ import java.time.Instant; import java.util.Arrays; import java.util.Collections; import java.util.EnumSet; +import java.util.LinkedList; import java.util.Set; import java.util.TimeZone; import org.dbunit.dataset.DataSetException; @@ -103,8 +104,29 @@ public class OperationDAOTest extends JdbcTestCase { public void testListOperations() throws Exception { Set<Operation> operationSet = operationDAO.list(EnumSet.allOf(Status.class)); - // TODO: operations.list() currently doesn't set the vehicles set - // assertEquals(Set.of(o), operationSet); + 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); } @Test diff --git a/src/test/resources/operationDAOAddOperation.xml b/src/test/resources/operationDAOAddOperation.xml index 35a24af..fad04ce 100644 --- a/src/test/resources/operationDAOAddOperation.xml +++ b/src/test/resources/operationDAOAddOperation.xml @@ -13,9 +13,10 @@ <Vehicle id="1" version="1" status="FREI_FUNK"/> <Vehicle id="2" version="2" status="FREI_WACHE"/> <Vehicle id="3" version="3" status="FREI_FUNK"/> - <Vehicle id="4" version="4" status="FREI_WACHE"/> + <Vehicle id="4" version="4" status="ZUM_BERUFUNGSORT"/> <VehicleOperation vehicleId="1" operationId="2"/> <VehicleOperation vehicleId="2" operationId="2"/> <VehicleOperation vehicleId="3" operationId="2"/> + <VehicleOperation vehicleId="4" operationId="1"/> </dataset> diff --git a/src/test/resources/operationDAOUpdateNormal.xml b/src/test/resources/operationDAOUpdateNormal.xml index 795f44e..a02f495 100644 --- a/src/test/resources/operationDAOUpdateNormal.xml +++ b/src/test/resources/operationDAOUpdateNormal.xml @@ -11,7 +11,7 @@ <Vehicle id="1" version="1" status="FREI_FUNK"/> <Vehicle id="2" version="2" status="FREI_WACHE"/> <Vehicle id="3" version="3" status="FREI_FUNK"/> - <Vehicle id="4" version="4" status="FREI_WACHE"/> + <Vehicle id="4" version="4" status="ZUM_BERUFUNGSORT"/> <VehicleOperation vehicleId="1" operationId="1"/> <VehicleOperation vehicleId="2" operationId="1"/> diff --git a/src/test/resources/operationDAOUpdateRemoveVehicles.xml b/src/test/resources/operationDAOUpdateRemoveVehicles.xml index 462bfc1..1fcce62 100644 --- a/src/test/resources/operationDAOUpdateRemoveVehicles.xml +++ b/src/test/resources/operationDAOUpdateRemoveVehicles.xml @@ -11,7 +11,7 @@ <Vehicle id="1" version="1" status="FREI_FUNK"/> <Vehicle id="2" version="2" status="FREI_WACHE"/> <Vehicle id="3" version="3" status="FREI_FUNK"/> - <Vehicle id="4" version="4" status="FREI_WACHE"/> + <Vehicle id="4" version="4" status="ZUM_BERUFUNGSORT"/> <VehicleOperation /> </dataset> diff --git a/src/test/resources/operationDAOUpdateSetup.xml b/src/test/resources/operationDAOUpdateSetup.xml index 999a12e..82ef238 100644 --- a/src/test/resources/operationDAOUpdateSetup.xml +++ b/src/test/resources/operationDAOUpdateSetup.xml @@ -11,7 +11,7 @@ <Vehicle id="1" version="1" status="FREI_FUNK"/> <Vehicle id="2" version="2" status="FREI_WACHE"/> <Vehicle id="3" version="3" status="FREI_FUNK"/> - <Vehicle id="4" version="4" status="FREI_WACHE"/> + <Vehicle id="4" version="4" status="ZUM_BERUFUNGSORT"/> - <VehicleOperation /> + <VehicleOperation vehicleId="4" operationId="1"/> </dataset> |