diff options
| author | Dominic Rogetzer <e1627756@student.tuwien.ac.at> | 2018-06-19 18:02:03 +0200 |
|---|---|---|
| committer | Dominic Rogetzer <e01627756@student.tuwien.ac.at> | 2018-06-19 18:02:03 +0200 |
| commit | f0af2d1909ecdff0dc2cdb796622de69522ab15e (patch) | |
| tree | a084fff0554bdb5a51acc370a9e91363448a7239 /src | |
| parent | e9d65c968e38128f27d104cd4f96cc2d8f8df458 (diff) | |
| download | sepm-groupproject-f0af2d1909ecdff0dc2cdb796622de69522ab15e.tar.gz sepm-groupproject-f0af2d1909ecdff0dc2cdb796622de69522ab15e.tar.xz sepm-groupproject-f0af2d1909ecdff0dc2cdb796622de69522ab15e.zip | |
Fix names of vehicles in test-data [#25963]
The name of a vehicle is always "<type>-<vehicleId>"
Diffstat (limited to 'src')
6 files changed, 19 insertions, 17 deletions
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"/> <VehicleVersion id="1" name="RTW-1" constructionType="HOCHDACH" type="RTW" hasNef="true"/> - <VehicleVersion id="2" name="KTW-1" constructionType="HOCHDACH" type="KTW" hasNef="true"/> - <VehicleVersion id="3" name="KTW-2" constructionType="MITTELHOCHDACH" type="KTW_B" hasNef="false"/> - <VehicleVersion id="4" name="BKTW-2" constructionType="HOCHDACH" type="BKTW" hasNef="false"/> + <VehicleVersion id="2" name="KTW-2" constructionType="HOCHDACH" type="KTW" hasNef="true"/> + <VehicleVersion id="3" name="KTW-3" constructionType="MITTELHOCHDACH" type="KTW_B" hasNef="false"/> + <VehicleVersion id="4" name="BKTW-4" constructionType="HOCHDACH" type="BKTW" hasNef="false"/> <VehicleVersion id="5" name="NEF-1" constructionType="NORMAL" type="NEF" hasNef="true"/> <Vehicle id="1" version="1" status="FREI_FUNK"/> 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"/> <VehicleVersion id="1" name="RTW-1" constructionType="HOCHDACH" type="RTW" hasNef="true"/> - <VehicleVersion id="2" name="KTW-1" constructionType="HOCHDACH" type="KTW" hasNef="true"/> - <VehicleVersion id="3" name="KTW-2" constructionType="MITTELHOCHDACH" type="KTW_B" hasNef="false"/> - <VehicleVersion id="4" name="BKTW-2" constructionType="HOCHDACH" type="BKTW" hasNef="false"/> + <VehicleVersion id="2" name="KTW-2" constructionType="HOCHDACH" type="KTW" hasNef="true"/> + <VehicleVersion id="3" name="KTW-3" constructionType="MITTELHOCHDACH" type="KTW_B" hasNef="false"/> + <VehicleVersion id="4" name="BKTW-4" constructionType="HOCHDACH" type="BKTW" hasNef="false"/> <VehicleVersion id="5" name="NEF-1" constructionType="NORMAL" type="NEF" hasNef="true"/> <Vehicle id="1" version="1" status="FREI_FUNK"/> 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"/> <VehicleVersion id="1" name="RTW-1" constructionType="HOCHDACH" type="RTW" hasNef="true"/> - <VehicleVersion id="2" name="KTW-1" constructionType="HOCHDACH" type="KTW" hasNef="true"/> - <VehicleVersion id="3" name="KTW-2" constructionType="MITTELHOCHDACH" type="KTW_B" hasNef="false"/> - <VehicleVersion id="4" name="BKTW-2" constructionType="HOCHDACH" type="BKTW" hasNef="false"/> + <VehicleVersion id="2" name="KTW-2" constructionType="HOCHDACH" type="KTW" hasNef="true"/> + <VehicleVersion id="3" name="KTW-3" constructionType="MITTELHOCHDACH" type="KTW_B" hasNef="false"/> + <VehicleVersion id="4" name="BKTW-4" constructionType="HOCHDACH" type="BKTW" hasNef="false"/> <VehicleVersion id="5" name="NEF-1" constructionType="NORMAL" type="NEF" hasNef="true"/> <Vehicle id="1" version="1" status="FREI_FUNK"/> 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"/> <VehicleVersion id="1" name="RTW-1" constructionType="HOCHDACH" type="RTW" hasNef="true"/> - <VehicleVersion id="2" name="KTW-1" constructionType="HOCHDACH" type="KTW" hasNef="true"/> - <VehicleVersion id="3" name="KTW-2" constructionType="MITTELHOCHDACH" type="KTW_B" hasNef="false"/> - <VehicleVersion id="4" name="BKTW-2" constructionType="HOCHDACH" type="BKTW" hasNef="false"/> + <VehicleVersion id="2" name="KTW-2" constructionType="HOCHDACH" type="KTW" hasNef="true"/> + <VehicleVersion id="3" name="KTW-3" constructionType="MITTELHOCHDACH" type="KTW_B" hasNef="false"/> + <VehicleVersion id="4" name="BKTW-4" constructionType="HOCHDACH" type="BKTW" hasNef="false"/> <VehicleVersion id="5" name="NEF-1" constructionType="NORMAL" type="NEF" hasNef="true"/> <Vehicle id="1" version="1" status="FREI_FUNK"/> 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 @@ <dataset> <VehicleVersion id="1" name="RTW-1" constructionType="HOCHDACH" type="RTW" hasNef="true"/> -<VehicleVersion id="2" name="KTW-1" constructionType="HOCHDACH" type="KTW" hasNef="true"/> -<VehicleVersion id="3" name="KTW-2" constructionType="MITTELHOCHDACH" type="KTW_B" hasNef="false"/> -<VehicleVersion id="4" name="BKTW-2" constructionType="HOCHDACH" type="BKTW" hasNef="false"/> +<VehicleVersion id="2" name="KTW-2" constructionType="HOCHDACH" type="KTW" hasNef="true"/> +<VehicleVersion id="3" name="KTW-3" constructionType="MITTELHOCHDACH" type="KTW_B" hasNef="false"/> +<VehicleVersion id="4" name="BKTW-4" constructionType="HOCHDACH" type="BKTW" hasNef="false"/> <VehicleVersion id="5" name="NEF-1" constructionType="NORMAL" type="NEF" hasNef="true"/> <Vehicle id="1" version="1" status="FREI_FUNK"/> |