Merge branch 'develop'HEADv3.0master

6 files changed, 74 insertions, 22 deletions

diff --git a/src/test/resources/operationDAOAddOperation.xml b/src/test/resources/operationDAOAddOperation.xml
new file mode 100644
index 0000000..752de67
--- /dev/null
+++ b/src/test/resources/operationDAOAddOperation.xml
@@ -0,0 +1,22 @@
+<dataset>
+  <Operation id="1" opCode="ALP-95E7" severity="E" created="2000-01-01 00:00:00.0+00"
+    destination="Wiedner Hauptstraße 35, Wien" additionalInfo="Additional information" status="ACTIVE"/>
+  <Operation id="2" opCode="RD-2B0M" severity="B" created="2018-01-01 00:00:00.0+00"
+    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-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="ZUM_BERUFUNGSORT"/>
+  <Vehicle id="2" version="2" status="ZUM_BERUFUNGSORT"/>
+  <Vehicle id="3" version="3" status="ZUM_BERUFUNGSORT"/>
+  <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 025cdc2..accf97e 100644
--- a/src/test/resources/operationDAOUpdateNormal.xml
+++ b/src/test/resources/operationDAOUpdateNormal.xml
@@ -1,17 +1,17 @@
 <dataset>
-  <Operation id="1" opCode="RD-2B0M" severity="B" created="2000-01-01"
-    destination="New description" status="ACTIVE" additionalInfo="Test"/>
+  <Operation id="1" opCode="RD-2B0M" severity="B" created="2000-01-01 00:00:00.0+00"
+    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"/>
-  <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="1" version="1" status="ZUM_BERUFUNGSORT"/>
+  <Vehicle id="2" version="2" status="ZUM_BERUFUNGSORT"/>
+  <Vehicle id="3" version="3" status="ZUM_BERUFUNGSORT"/>
+  <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 6f171b4..a23f86c 100644
--- a/src/test/resources/operationDAOUpdateRemoveVehicles.xml
+++ b/src/test/resources/operationDAOUpdateRemoveVehicles.xml
@@ -1,17 +1,17 @@
 <dataset>
-  <Operation id="1" opCode="RD-2B0M" severity="B" created="2000-01-01"
-    destination="New description" status="ACTIVE" additionalInfo="Test"/>
+  <Operation id="1" opCode="RD-2B0M" severity="B" created="2000-01-01 00:00:00.0+00"
+    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"/>
   <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 23d1a25..533e58e 100644
--- a/src/test/resources/operationDAOUpdateSetup.xml
+++ b/src/test/resources/operationDAOUpdateSetup.xml
@@ -1,17 +1,17 @@
 <dataset>
-  <Operation id="1" opCode="ALP-95E7" severity="E" created="2000-01-01"
-    destination="Wiedner Hauptstraße 35, Wien" status="ACTIVE"/>
+  <Operation id="1" opCode="ALP-95E7" severity="E" created="2000-01-01 00:00:00.0+00"
+    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"/>
   <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>
diff --git a/src/test/resources/operationIntegrationVehicles.xml b/src/test/resources/operationIntegrationVehicles.xml
new file mode 100644
index 0000000..0e6f848
--- /dev/null
+++ b/src/test/resources/operationIntegrationVehicles.xml
@@ -0,0 +1,12 @@
+<dataset>
+<VehicleVersion id="1" name="RTW-1" constructionType="HOCHDACH" type="RTW" hasNef="true"/>
+<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"/>
+<Vehicle id="2" version="2" status="FREI_WACHE"/>
+<Vehicle id="3" version="3" status="FREI_FUNK"/>
+<Vehicle id="4" version="4" status="ZUM_BERUFUNGSORT"/>
+</dataset>
\ No newline at end of file
diff --git a/src/test/resources/registrationTestBaseData.xml b/src/test/resources/registrationTestBaseData.xml
new file mode 100644
index 0000000..7ef1912
--- /dev/null
+++ b/src/test/resources/registrationTestBaseData.xml
@@ -0,0 +1,18 @@
+<dataset>
+  <EmployeeVersion id="1" name="John Doe" birthday="2000-01-01" educationLevel="RS" isDriver="true"
+    isPilot="false"/>
+  <EmployeeVersion id="2" name="Nick Verily" birthday="1990-01-01" educationLevel="NKV"
+    isDriver="true" isPilot="false"/>
+  <EmployeeVersion id="3" name="Nicht Arzt" birthday="1980-01-01" educationLevel="NA"
+    isDriver="false" isPilot="false"/>
+
+  <Employee id="1" version="1"/>
+  <Employee id="2" version="2"/>
+  <Employee id="3" version="3"/>
+
+  <VehicleVersion id="1" name="RTW-1" hasNef="true" constructionType="HOCHDACH" type="RTW"/>
+  <VehicleVersion id="2" name="NEF-1" hasNef="false" constructionType="NORMAL" type="NEF"/>
+
+  <Vehicle id="1" version="1" status="ABGEMELDET"/>
+  <Vehicle id="2" version="2" status="ABGEMELDET"/>
+</dataset>
\ No newline at end of file