diff options
| author | Dominic Rogetzer <e1627756@student.tuwien.ac.at> | 2018-05-02 18:05:21 +0200 |
|---|---|---|
| committer | Dominic Rogetzer <e01627756@student.tuwien.ac.at> | 2018-05-03 22:48:31 +0200 |
| commit | d710d6386351b4da9b5c98bf3c9573e47843d038 (patch) | |
| tree | ff052dfcadb8290840fde70650cca9edfddc3c78 /src/test/java/at/ac | |
| parent | 89447f9858f8af41ba792e19bbdf603d670cf26e (diff) | |
| download | sepm-groupproject-d710d6386351b4da9b5c98bf3c9573e47843d038.tar.gz sepm-groupproject-d710d6386351b4da9b5c98bf3c9573e47843d038.tar.xz sepm-groupproject-d710d6386351b4da9b5c98bf3c9573e47843d038.zip | |
Remove duplicate code of initializing employeeService
Diffstat (limited to 'src/test/java/at/ac')
| -rw-r--r-- | src/test/java/at/ac/tuwien/sepm/assignment/groupphase/employee/CreateNewEmployeeControllerTest.java | 21 |
1 files changed, 5 insertions, 16 deletions
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 53dc215..4a7477b 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 @@ -3,10 +3,10 @@ package at.ac.tuwien.sepm.assignment.groupphase.employee; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; -import at.ac.tuwien.sepm.assignment.groupphase.util.HighDpiAwareApplicationTest; 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.util.HighDpiAwareApplicationTest; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -24,19 +24,14 @@ import org.testfx.robot.Motion; public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest { + private EmployeeService employeeService; + @Before public void setup() throws Exception { - /*System.setProperty("testfx.robot", "glass"); - System.setProperty("testfx.headless", "true"); - System.setProperty("prism.order", "sw"); - System.setProperty("prism.text", "t2k"); - System.setProperty("java.awt.headless", "true");*/ - - // ATTENTION: testfx seems to not support high dpi monitors! // TODO: check if testfx can be run in headless mode on Jenkins - FxToolkit.registerPrimaryStage(); - FxToolkit.setupApplication(CreateNewEmployeeApplicationTest.class); + FxToolkit.setupApplication(CreateNewEmployeeApplication.class); + employeeService = CreateNewEmployeeApplication.context.getBean(EmployeeService.class); } @After @@ -47,8 +42,6 @@ public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest @Test public void testClickAddValidEmployee() throws PersistenceException, InvalidEmployeeException { - EmployeeService employeeService = - CreateNewEmployeeApplicationTest.context.getBean(EmployeeService.class); when(employeeService.add(any())).thenReturn(1L); clickOn("#inputName", Motion.DIRECT, MouseButton.PRIMARY); @@ -66,8 +59,6 @@ public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest public void testClickAddInvalidEmployee() throws PersistenceException, InvalidEmployeeException { - EmployeeService employeeService = - CreateNewEmployeeApplicationTest.context.getBean(EmployeeService.class); when(employeeService.add(any())).thenThrow(InvalidEmployeeException.class); moveTo("#inputName"); @@ -84,8 +75,6 @@ public class CreateNewEmployeeControllerTest extends HighDpiAwareApplicationTest public void testClickAddEmployeeWithPersistenceException() throws PersistenceException, InvalidEmployeeException { - EmployeeService employeeService = - CreateNewEmployeeApplicationTest.context.getBean(EmployeeService.class); when(employeeService.add(any())).thenThrow(PersistenceException.class); clickOn("#inputName", Motion.DIRECT, MouseButton.PRIMARY); |