From 238908f4facf34e91949a9a61283e90dfe1f1a98 Mon Sep 17 00:00:00 2001 From: dantanxiaotian Date: Sun, 10 Mar 2019 17:03:50 -0600 Subject: [PATCH] PAN-15 Updated tests --- .../services/UserServiceIntegrationTest.java | 9 ++++---- .../msudenver/tsp/services/dto/Account.java | 2 ++ .../services/parser/ParserServiceTest.java | 23 +++++++------------ 3 files changed, 14 insertions(+), 20 deletions(-) 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 e434d64..c3a71d0 100644 --- a/services/src/integrationTest/java/edu/msudenver/tsp/services/UserServiceIntegrationTest.java +++ b/services/src/integrationTest/java/edu/msudenver/tsp/services/UserServiceIntegrationTest.java @@ -1,7 +1,6 @@ package edu.msudenver.tsp.services; import edu.msudenver.tsp.services.dto.Account; -import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -14,7 +13,7 @@ import java.text.ParseException; import java.util.Date; import java.util.Optional; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = ServicesTestConfig.class) @@ -36,8 +35,8 @@ public class UserServiceIntegrationTest { assertTrue(testCreatedAccount.isPresent()); final Account returnedAccount = testCreatedAccount.get(); - Assert.assertEquals("test user", returnedAccount.getUsername()); - Assert.assertEquals("test password", returnedAccount.getPassword()); - Assert.assertEquals(false, returnedAccount.isAdministratorStatus()); + assertEquals("test user", returnedAccount.getUsername()); + assertEquals("test password", returnedAccount.getPassword()); + assertFalse(returnedAccount.isAdministratorStatus()); } } diff --git a/services/src/main/java/edu/msudenver/tsp/services/dto/Account.java b/services/src/main/java/edu/msudenver/tsp/services/dto/Account.java index b7135ec..1190dd8 100644 --- a/services/src/main/java/edu/msudenver/tsp/services/dto/Account.java +++ b/services/src/main/java/edu/msudenver/tsp/services/dto/Account.java @@ -2,6 +2,7 @@ package edu.msudenver.tsp.services.dto; import com.google.gson.annotations.SerializedName; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Temporal; import javax.persistence.TemporalType; @@ -11,6 +12,7 @@ import java.io.Serializable; import java.util.Date; @Data +@EqualsAndHashCode(callSuper = true) public class Account extends BaseDto implements Serializable { @Size(max = 50) private String username; @Size(max = 256) private String password; diff --git a/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java b/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java index 829a02a..1b23d95 100644 --- a/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java +++ b/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java @@ -1,9 +1,8 @@ package edu.msudenver.tsp.services.parser; -import edu.msudenver.tsp.persistence.controller.DefinitionController; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.InjectMocks; +import org.mockito.Spy; import org.mockito.runners.MockitoJUnitRunner; import java.util.ArrayList; @@ -12,18 +11,12 @@ import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class ParserServiceTest { - private final DefinitionController definitionControllerMock = mock(DefinitionController.class); - private final ParserService mockParserService = mock(ParserService.class); - - @InjectMocks - private final ParserService parserService = new ParserService(definitionControllerMock, null, - null, null); + @Spy private ParserService parserService; @Test public void testEmptyStringEqualsEmptyString() { @@ -106,8 +99,8 @@ public class ParserServiceTest { final List expectedList = new ArrayList<>(); expectedList.add(""); - when(mockParserService.parseRawInput(anyString())).thenReturn(new Node("", null)); - final List actualList = parserService.retrieveStatements(mockParserService.parseRawInput("")); + when(parserService.parseRawInput(anyString())).thenReturn(new Node("", null)); + final List actualList = parserService.retrieveStatements(parserService.parseRawInput("")); assertEquals(expectedList, actualList); } @@ -124,8 +117,8 @@ public class ParserServiceTest { testNode.setRight(new Node("then", testNode)); testNode.getRight().setCenter(new Node(" x^2 is even", testNode.getRight())); - when(mockParserService.parseRawInput(anyString())).thenReturn(testNode); - final List actualList = parserService.retrieveStatements(mockParserService.parseRawInput("baseCase")); + when(parserService.parseRawInput(anyString())).thenReturn(testNode); + final List actualList = parserService.retrieveStatements(parserService.parseRawInput("baseCase")); assertEquals(expectedList, actualList); } @@ -133,8 +126,8 @@ public class ParserServiceTest { @Test public void testDriveParseUserInput() { final Node testNode = new Node("", null); - when(mockParserService.parseRawInput(anyString())).thenReturn(testNode); - when(mockParserService.retrieveStatements(testNode)).thenReturn(new ArrayList<>()); + when(parserService.parseRawInput(anyString())).thenReturn(testNode); + when(parserService.retrieveStatements(testNode)).thenReturn(new ArrayList<>()); final boolean successfulTestDrive = parserService.parseUserInput("");