From 0bc56f57e6978cd5634e06a4c3f7c724303102e7 Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 24 Mar 2019 17:49:07 -0600 Subject: [PATCH] PAN-15 Merged with master --- build.gradle | 1 - .../msudenver/tsp/services/UserServiceIntegrationTest.java | 1 + .../java/edu/msudenver/tsp/services/UserServiceTest.java | 6 ++---- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 2dfd518..d2d9c24 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,3 @@ - buildscript { repositories { mavenCentral() 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 be372fc..88da28f 100644 --- a/services/src/integrationTest/java/edu/msudenver/tsp/services/UserServiceIntegrationTest.java +++ b/services/src/integrationTest/java/edu/msudenver/tsp/services/UserServiceIntegrationTest.java @@ -49,6 +49,7 @@ public class UserServiceIntegrationTest { assertTrue(result); } + private Account creatAccount(){ final Account testAccount = new Account(); testAccount.setUsername("test user"); diff --git a/services/src/test/java/edu/msudenver/tsp/services/UserServiceTest.java b/services/src/test/java/edu/msudenver/tsp/services/UserServiceTest.java index 1fb9dda..7f19401 100644 --- a/services/src/test/java/edu/msudenver/tsp/services/UserServiceTest.java +++ b/services/src/test/java/edu/msudenver/tsp/services/UserServiceTest.java @@ -19,10 +19,8 @@ import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class UserServiceTest { - @Mock - private RestService restService; - @InjectMocks - private UserService userService; + @Mock private RestService restService; + @InjectMocks private UserService userService; @Test public void testCreateNewAccount() throws ParseException {