1 files changed, 35 insertions, 26 deletions

diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/VehiclePersistenceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/VehiclePersistenceTest.java
index 32053a8..2d92818 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/VehiclePersistenceTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/vehicle/VehiclePersistenceTest.java
@@ -6,24 +6,16 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.ConstructionType;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Status;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.VehicleType;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
 import at.ac.tuwien.sepm.assignment.groupphase.util.Helper;
-import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
 import at.ac.tuwien.sepm.assignment.groupphase.util.JdbcTestCase;
 import java.io.InputStream;
-import java.sql.Types;
 import java.util.List;
 import org.dbunit.Assertion;
-import org.dbunit.DBTestCase;
-import org.dbunit.PropertiesBasedJdbcDatabaseTester;
-import org.dbunit.database.DatabaseConfig;
 import org.dbunit.dataset.IDataSet;
 import org.dbunit.dataset.ITable;
-import org.dbunit.dataset.datatype.DataType;
-import org.dbunit.dataset.datatype.DataTypeException;
 import org.dbunit.dataset.xml.FlatXmlDataSetBuilder;
-import org.dbunit.ext.postgresql.PostgresqlDataTypeFactory;
-import org.dbunit.util.fileloader.FlatXmlDataFileLoader;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
@@ -32,18 +24,19 @@ public class VehiclePersistenceTest extends JdbcTestCase {
 
     private VehicleDAO vehicleDAO;
 
-    private Vehicle validUpdateVehicle = Vehicle.builder()
-            .hasNef(true)
-            .constructionType(ConstructionType.HOCHDACH)
-            .type(VehicleType.RTW)
-            .id(4)
-            .name("RTW-4")
-            .status(Status.ABGEMELDET)
-            .build();
-
-    public VehiclePersistenceTest(){
+    private Vehicle validUpdateVehicle =
+            Vehicle.builder()
+                    .hasNef(true)
+                    .constructionType(ConstructionType.HOCHDACH)
+                    .type(VehicleType.RTW)
+                    .id(2)
+                    .name("RTW-2")
+                    .status(Status.ABGEMELDET)
+                    .build();
+
+    public VehiclePersistenceTest() {
         vehicleDAO = new VehicleDatabaseDao(getJdbcConnectionManager());
-        }
+    }
 
     @Override
     protected IDataSet getDataSet() throws Exception {
@@ -113,15 +106,15 @@ public class VehiclePersistenceTest extends JdbcTestCase {
     }
 
     @Test
-    public void testUpdateValid_VehicleVersion()throws Exception{
+    public void testUpdateValid_VehicleVersion() throws Exception {
         vehicleDAO.update(validUpdateVehicle);
 
-        String[] excludedColumnsVehicleVersion = new String[]{"ID", "NAME"};
+        String[] excludedColumnsVehicleVersion = new String[] {"ID", "NAME"};
         String tableVehicleVersion = "VEHICLEVERSION";
 
         ITable actualTableData =
                 Helper.getActualFilteredTableData(
-                        getConnection(),tableVehicleVersion,excludedColumnsVehicleVersion);
+                        getConnection(), tableVehicleVersion, excludedColumnsVehicleVersion);
 
         ITable expectedTableData =
                 Helper.getExpectedFilteredTableData(
@@ -130,16 +123,17 @@ public class VehiclePersistenceTest extends JdbcTestCase {
                         "vehicleTestUpdateExpectedData.xml");
         Assertion.assertEquals(expectedTableData, actualTableData);
     }
+
     @Test
-    public void testUpdateValid_Vehicle()throws Exception{
+    public void testUpdateValid_Vehicle() throws Exception {
         vehicleDAO.update(validUpdateVehicle);
 
-        String[] excludedColumnsVehicleVersion = new String[]{"VERSION","STATUS"};
+        String[] excludedColumnsVehicleVersion = new String[] {"VERSION", "STATUS"};
         String tableVehicleVersion = "VEHICLE";
 
         ITable actualTableData =
                 Helper.getActualFilteredTableData(
-                        getConnection(),tableVehicleVersion,excludedColumnsVehicleVersion);
+                        getConnection(), tableVehicleVersion, excludedColumnsVehicleVersion);
 
         ITable expectedTableData =
                 Helper.getExpectedFilteredTableData(
@@ -148,4 +142,19 @@ public class VehiclePersistenceTest extends JdbcTestCase {
                         "vehicleTestUpdateExpectedData.xml");
         Assertion.assertEquals(expectedTableData, actualTableData);
     }
+
+    @Test(expected = ElementNotFoundException.class)
+    public void testUpdateNonExistingVehicle()
+            throws PersistenceException, ElementNotFoundException {
+        Vehicle nonExistentVehicle =
+                Vehicle.builder()
+                        .id(35)
+                        .constructionType(ConstructionType.NORMAL)
+                        .name("NEF-3")
+                        .hasNef(false)
+                        .status(Status.FREI_FUNK)
+                        .type(VehicleType.NEF)
+                        .build();
+        vehicleDAO.update(nonExistentVehicle);
+    }
 }