From c75b243df89e6ce2567ffce44f0079929f235f4a Mon Sep 17 00:00:00 2001
From: atusa17 <alex.j.tusa@gmail.com>
Date: Sun, 7 Apr 2019 16:51:36 -0600
Subject: [PATCH] PAN-11 Fixed integration tests

---
 .../DefinitionServiceIntegrationTest.java       |  2 +-
 .../tsp/services/ServiceTestConfig.java         | 17 -----------------
 .../tsp/services/ServicesTestConfig.java        |  6 ++++++
 .../services/UserServiceIntegrationTest.java    |  2 +-
 4 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 services/src/integrationTest/java/edu/msudenver/tsp/services/ServiceTestConfig.java

diff --git a/services/src/integrationTest/java/edu/msudenver/tsp/services/DefinitionServiceIntegrationTest.java b/services/src/integrationTest/java/edu/msudenver/tsp/services/DefinitionServiceIntegrationTest.java
index a8a137f..5bd042d 100644
--- a/services/src/integrationTest/java/edu/msudenver/tsp/services/DefinitionServiceIntegrationTest.java
+++ b/services/src/integrationTest/java/edu/msudenver/tsp/services/DefinitionServiceIntegrationTest.java
@@ -18,7 +18,7 @@ import static org.junit.Assert.*;
 import static org.mockito.AdditionalMatchers.not;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = ServiceTestConfig.class)
+@ContextConfiguration(classes = ServicesTestConfig.class)
 @TestPropertySource(locations = "classpath:test.properties")
 public class DefinitionServiceIntegrationTest {
     @Autowired private DefinitionService definitionService;
diff --git a/services/src/integrationTest/java/edu/msudenver/tsp/services/ServiceTestConfig.java b/services/src/integrationTest/java/edu/msudenver/tsp/services/ServiceTestConfig.java
deleted file mode 100644
index 1d9d54e..0000000
--- a/services/src/integrationTest/java/edu/msudenver/tsp/services/ServiceTestConfig.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package edu.msudenver.tsp.services;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ComponentScan
-public class ServiceTestConfig {
-
-    @Bean
-    @Autowired
-    public DefinitionService definitionService(final RestService restService) {
-        return new DefinitionService(restService);
-    }
-}
diff --git a/services/src/integrationTest/java/edu/msudenver/tsp/services/ServicesTestConfig.java b/services/src/integrationTest/java/edu/msudenver/tsp/services/ServicesTestConfig.java
index 4c9e2b4..40fd162 100644
--- a/services/src/integrationTest/java/edu/msudenver/tsp/services/ServicesTestConfig.java
+++ b/services/src/integrationTest/java/edu/msudenver/tsp/services/ServicesTestConfig.java
@@ -14,4 +14,10 @@ public class ServicesTestConfig {
     public UserService userService(final RestService restService) {
         return new UserService(restService);
     }
+
+    @Bean
+    @Autowired
+    public DefinitionService definitionService(final RestService restService) {
+        return new DefinitionService(restService);
+    }
 }
diff --git a/services/src/integrationTest/java/edu/msudenver/tsp/services/UserServiceIntegrationTest.java b/services/src/integrationTest/java/edu/msudenver/tsp/services/UserServiceIntegrationTest.java
index bb7a4e8..64fd7ad 100644
--- a/services/src/integrationTest/java/edu/msudenver/tsp/services/UserServiceIntegrationTest.java
+++ b/services/src/integrationTest/java/edu/msudenver/tsp/services/UserServiceIntegrationTest.java
@@ -23,7 +23,7 @@ public class UserServiceIntegrationTest {
     private UserService userService;
 
     @Test
-    public void testUserService(){
+    public void testCRUD() {
         final Account testAccount = createAccount();
 
         final Optional<Account> testCreatedAccount = userService.createAccount(testAccount);