From 160e236d8f1e92b7c59b0bb6dc3a7b5aaefe33ac Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Sat, 5 May 2018 20:02:12 +0200
Subject: Small Changes
---
.../groupphase/operation/OperationServiceTest.java | 155 ---------------------
.../operation/OperationServiceUnitTest.java | 155 +++++++++++++++++++++
2 files changed, 155 insertions(+), 155 deletions(-)
delete mode 100644 src/test/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationServiceTest.java
create mode 100644 src/test/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationServiceUnitTest.java
(limited to 'src/test')
diff --git a/src/test/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationServiceTest.java b/src/test/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationServiceTest.java
deleted file mode 100644
index aa89a85..0000000
--- a/src/test/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationServiceTest.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.operation;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.OperationDAO;
-import static junit.framework.TestCase.fail;
-import static org.hamcrest.CoreMatchers.is;
-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.dto.Operation;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Severity;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
-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.OperationService;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.OperationServiceImpl;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.time.Instant;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class OperationServiceTest {
- private final OperationDAO operationDAO = mock(OperationDAO.class);
- private final OperationService operationService = new OperationServiceImpl(operationDAO);
-
- @Test
- public void addOperationTest() {
- try {
- when(operationDAO.add(any())).thenReturn(1L);
- } catch (PersistenceException e) {
- fail();
- }
- Vehicle vehicle =
- Vehicle.builder()
- .status(Vehicle.Status.FREI_FUNK)
- .constructionType(ConstructionType.HOCHDACH)
- .name("BKTW_123")
- .hasNef(true)
- .type(VehicleType.BKTW)
- .build();
-
- Operation operation =
- Operation.builder()
- .status(Status.ACTIVE)
- .opCode("ALP-95E7")
- .created(Instant.now())
- .destination("Wiedner Hauptstraße 35, Wien")
- .additionalInfo("HTU Wien")
- .severity(Severity.B)
- .vehicles(List.of(vehicle))
- .build();
- try {
- Assert.assertThat(operationService.add(operation), is(1L));
- } catch (InvalidOperationException | ServiceException e) {
- fail();
- }
- }
-
- @Test(expected = InvalidOperationException.class)
- public void addFaultyOperationTest() throws InvalidOperationException {
- Vehicle vehicle =
- Vehicle.builder()
- .status(Vehicle.Status.FREI_FUNK)
- .constructionType(ConstructionType.HOCHDACH)
- .name("BKTW_123")
- .hasNef(true)
- .type(VehicleType.BKTW)
- .build();
- Vehicle vehicle1 =
- Vehicle.builder()
- .status(Vehicle.Status.ABGEMELDET)
- .constructionType(ConstructionType.HOCHDACH)
- .name("BKTW_123")
- .hasNef(true)
- .type(VehicleType.BKTW)
- .build();
-
- Operation operation =
- Operation.builder()
- .status(Status.ACTIVE)
- .opCode("ALP-95E7")
- .created(Instant.now())
- .destination("Wiedner Hauptstraße 35, Wien")
- .additionalInfo("HTU Wien")
- .severity(Severity.B)
- .vehicles(List.of(vehicle, vehicle1))
- .build();
- try {
- Assert.assertThat(operationService.add(operation), is(1L));
- } catch (ServiceException e) {
- fail();
- }
- }
-
- @Test(expected = InvalidOperationException.class)
- public void addFaultyOperation2Test() throws InvalidOperationException {
- Operation operation =
- Operation.builder()
- .status(Status.ACTIVE)
- .opCode("ALP-95E7")
- .created(Instant.now())
- .destination("Wiedner Hauptstraße 35, Wien")
- .additionalInfo("HTU Wien")
- .severity(Severity.B)
- .vehicles(List.of())
- .build();
- try {
- Assert.assertThat(operationService.add(operation), is(1L));
- } catch (ServiceException e) {
- e.printStackTrace();
- }
- }
-
- @Test(expected = InvalidOperationException.class)
- public void addFaultyOperation3Test() throws InvalidOperationException {
- Operation operation =
- Operation.builder()
- .status(Status.ACTIVE)
- .opCode("ALP-95E7")
- .created(Instant.now())
- .destination("")
- .additionalInfo("HTU Wien")
- .severity(Severity.B)
- .vehicles(List.of())
- .build();
- try {
- Assert.assertThat(operationService.add(operation), is(1L));
- } catch (ServiceException e) {
- e.printStackTrace();
- }
- }
-
- @Test(expected = InvalidOperationException.class)
- public void addFaultyOperation4Test() throws InvalidOperationException {
- Operation operation =
- Operation.builder()
- .status(Status.ACTIVE)
- .opCode("")
- .created(Instant.now())
- .destination("Römergasse 7, 2500 Baden")
- .additionalInfo("HTU Wien")
- .severity(Severity.B)
- .vehicles(List.of())
- .build();
- try {
- Assert.assertThat(operationService.add(operation), is(1L));
- } catch (ServiceException e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/src/test/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationServiceUnitTest.java b/src/test/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationServiceUnitTest.java
new file mode 100644
index 0000000..866f759
--- /dev/null
+++ b/src/test/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationServiceUnitTest.java
@@ -0,0 +1,155 @@
+package at.ac.tuwien.sepm.assignment.groupphase.operation;
+
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.OperationDAO;
+import static junit.framework.TestCase.fail;
+import static org.hamcrest.CoreMatchers.is;
+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.dto.Operation;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Severity;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
+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.OperationService;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.OperationServiceImpl;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import java.time.Instant;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class OperationServiceUnitTest {
+ private final OperationDAO operationDAO = mock(OperationDAO.class);
+ private final OperationService operationService = new OperationServiceImpl(operationDAO);
+
+ @Test
+ public void addOperationTest() {
+ try {
+ when(operationDAO.add(any())).thenReturn(1L);
+ } catch (PersistenceException e) {
+ fail();
+ }
+ Vehicle vehicle =
+ Vehicle.builder()
+ .status(Vehicle.Status.FREI_FUNK)
+ .constructionType(ConstructionType.HOCHDACH)
+ .name("BKTW_123")
+ .hasNef(true)
+ .type(VehicleType.BKTW)
+ .build();
+
+ Operation operation =
+ Operation.builder()
+ .status(Status.ACTIVE)
+ .opCode("ALP-95E7")
+ .created(Instant.now())
+ .destination("Wiedner Hauptstraße 35, Wien")
+ .additionalInfo("HTU Wien")
+ .severity(Severity.B)
+ .vehicles(List.of(vehicle))
+ .build();
+ try {
+ Assert.assertThat(operationService.add(operation), is(1L));
+ } catch (InvalidOperationException | ServiceException e) {
+ fail();
+ }
+ }
+
+ @Test(expected = InvalidOperationException.class)
+ public void addFaultyOperationTest() throws InvalidOperationException {
+ Vehicle vehicle =
+ Vehicle.builder()
+ .status(Vehicle.Status.FREI_FUNK)
+ .constructionType(ConstructionType.HOCHDACH)
+ .name("BKTW_123")
+ .hasNef(true)
+ .type(VehicleType.BKTW)
+ .build();
+ Vehicle vehicle1 =
+ Vehicle.builder()
+ .status(Vehicle.Status.ABGEMELDET)
+ .constructionType(ConstructionType.HOCHDACH)
+ .name("BKTW_123")
+ .hasNef(true)
+ .type(VehicleType.BKTW)
+ .build();
+
+ Operation operation =
+ Operation.builder()
+ .status(Status.ACTIVE)
+ .opCode("ALP-95E7")
+ .created(Instant.now())
+ .destination("Wiedner Hauptstraße 35, Wien")
+ .additionalInfo("HTU Wien")
+ .severity(Severity.B)
+ .vehicles(List.of(vehicle, vehicle1))
+ .build();
+ try {
+ Assert.assertThat(operationService.add(operation), is(1L));
+ } catch (ServiceException e) {
+ fail();
+ }
+ }
+
+ @Test(expected = InvalidOperationException.class)
+ public void addFaultyOperation2Test() throws InvalidOperationException {
+ Operation operation =
+ Operation.builder()
+ .status(Status.ACTIVE)
+ .opCode("ALP-95E7")
+ .created(Instant.now())
+ .destination("Wiedner Hauptstraße 35, Wien")
+ .additionalInfo("HTU Wien")
+ .severity(Severity.B)
+ .vehicles(List.of())
+ .build();
+ try {
+ Assert.assertThat(operationService.add(operation), is(1L));
+ } catch (ServiceException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test(expected = InvalidOperationException.class)
+ public void addFaultyOperation3Test() throws InvalidOperationException {
+ Operation operation =
+ Operation.builder()
+ .status(Status.ACTIVE)
+ .opCode("ALP-95E7")
+ .created(Instant.now())
+ .destination("")
+ .additionalInfo("HTU Wien")
+ .severity(Severity.B)
+ .vehicles(List.of())
+ .build();
+ try {
+ Assert.assertThat(operationService.add(operation), is(1L));
+ } catch (ServiceException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test(expected = InvalidOperationException.class)
+ public void addFaultyOperation4Test() throws InvalidOperationException {
+ Operation operation =
+ Operation.builder()
+ .status(Status.ACTIVE)
+ .opCode("")
+ .created(Instant.now())
+ .destination("Römergasse 7, 2500 Baden")
+ .additionalInfo("HTU Wien")
+ .severity(Severity.B)
+ .vehicles(List.of())
+ .build();
+ try {
+ Assert.assertThat(operationService.add(operation), is(1L));
+ } catch (ServiceException e) {
+ e.printStackTrace();
+ }
+ }
+}
--
cgit v1.2.3-70-g09d2