From d710d6386351b4da9b5c98bf3c9573e47843d038 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Wed, 2 May 2018 18:05:21 +0200
Subject: Remove duplicate code of initializing employeeService
---
.../employee/CreateNewEmployeeControllerTest.java | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
(limited to 'src/test/java/at/ac/tuwien/sepm/assignment')
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);
--
cgit v1.2.3-70-g09d2