summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleAdd.java6
-rw-r--r--src/main/resources/controller/createCar.fxml (renamed from src/main/resources/controller/CreateCar.fxml)0
-rw-r--r--src/main/test/java/at/ac/tuwien/sepm/assignment/groupphase/AddCarTest.java43
-rw-r--r--src/test/java/at/ac/tuwien/sepm/assignment/groupphase/CarAddTestService.java283
4 files changed, 287 insertions, 45 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleAdd.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleAdd.java
index be52fb6..e78c6b2 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleAdd.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleAdd.java
@@ -42,17 +42,19 @@ public class VehicleAdd implements VehicleService {
case NEF:
if (vehicle.constructionType() == ConstructionType.MITTELHOCHDACH) {
throw new InvalidVehicleException("NEF darf kein Mittelhochdach haben");
- } else if (vehicle.constructionType().name().contains("Hochdach")) {
+ } else if (vehicle.constructionType() == ConstructionType.HOCHDACH) {
throw new InvalidVehicleException("NEF darf kein Hochdach haben");
}
break;
case NAH:
if (vehicle.constructionType() == ConstructionType.MITTELHOCHDACH) {
throw new InvalidVehicleException("NEF darf kein Mittelhochdach haben");
- } else if (vehicle.constructionType().name().contains("Hochdach")) {
+ } else if (vehicle.constructionType() == ConstructionType.HOCHDACH) {
throw new InvalidVehicleException("NEF darf kein Hochdach haben");
}
break;
+ case BKTW:
+ break;
default:
throw new ServiceException("not a Valid type");
}
diff --git a/src/main/resources/controller/CreateCar.fxml b/src/main/resources/controller/createCar.fxml
index 2daac67..2daac67 100644
--- a/src/main/resources/controller/CreateCar.fxml
+++ b/src/main/resources/controller/createCar.fxml
diff --git a/src/main/test/java/at/ac/tuwien/sepm/assignment/groupphase/AddCarTest.java b/src/main/test/java/at/ac/tuwien/sepm/assignment/groupphase/AddCarTest.java
deleted file mode 100644
index e7c4543..0000000
--- a/src/main/test/java/at/ac/tuwien/sepm/assignment/groupphase/AddCarTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase;
-
-import static junit.framework.TestCase.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDAO;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDBDAO;
-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.VehicleType;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleAdd;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import org.junit.Test;
-
-public class AddCarTest {
- private final VehicleDAO vehicleP = mock(VehicleDBDAO.class);
- private final VehicleService vehicleService = new VehicleAdd(vehicleP);
-
- public AddCarTest() throws PersistenceException {
- when(vehicleP.add(any())).thenReturn(1L);
- }
-
- @Test
- public void add() {
- Vehicle vehicle =
- Vehicle.builder()
- .constructionType(ConstructionType.HOCHDACH)
- .type(VehicleType.RTW)
- .hasNef(true)
- .build();
- try {
- vehicleService.add(vehicle);
- } catch (InvalidVehicleException | ServiceException e) {
- fail();
- }
- }
-
-}
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/CarAddTestService.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/CarAddTestService.java
new file mode 100644
index 0000000..2524742
--- /dev/null
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/CarAddTestService.java
@@ -0,0 +1,283 @@
+package at.ac.tuwien.sepm.assignment.groupphase;
+
+import static junit.framework.TestCase.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.VehicleDBDAO;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleAdd;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import org.junit.Test;
+
+public class CarAddTestService {
+ private final VehicleDAO vehicleP = mock(VehicleDBDAO.class);
+ private final VehicleService vehicleService = new VehicleAdd(vehicleP);
+
+ public CarAddTestService() throws PersistenceException {
+ when(vehicleP.add(any())).thenReturn(1L);
+ }
+
+ @Test
+ public void testValidVehicleH() {
+ Vehicle vehicle =
+ Vehicle.builder()
+ .constructionType(Vehicle.ConstructionType.HOCHDACH)
+ .type(Vehicle.VehicleType.RTW)
+ .hasNef(true)
+ .status(Vehicle.Status.ABGEMELDET)
+ .name("")
+ .build();
+ try {
+ vehicleService.add(vehicle);
+ } catch (InvalidVehicleException | ServiceException e) {
+ fail();
+ }
+ vehicle =
+ Vehicle.builder()
+ .constructionType(Vehicle.ConstructionType.HOCHDACH)
+ .type(Vehicle.VehicleType.KTW)
+ .hasNef(true)
+ .status(Vehicle.Status.ABGEMELDET)
+ .name("")
+ .build();
+ try {
+ vehicleService.add(vehicle);
+ } catch (InvalidVehicleException | ServiceException e) {
+ fail();
+ }
+ vehicle =
+ Vehicle.builder()
+ .constructionType(Vehicle.ConstructionType.HOCHDACH)
+ .type(Vehicle.VehicleType.KTW_B)
+ .hasNef(true)
+ .status(Vehicle.Status.ABGEMELDET)
+ .name("")
+ .build();
+ try {
+ vehicleService.add(vehicle);
+ } catch (InvalidVehicleException | ServiceException e) {
+ fail();
+ }
+ vehicle =
+ Vehicle.builder()
+ .constructionType(Vehicle.ConstructionType.HOCHDACH)
+ .type(Vehicle.VehicleType.BKTW)
+ .hasNef(true)
+ .status(Vehicle.Status.ABGEMELDET)
+ .name("")
+ .build();
+ try {
+ vehicleService.add(vehicle);
+ } catch (InvalidVehicleException | ServiceException e) {
+ fail();
+ }
+ }
+
+ @Test
+ public void testValidVehicleM() {
+ Vehicle vehicle =
+ Vehicle.builder()
+ .constructionType(Vehicle.ConstructionType.MITTELHOCHDACH)
+ .type(Vehicle.VehicleType.KTW)
+ .hasNef(true)
+ .status(Vehicle.Status.ABGEMELDET)
+ .name("")
+ .build();
+ try {
+ vehicleService.add(vehicle);
+ } catch (InvalidVehicleException | ServiceException e) {
+ fail();
+ }
+ vehicle =
+ Vehicle.builder()
+ .constructionType(Vehicle.ConstructionType.MITTELHOCHDACH)
+ .type(Vehicle.VehicleType.KTW_B)
+ .hasNef(true)
+ .status(Vehicle.Status.ABGEMELDET)
+ .name("")
+ .build();
+ try {
+ vehicleService.add(vehicle);
+ } catch (InvalidVehicleException | ServiceException e) {
+ fail();
+ }
+ vehicle =
+ Vehicle.builder()
+ .constructionType(Vehicle.ConstructionType.MITTELHOCHDACH)
+ .type(Vehicle.VehicleType.BKTW)
+ .hasNef(true)
+ .status(Vehicle.Status.ABGEMELDET)
+ .name("")
+ .build();
+ try {
+ vehicleService.add(vehicle);
+ } catch (InvalidVehicleException | ServiceException e) {
+ fail();
+ }
+ }
+
+ @Test
+ public void testValidVehicleN() {
+ Vehicle vehicle =
+ Vehicle.builder()
+ .constructionType(Vehicle.ConstructionType.NORMAL)
+ .type(Vehicle.VehicleType.BKTW)
+ .hasNef(true)
+ .status(Vehicle.Status.ABGEMELDET)
+ .name("")
+ .build();
+ try {
+ vehicleService.add(vehicle);
+ } catch (InvalidVehicleException | ServiceException e) {
+ fail();
+ }
+ vehicle =
+ Vehicle.builder()
+ .constructionType(Vehicle.ConstructionType.NORMAL)
+ .type(Vehicle.VehicleType.NEF)
+ .hasNef(true)
+ .status(Vehicle.Status.ABGEMELDET)
+ .name("")
+ .build();
+ try {
+ vehicleService.add(vehicle);
+ } catch (InvalidVehicleException | ServiceException e) {
+ fail();
+ }
+ vehicle =
+ Vehicle.builder()
+ .constructionType(Vehicle.ConstructionType.NORMAL)
+ .type(Vehicle.VehicleType.NAH)
+ .hasNef(true)
+ .status(Vehicle.Status.ABGEMELDET)
+ .name("")
+ .build();
+ try {
+ vehicleService.add(vehicle);
+ } catch (InvalidVehicleException | ServiceException e) {
+ fail();
+ }
+ }
+
+ @Test(expected = InvalidVehicleException.class)
+ public void testInvalidVehicleH() throws InvalidVehicleException {
+ Vehicle vehicle =
+ Vehicle.builder()
+ .constructionType(Vehicle.ConstructionType.HOCHDACH)
+ .type(Vehicle.VehicleType.NEF)
+ .hasNef(true)
+ .status(Vehicle.Status.ABGEMELDET)
+ .name("")
+ .build();
+ try {
+ vehicleService.add(vehicle);
+ } catch (ServiceException e) {
+ fail();
+ }
+ vehicle =
+ Vehicle.builder()
+ .constructionType(Vehicle.ConstructionType.HOCHDACH)
+ .type(Vehicle.VehicleType.NAH)
+ .hasNef(true)
+ .status(Vehicle.Status.ABGEMELDET)
+ .name("")
+ .build();
+ try {
+ vehicleService.add(vehicle);
+ } catch (ServiceException e) {
+ fail();
+ }
+ }
+
+ @Test(expected = InvalidVehicleException.class)
+ public void testInvalidVehicleM() throws InvalidVehicleException {
+ Vehicle vehicle =
+ Vehicle.builder()
+ .constructionType(Vehicle.ConstructionType.MITTELHOCHDACH)
+ .type(Vehicle.VehicleType.NEF)
+ .hasNef(true)
+ .status(Vehicle.Status.ABGEMELDET)
+ .name("")
+ .build();
+ try {
+ vehicleService.add(vehicle);
+ } catch (ServiceException e) {
+ fail();
+ }
+ vehicle =
+ Vehicle.builder()
+ .constructionType(Vehicle.ConstructionType.MITTELHOCHDACH)
+ .type(Vehicle.VehicleType.NAH)
+ .hasNef(true)
+ .status(Vehicle.Status.ABGEMELDET)
+ .name("")
+ .build();
+ try {
+ vehicleService.add(vehicle);
+ } catch (ServiceException e) {
+ fail();
+ }
+ vehicle =
+ Vehicle.builder()
+ .constructionType(Vehicle.ConstructionType.MITTELHOCHDACH)
+ .type(Vehicle.VehicleType.RTW)
+ .hasNef(true)
+ .status(Vehicle.Status.ABGEMELDET)
+ .name("")
+ .build();
+ try {
+ vehicleService.add(vehicle);
+ } catch (ServiceException e) {
+ fail();
+ }
+ }
+
+ @Test(expected = InvalidVehicleException.class)
+ public void testInvalidVehicleN() throws InvalidVehicleException {
+ Vehicle vehicle =
+ Vehicle.builder()
+ .constructionType(Vehicle.ConstructionType.NORMAL)
+ .type(Vehicle.VehicleType.RTW)
+ .hasNef(true)
+ .status(Vehicle.Status.ABGEMELDET)
+ .name("")
+ .build();
+ try {
+ vehicleService.add(vehicle);
+ } catch (ServiceException e) {
+ fail();
+ }
+ vehicle =
+ Vehicle.builder()
+ .constructionType(Vehicle.ConstructionType.NORMAL)
+ .type(Vehicle.VehicleType.KTW_B)
+ .hasNef(true)
+ .status(Vehicle.Status.ABGEMELDET)
+ .name("")
+ .build();
+ try {
+ vehicleService.add(vehicle);
+ } catch (ServiceException e) {
+ fail();
+ }
+ vehicle =
+ Vehicle.builder()
+ .constructionType(Vehicle.ConstructionType.NORMAL)
+ .type(Vehicle.VehicleType.KTW)
+ .hasNef(true)
+ .status(Vehicle.Status.ABGEMELDET)
+ .name("")
+ .build();
+ try {
+ vehicleService.add(vehicle);
+ } catch (ServiceException e) {
+ fail();
+ }
+ }
+}
generated by cgit v1.2.3-70-g09d2 (git 2.51.2) at 2025-11-04 09:35:08 +0000