From ed4281ad525eea6bb6ae5e4d468b26f42f2cdaf5 Mon Sep 17 00:00:00 2001 From: Felix Kehrer Date: Wed, 30 May 2018 21:50:16 +0200 Subject: implement working test case for .add() #27303 --- src/test/resources/operationDAOAddOperation.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/test/resources/operationDAOAddOperation.xml (limited to 'src/test/resources/operationDAOAddOperation.xml') diff --git a/src/test/resources/operationDAOAddOperation.xml b/src/test/resources/operationDAOAddOperation.xml new file mode 100644 index 0000000..d08bb78 --- /dev/null +++ b/src/test/resources/operationDAOAddOperation.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2 From 82edecf036265c936bea6b2554761cc975e90837 Mon Sep 17 00:00:00 2001 From: Felix Kehrer Date: Sat, 2 Jun 2018 23:14:05 +0200 Subject: adapt tests to changed behaviour due to bugfix (#27844) #27303 --- .../assignment/groupphase/einsatzverwaltung/dao/OperationDAOTest.java | 1 + src/test/resources/operationDAOAddOperation.xml | 4 ++-- src/test/resources/operationDAOUpdateNormal.xml | 2 +- src/test/resources/operationDAOUpdateRemoveVehicles.xml | 2 +- src/test/resources/operationDAOUpdateSetup.xml | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src/test/resources/operationDAOAddOperation.xml') 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 bebb5d9..d40c825 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 @@ -102,6 +102,7 @@ public class OperationDAOTest extends JdbcTestCase { @Test public void testAddOperation() throws Exception { + // ASSUMES YOUR TIME ZONE IS +01 !!! long id = operationDAO.add(o); assertEquals(2, id); diff --git a/src/test/resources/operationDAOAddOperation.xml b/src/test/resources/operationDAOAddOperation.xml index d08bb78..73fa735 100644 --- a/src/test/resources/operationDAOAddOperation.xml +++ b/src/test/resources/operationDAOAddOperation.xml @@ -1,7 +1,7 @@ - - diff --git a/src/test/resources/operationDAOUpdateNormal.xml b/src/test/resources/operationDAOUpdateNormal.xml index 6fa87e6..795f44e 100644 --- a/src/test/resources/operationDAOUpdateNormal.xml +++ b/src/test/resources/operationDAOUpdateNormal.xml @@ -1,5 +1,5 @@ - diff --git a/src/test/resources/operationDAOUpdateRemoveVehicles.xml b/src/test/resources/operationDAOUpdateRemoveVehicles.xml index 97de699..462bfc1 100644 --- a/src/test/resources/operationDAOUpdateRemoveVehicles.xml +++ b/src/test/resources/operationDAOUpdateRemoveVehicles.xml @@ -1,5 +1,5 @@ - diff --git a/src/test/resources/operationDAOUpdateSetup.xml b/src/test/resources/operationDAOUpdateSetup.xml index 4d91e4a..999a12e 100644 --- a/src/test/resources/operationDAOUpdateSetup.xml +++ b/src/test/resources/operationDAOUpdateSetup.xml @@ -1,5 +1,5 @@ - -- cgit v1.2.3-70-g09d2 From 51a6f4810ac3f996e8f5222dad66660efd4a808e Mon Sep 17 00:00:00 2001 From: Felix Kehrer Date: Sun, 3 Jun 2018 20:50:29 +0200 Subject: change tests to always run in UTC #27844 --- .../groupphase/einsatzverwaltung/dao/OperationDAOTest.java | 7 +++++++ src/test/resources/operationDAOAddOperation.xml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src/test/resources/operationDAOAddOperation.xml') 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 d40c825..9ca125a 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 @@ -16,8 +16,10 @@ import java.util.Arrays; import java.util.Collections; import java.util.EnumSet; import java.util.Set; +import java.util.TimeZone; import org.dbunit.dataset.DataSetException; import org.dbunit.dataset.IDataSet; +import org.junit.BeforeClass; import org.junit.Test; public class OperationDAOTest extends JdbcTestCase { @@ -64,6 +66,11 @@ public class OperationDAOTest extends JdbcTestCase { .build(); } + @BeforeClass + public static void before() { + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + } + @Override protected IDataSet getDataSet() throws DataSetException { return getDataSet("operationDAOUpdateSetup.xml"); diff --git a/src/test/resources/operationDAOAddOperation.xml b/src/test/resources/operationDAOAddOperation.xml index 73fa735..35a24af 100644 --- a/src/test/resources/operationDAOAddOperation.xml +++ b/src/test/resources/operationDAOAddOperation.xml @@ -1,7 +1,7 @@ - -- cgit v1.2.3-70-g09d2 From 6dbab1351c559661e60dc3d710fee01fb1620437 Mon Sep 17 00:00:00 2001 From: Felix Kehrer Date: Mon, 4 Jun 2018 22:29:01 +0200 Subject: implemented working testListOperations() #27844 --- .../einsatzverwaltung/dao/OperationDAOTest.java | 26 ++++++++++++++++++++-- src/test/resources/operationDAOAddOperation.xml | 3 ++- src/test/resources/operationDAOUpdateNormal.xml | 2 +- .../resources/operationDAOUpdateRemoveVehicles.xml | 2 +- src/test/resources/operationDAOUpdateSetup.xml | 4 ++-- 5 files changed, 30 insertions(+), 7 deletions(-) (limited to 'src/test/resources/operationDAOAddOperation.xml') 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 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 @@ - + + 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 @@ - + 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 @@ - + 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 @@ - + - + -- cgit v1.2.3-70-g09d2 From f0af2d1909ecdff0dc2cdb796622de69522ab15e Mon Sep 17 00:00:00 2001 From: Dominic Rogetzer Date: Tue, 19 Jun 2018 18:02:03 +0200 Subject: Fix names of vehicles in test-data [#25963] The name of a vehicle is always "-" --- .../assignment/groupphase/missioncontrol/dao/OperationDAOTest.java | 6 ++++-- src/test/resources/operationDAOAddOperation.xml | 6 +++--- src/test/resources/operationDAOUpdateNormal.xml | 6 +++--- src/test/resources/operationDAOUpdateRemoveVehicles.xml | 6 +++--- src/test/resources/operationDAOUpdateSetup.xml | 6 +++--- src/test/resources/operationIntegrationVehicles.xml | 6 +++--- 6 files changed, 19 insertions(+), 17 deletions(-) (limited to 'src/test/resources/operationDAOAddOperation.xml') diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/OperationDAOTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/OperationDAOTest.java index b15b31a..d9e7fb7 100644 --- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/OperationDAOTest.java +++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/dao/OperationDAOTest.java @@ -41,7 +41,9 @@ public class OperationDAOTest extends JdbcTestCase { new RegistrationDatabaseDAO(getJdbcConnectionManager(), employeeDAO); VehicleDAO vehicleDAO = new VehicleDatabaseDAO(getJdbcConnectionManager(), registrationDatabaseDAO); - this.operationDAO = new OperationDatabaseDAO(getJdbcConnectionManager(), vehicleDAO); + this.operationDAO = + new OperationDatabaseDAO( + getJdbcConnectionManager(), vehicleDAO, registrationDatabaseDAO); Vehicle v1 = Vehicle.builder() @@ -71,7 +73,7 @@ public class OperationDAOTest extends JdbcTestCase { Vehicle vehicle = Vehicle.builder() .id(4) - .name("BKTW-2") + .name("BKTW-4") .constructionType(ConstructionType.HOCHDACH) .type(VehicleType.BKTW) .hasNef(false) diff --git a/src/test/resources/operationDAOAddOperation.xml b/src/test/resources/operationDAOAddOperation.xml index fad04ce..adc8c3d 100644 --- a/src/test/resources/operationDAOAddOperation.xml +++ b/src/test/resources/operationDAOAddOperation.xml @@ -5,9 +5,9 @@ destination="New destination" additionalInfo="New information" status="ACTIVE"/> - - - + + + diff --git a/src/test/resources/operationDAOUpdateNormal.xml b/src/test/resources/operationDAOUpdateNormal.xml index a02f495..a4c4653 100644 --- a/src/test/resources/operationDAOUpdateNormal.xml +++ b/src/test/resources/operationDAOUpdateNormal.xml @@ -3,9 +3,9 @@ destination="New destination" additionalInfo="New information" status="ACTIVE"/> - - - + + + diff --git a/src/test/resources/operationDAOUpdateRemoveVehicles.xml b/src/test/resources/operationDAOUpdateRemoveVehicles.xml index 1fcce62..a23f86c 100644 --- a/src/test/resources/operationDAOUpdateRemoveVehicles.xml +++ b/src/test/resources/operationDAOUpdateRemoveVehicles.xml @@ -3,9 +3,9 @@ destination="New destination" status="ACTIVE" additionalInfo="New information"/> - - - + + + diff --git a/src/test/resources/operationDAOUpdateSetup.xml b/src/test/resources/operationDAOUpdateSetup.xml index 82ef238..533e58e 100644 --- a/src/test/resources/operationDAOUpdateSetup.xml +++ b/src/test/resources/operationDAOUpdateSetup.xml @@ -3,9 +3,9 @@ destination="Wiedner Hauptstraße 35, Wien" additionalInfo="Additional information" status="ACTIVE"/> - - - + + + diff --git a/src/test/resources/operationIntegrationVehicles.xml b/src/test/resources/operationIntegrationVehicles.xml index 45475a4..0e6f848 100644 --- a/src/test/resources/operationIntegrationVehicles.xml +++ b/src/test/resources/operationIntegrationVehicles.xml @@ -1,8 +1,8 @@ - - - + + + -- cgit v1.2.3-70-g09d2 From b09d0a97367e12fc9aab54809bcb3e6ee5de9ca7 Mon Sep 17 00:00:00 2001 From: Dominic Rogetzer Date: Tue, 19 Jun 2018 21:02:42 +0200 Subject: Fix operationDaoTests due to commit 824e8cb [#25963] --- src/test/resources/operationDAOAddOperation.xml | 6 +++--- src/test/resources/operationDAOUpdateNormal.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/test/resources/operationDAOAddOperation.xml') diff --git a/src/test/resources/operationDAOAddOperation.xml b/src/test/resources/operationDAOAddOperation.xml index adc8c3d..752de67 100644 --- a/src/test/resources/operationDAOAddOperation.xml +++ b/src/test/resources/operationDAOAddOperation.xml @@ -10,9 +10,9 @@ - - - + + + diff --git a/src/test/resources/operationDAOUpdateNormal.xml b/src/test/resources/operationDAOUpdateNormal.xml index a4c4653..accf97e 100644 --- a/src/test/resources/operationDAOUpdateNormal.xml +++ b/src/test/resources/operationDAOUpdateNormal.xml @@ -8,9 +8,9 @@ - - - + + + -- cgit v1.2.3-70-g09d2