2 files changed, 28 insertions, 43 deletions
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/GuiTestApplication.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/GuiTestApplication.java
index 6cb91c9..cec2da0 100644
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/GuiTestApplication.java
+++ b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/GuiTestApplication.java
@@ -33,6 +33,34 @@ public class GuiTestApplication extends Application {
 
     public static AnnotationConfigApplicationContext context;
 
+    @Configuration
+    public static class ContextConfiguration {
+
+        @Bean
+        @Primary
+        public EmployeeService employeeService() {
+            return mock(EmployeeServiceImpl.class);
+        }
+
+        @Bean
+        @Primary
+        public VehicleService vehicleService() {
+            return mock(VehicleServiceImpl.class);
+        }
+
+        @Bean
+        @Primary
+        public OperationService operationService() {
+            return mock(OperationServiceImpl.class);
+        }
+
+        @Bean
+        @Primary
+        public RegistrationService registrationService() {
+            return mock(RegistrationServiceImpl.class);
+        }
+    }
+
     @Override
     public void start(Stage primaryStage) throws Exception {
         // setup application
diff --git a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/GuiTestConfiguration.java b/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/GuiTestConfiguration.java
deleted file mode 100644
index c4e4517..0000000
--- a/src/test/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/GuiTestConfiguration.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
-
-import static org.mockito.Mockito.mock;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeService;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.EmployeeServiceImpl;
-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.einsatzverwaltung.service.RegistrationService;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.RegistrationServiceImpl;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleServiceImpl;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-
-@Configuration
-public class GuiTestConfiguration {
-
-    @Bean
-    @Primary
-    public EmployeeService employeeService() {
-        return mock(EmployeeServiceImpl.class);
-    }
-
-    @Bean
-    @Primary
-    public VehicleService vehicleService() {
-        return mock(VehicleServiceImpl.class);
-    }
-
-    @Bean
-    @Primary
-    public OperationService operationService() {
-        return mock(OperationServiceImpl.class);
-    }
-
-    @Bean
-    @Primary
-    public RegistrationService registrationService() {
-        return mock(RegistrationServiceImpl.class);
-    }
-}