Merge branch 'develop'v2.0

9 files changed, 123 insertions, 3 deletions

diff --git a/src/test/resources/EmployeePersistenceTestBaseData.xml b/src/test/resources/EmployeePersistenceTestBaseData.xml
new file mode 100644
index 0000000..a9553a2
--- /dev/null
+++ b/src/test/resources/EmployeePersistenceTestBaseData.xml
@@ -0,0 +1,12 @@
+<dataset>
+<EmployeeVersion id="10" name="Adam" birthday="2010-10-10" educationlevel="RS" isDriver="true"
+  isPilot="false"/>
+<EmployeeVersion id="20" name="Max" birthday="1990-11-11" educationlevel="NFS" isDriver="false"
+  isPilot="false"/>
+<EmployeeVersion id="30" name="Lisa" birthday="1999-10-16" educationlevel="NKI" isDriver="true"
+  isPilot="false"/>
+
+<Employee id="1" version="10" />
+<Employee id="2" version="20" />
+<Employee id="3" version="30" />
+</dataset>
\ No newline at end of file
diff --git a/src/test/resources/operationDAOUpdateNormal.xml b/src/test/resources/operationDAOUpdateNormal.xml
new file mode 100644
index 0000000..025cdc2
--- /dev/null
+++ b/src/test/resources/operationDAOUpdateNormal.xml
@@ -0,0 +1,19 @@
+<dataset>
+  <Operation id="1" opCode="RD-2B0M" severity="B" created="2000-01-01"
+    destination="New description" status="ACTIVE" additionalInfo="Test"/>
+
+  <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="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"/>
+
+  <VehicleOperation vehicleId="1" operationId="1"/>
+  <VehicleOperation vehicleId="2" operationId="1"/>
+  <VehicleOperation vehicleId="3" operationId="1"/>
+</dataset>
diff --git a/src/test/resources/operationDAOUpdateRemoveVehicles.xml b/src/test/resources/operationDAOUpdateRemoveVehicles.xml
new file mode 100644
index 0000000..6f171b4
--- /dev/null
+++ b/src/test/resources/operationDAOUpdateRemoveVehicles.xml
@@ -0,0 +1,17 @@
+<dataset>
+  <Operation id="1" opCode="RD-2B0M" severity="B" created="2000-01-01"
+    destination="New description" status="ACTIVE" additionalInfo="Test"/>
+
+  <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="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"/>
+
+  <VehicleOperation />
+</dataset>
diff --git a/src/test/resources/operationDAOUpdateSetup.xml b/src/test/resources/operationDAOUpdateSetup.xml
new file mode 100644
index 0000000..23d1a25
--- /dev/null
+++ b/src/test/resources/operationDAOUpdateSetup.xml
@@ -0,0 +1,17 @@
+<dataset>
+  <Operation id="1" opCode="ALP-95E7" severity="E" created="2000-01-01"
+    destination="Wiedner Hauptstraße 35, Wien" 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="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"/>
+
+  <VehicleOperation />
+</dataset>
diff --git a/src/test/resources/testAddValidEmployeeJoin_expected.xml b/src/test/resources/testAddValidEmployeeJoin_expected.xml
new file mode 100644
index 0000000..0977a95
--- /dev/null
+++ b/src/test/resources/testAddValidEmployeeJoin_expected.xml
@@ -0,0 +1,17 @@
+<dataset>
+  <EMP_JOIN e_id="1" e_version="10" v_id="10" v_name="Adam" v_birthday="2010-10-10"
+    v_educationlevel="RS" v_isDriver="true"
+    v_isPilot="false"/>
+  <EMP_JOIN e_id="2" e_version="20" v_id="20" v_name="Max" v_birthday="1990-11-11"
+    v_educationlevel="NFS"
+    v_isDriver="false"
+    v_isPilot="false"/>
+  <EMP_JOIN e_id="3" e_version="30" v_id="30" v_name="Lisa" v_birthday="1999-10-16"
+    v_educationlevel="NKI"
+    v_isDriver="true"
+    v_isPilot="false"/>
+  <EMP_JOIN e_id="4" e_version="40" v_id="40" v_name="Testperson" v_birthday="2010-11-11"
+    v_educationlevel="NA"
+    v_isDriver="true"
+    v_isPilot="false"/>
+</dataset>
\ No newline at end of file
diff --git a/src/test/resources/testAddValidEmployee_expected.xml b/src/test/resources/testAddValidEmployee_expected.xml
new file mode 100644
index 0000000..41ecf4e
--- /dev/null
+++ b/src/test/resources/testAddValidEmployee_expected.xml
@@ -0,0 +1,16 @@
+<dataset>
+  <EmployeeVersion id="10" name="Adam" birthday="2010-10-10" educationlevel="RS" isDriver="true"
+    isPilot="false"/>
+  <EmployeeVersion id="20" name="Max" birthday="1990-11-11" educationlevel="NFS" isDriver="false"
+    isPilot="false"/>
+  <EmployeeVersion id="30" name="Lisa" birthday="1999-10-16" educationlevel="NKI" isDriver="true"
+    isPilot="false"/>
+  <EmployeeVersion id="40" name="Testperson" birthday="2010-11-11" educationlevel="NA"
+    isDriver="true"
+    isPilot="false"/>
+
+  <Employee id="1" version="10"/>
+  <Employee id="2" version="20"/>
+  <Employee id="3" version="30"/>
+  <Employee id="4" version="40"/>
+</dataset>
\ No newline at end of file
diff --git a/src/test/resources/employeeServiceTestData.xml b/src/test/resources/testUpdateValidEmployee_expected.xml
index c21fde6..4a35a7b 100644
--- a/src/test/resources/employeeServiceTestData.xml
+++ b/src/test/resources/testUpdateValidEmployee_expected.xml
@@ -5,8 +5,10 @@
     isPilot="false"/>
   <EmployeeVersion id="30" name="Lisa" birthday="1999-10-16" educationlevel="NKI" isDriver="true"
     isPilot="false"/>
+  <EmployeeVersion id="31" name="Lisa" birthday="1999-10-16" educationlevel="NKA" isDriver="true"
+    isPilot="true"/>
 
-  <Employee id="1" version="10" />
-  <Employee id="2" version="20" />
-  <Employee id="3" version="30" />
+  <Employee id="1" version="10"/>
+  <Employee id="2" version="20"/>
+  <Employee id="3" version="31"/>
 </dataset>
\ No newline at end of file
diff --git a/src/test/resources/vehicleTestData.xml b/src/test/resources/vehicleTestData.xml
new file mode 100644
index 0000000..c3f2e79
--- /dev/null
+++ b/src/test/resources/vehicleTestData.xml
@@ -0,0 +1,10 @@
+<dataset>
+  <VehicleVersion id="10" name="RTW-1" constructionType="HOCHDACH" type="RTW" hasNEF="true"/>
+  <VehicleVersion id="20" name="KTW-2" constructionType="MITTELHOCHDACH" type="KTW" hasNEF="false"/>
+  <VehicleVersion id="30" name="NEF-3" constructionType="NORMAL" type="NEF" hasNEF="false"/>
+
+
+  <Vehicle id="1" version="10" status="ABGEMELDET"/>
+  <Vehicle id="2" version="20" status="FREI_WACHE"/>
+  <Vehicle id="3" version="30" status="FREI_FUNK"/>
+</dataset>
\ No newline at end of file
diff --git a/src/test/resources/vehicleTestUpdateExpectedData.xml b/src/test/resources/vehicleTestUpdateExpectedData.xml
new file mode 100644
index 0000000..861880b
--- /dev/null
+++ b/src/test/resources/vehicleTestUpdateExpectedData.xml
@@ -0,0 +1,10 @@
+<dataset>
+  <VehicleVersion id="10" name="RTW-1" constructionType="HOCHDACH" type="RTW" hasNEF="true"/>
+  <VehicleVersion id="20" name="KTW-2" constructionType="MITTELHOCHDACH" type="KTW" hasNEF="false"/>
+  <VehicleVersion id="30" name="NEF-3" constructionType="NORMAL" type="NEF" hasNEF="false"/>
+  <VehicleVersion id="40" name="RTW-4" constructionType="HOCHDACH" type="RTW" hasNEF="true"/>
+
+  <Vehicle id="1" version="10" status="ABGEMELDET"/>
+  <Vehicle id="2" version="40" status="ABGEMELDET"/>
+  <Vehicle id="3" version="30" status="FREI_FUNK"/>
+</dataset>
\ No newline at end of file