diff options
Diffstat (limited to 'src')
2 files changed, 5 insertions, 12 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java index f640807..e88e640 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java @@ -9,7 +9,7 @@ import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException; import java.lang.invoke.MethodHandles; import java.util.EnumSet; -import java.util.List; +import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; import javafx.collections.FXCollections; @@ -162,7 +162,7 @@ public class CreateCarController { } private void vehicleListFP() { - List<Vehicle> vehicleList = null; + Set<Vehicle> vehicleList = null; fp_vehicleList.getChildren().clear(); try { vehicleList = vehicleService.list(EnumSet.range(Status.ABGEMELDET, Status.FREI_FUNK)); 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 2d92818..81ebf63 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 @@ -11,12 +11,11 @@ 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.JdbcTestCase; import java.io.InputStream; -import java.util.List; +import java.util.Set; import org.dbunit.Assertion; import org.dbunit.dataset.IDataSet; import org.dbunit.dataset.ITable; import org.dbunit.dataset.xml.FlatXmlDataSetBuilder; -import org.junit.After; import org.junit.Assert; import org.junit.Test; @@ -44,15 +43,9 @@ public class VehiclePersistenceTest extends JdbcTestCase { return new FlatXmlDataSetBuilder().build(res); } - @After - public void tearDownOperation() throws Exception { - // needed in order to completely reset DB, including resetting auto_increment sequences - getJdbcConnectionManager().getConnection().prepareStatement("DROP ALL OBJECTS").execute(); - } - @Test public void testListVehicle() throws PersistenceException { - List<Vehicle> vehicles = vehicleDAO.list(); + Set<Vehicle> vehicles = vehicleDAO.list(); Vehicle v1 = Vehicle.builder() @@ -90,7 +83,7 @@ public class VehiclePersistenceTest extends JdbcTestCase { @Test public void testVehicleListNoElement() throws PersistenceException { - List<Vehicle> vehicles = vehicleDAO.list(); + Set<Vehicle> vehicles = vehicleDAO.list(); Vehicle v1 = Vehicle.builder() |