From 8c26cc43a277fb2662a7dad0fa728b2f8f4e041d Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Thu, 3 May 2018 23:18:07 +0200
Subject: Change occurences of PersistenceException in Service and Controllers
to ServiceExceptions
---
.../groupphase/employee/CreateNewEmployeeApplication.java | 8 +-------
.../employee/CreateNewEmployeeControllerTest.java | 13 ++++++-------
.../assignment/groupphase/employee/EmployeeServiceTest.java | 5 +++--
3 files changed, 10 insertions(+), 16 deletions(-)
(limited to 'src/test/java/at/ac/tuwien')
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeApplication.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeApplication.java
index 66c7e56..e9f4801 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeApplication.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeApplication.java
@@ -1,7 +1,6 @@
package at.ac.tuwien.sepm.assignment.groupphase.employee;
-import at.ac.tuwien.sepm.assignment.groupphase.application.MainApplication;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.util.SpringFXMLLoader;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
import java.lang.invoke.MethodHandles;
import javafx.application.Application;
import javafx.scene.Parent;
@@ -46,11 +45,6 @@ public final class CreateNewEmployeeApplication extends Application {
LOG.debug("Application startup complete");
}
- public static void main(String[] args) {
- LOG.debug("Application starting with arguments={}", (Object) args);
- Application.launch(MainApplication.class, args);
- }
-
@Override
public void stop() {
LOG.debug("Stopping application");
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeControllerTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeControllerTest.java
index 4a7477b..da8a6ac 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeControllerTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeControllerTest.java
@@ -5,7 +5,7 @@ import static org.mockito.Mockito.when;
import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeService;
import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
import at.ac.tuwien.sepm.assignment.groupphase.util.HighDpiAwareApplicationTest;
import java.util.ArrayList;
import java.util.Collections;
@@ -40,7 +40,7 @@ public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest
}
@Test
- public void testClickAddValidEmployee() throws PersistenceException, InvalidEmployeeException {
+ public void testClickAddValidEmployee() throws InvalidEmployeeException, ServiceException {
when(employeeService.add(any())).thenReturn(1L);
@@ -56,8 +56,7 @@ public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest
}
@Test
- public void testClickAddInvalidEmployee()
- throws PersistenceException, InvalidEmployeeException {
+ public void testClickAddInvalidEmployee() throws InvalidEmployeeException, ServiceException {
when(employeeService.add(any())).thenThrow(InvalidEmployeeException.class);
@@ -72,10 +71,10 @@ public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest
}
@Test
- public void testClickAddEmployeeWithPersistenceException()
- throws PersistenceException, InvalidEmployeeException {
+ public void testClickAddEmployeeWithServiceException()
+ throws InvalidEmployeeException, ServiceException {
- when(employeeService.add(any())).thenThrow(PersistenceException.class);
+ when(employeeService.add(any())).thenThrow(ServiceException.class);
clickOn("#inputName", Motion.DIRECT, MouseButton.PRIMARY);
write("Test");
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/EmployeeServiceTest.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/EmployeeServiceTest.java
index ac73c9a..47328b3 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/EmployeeServiceTest.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/EmployeeServiceTest.java
@@ -14,6 +14,7 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.Employe
import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeServiceImpl;
import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidEmployeeException;
import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
import java.time.LocalDate;
import org.junit.Assert;
import org.junit.Test;
@@ -41,7 +42,7 @@ public class EmployeeServiceTest {
try {
Assert.assertThat(employeeService.add(employee), is(1L));
- } catch (InvalidEmployeeException | PersistenceException e) {
+ } catch (InvalidEmployeeException | ServiceException e) {
fail();
}
}
@@ -60,7 +61,7 @@ public class EmployeeServiceTest {
try {
employeeService.add(employee);
- } catch (PersistenceException e) {
+ } catch (ServiceException e) {
fail();
}
}
--
cgit v1.2.3-70-g09d2