Dark-Alex-17/ptp
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PAN-15 Updated tests

Browse Source
This commit is contained in:
dantanxiaotian
2019-03-10 17:03:50 -06:00
parent ba37ffeb57
commit 238908f4fa
3 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/src/integrationTest/java/edu/msudenver/tsp/services/UserServiceIntegrationTest.java
+4 -5
View File
@@ -1,7 +1,6 @@
package edu.msudenver.tsp.services; package edu.msudenver.tsp.services;
import edu.msudenver.tsp.services.dto.Account; import edu.msudenver.tsp.services.dto.Account;
import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +13,7 @@ import java.text.ParseException;
import java.util.Date; import java.util.Date;
import java.util.Optional; import java.util.Optional;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.*;
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = ServicesTestConfig.class) @ContextConfiguration(classes = ServicesTestConfig.class)
@@ -36,8 +35,8 @@ public class UserServiceIntegrationTest {
assertTrue(testCreatedAccount.isPresent()); assertTrue(testCreatedAccount.isPresent());
final Account returnedAccount = testCreatedAccount.get(); final Account returnedAccount = testCreatedAccount.get();
Assert.assertEquals("test user", returnedAccount.getUsername()); assertEquals("test user", returnedAccount.getUsername());
Assert.assertEquals("test password", returnedAccount.getPassword()); assertEquals("test password", returnedAccount.getPassword());
Assert.assertEquals(false, returnedAccount.isAdministratorStatus()); assertFalse(returnedAccount.isAdministratorStatus());
} }
} }
services/src/main/java/edu/msudenver/tsp/services/dto/Account.java
+2
View File
@@ -2,6 +2,7 @@ package edu.msudenver.tsp.services.dto;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.Temporal; import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
@@ -11,6 +12,7 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
@Data @Data
@EqualsAndHashCode(callSuper = true)
public class Account extends BaseDto implements Serializable { public class Account extends BaseDto implements Serializable {
@Size(max = 50) private String username; @Size(max = 50) private String username;
@Size(max = 256) private String password; @Size(max = 256) private String password;
services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java
+8 -15
View File
@@ -1,9 +1,8 @@
package edu.msudenver.tsp.services.parser; package edu.msudenver.tsp.services.parser;
import edu.msudenver.tsp.persistence.controller.DefinitionController;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.InjectMocks; import org.mockito.Spy;
import org.mockito.runners.MockitoJUnitRunner; import org.mockito.runners.MockitoJUnitRunner;
import java.util.ArrayList; import java.util.ArrayList;
@@ -12,18 +11,12 @@ import java.util.List;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class) @RunWith(MockitoJUnitRunner.class)
public class ParserServiceTest { public class ParserServiceTest {
private final DefinitionController definitionControllerMock = mock(DefinitionController.class); @Spy private ParserService parserService;
private final ParserService mockParserService = mock(ParserService.class);
@InjectMocks
private final ParserService parserService = new ParserService(definitionControllerMock, null,
null, null);
@Test @Test
public void testEmptyStringEqualsEmptyString() { public void testEmptyStringEqualsEmptyString() {
@@ -106,8 +99,8 @@ public class ParserServiceTest {
final List<String> expectedList = new ArrayList<>(); final List<String> expectedList = new ArrayList<>();
expectedList.add(""); expectedList.add("");
when(mockParserService.parseRawInput(anyString())).thenReturn(new Node("", null)); when(parserService.parseRawInput(anyString())).thenReturn(new Node("", null));
final List<String> actualList = parserService.retrieveStatements(mockParserService.parseRawInput("")); final List<String> actualList = parserService.retrieveStatements(parserService.parseRawInput(""));
assertEquals(expectedList, actualList); assertEquals(expectedList, actualList);
} }
@@ -124,8 +117,8 @@ public class ParserServiceTest {
testNode.setRight(new Node("then", testNode)); testNode.setRight(new Node("then", testNode));
testNode.getRight().setCenter(new Node(" x^2 is even", testNode.getRight())); testNode.getRight().setCenter(new Node(" x^2 is even", testNode.getRight()));
when(mockParserService.parseRawInput(anyString())).thenReturn(testNode); when(parserService.parseRawInput(anyString())).thenReturn(testNode);
final List<String> actualList = parserService.retrieveStatements(mockParserService.parseRawInput("baseCase")); final List<String> actualList = parserService.retrieveStatements(parserService.parseRawInput("baseCase"));
assertEquals(expectedList, actualList); assertEquals(expectedList, actualList);
} }
@@ -133,8 +126,8 @@ public class ParserServiceTest {
@Test @Test
public void testDriveParseUserInput() { public void testDriveParseUserInput() {
final Node testNode = new Node("", null); final Node testNode = new Node("", null);
when(mockParserService.parseRawInput(anyString())).thenReturn(testNode); when(parserService.parseRawInput(anyString())).thenReturn(testNode);
when(mockParserService.retrieveStatements(testNode)).thenReturn(new ArrayList<>()); when(parserService.retrieveStatements(testNode)).thenReturn(new ArrayList<>());
final boolean successfulTestDrive = parserService.parseUserInput(""); final boolean successfulTestDrive = parserService.parseUserInput("");