Merge pull request #80 from TAMULib/sprint6-staging-test-improvements

Sprint6 staging test improvements

Author: jcreel

src/test/java/edu/tamu/app/controller/FeatureProposalControllerTest.java

@@ -1,7 +1,9 @@
 package edu.tamu.app.controller;
 
+import static edu.tamu.weaver.response.ApiStatus.INVALID;
 import static edu.tamu.weaver.response.ApiStatus.SUCCESS;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.when;
@@ -102,7 +104,7 @@ public void setup() throws UserNotFoundException {
         when(featureProposalRepo.create(any(FeatureProposal.class), any(Credentials.class))).thenReturn(TEST_FEATURE_PROPOSAL1);
         when(featureProposalRepo.create(any(Idea.class))).thenReturn(TEST_FEATURE_PROPOSAL1);
         when(featureProposalRepo.update(any(FeatureProposal.class))).thenReturn(TEST_MODIFIED_FEATURE_PROPOSAL);
-        when(featureProposalRepo.reject(TEST_FEATURE_PROPOSAL1)).thenReturn(rejectedFeatureProposal);
+        when(featureProposalRepo.reject(featureProposalWithFeedback)).thenReturn(rejectedFeatureProposal);
         when(serviceRepo.findOne(any(Long.class))).thenReturn(TEST_SERVICE);
         doNothing().when(featureProposalRepo).delete(any(FeatureProposal.class));
         doNothing().when(featureProposalRepo).delete(any(FeatureProposal.class));
@@ -156,6 +158,12 @@ public void testReject() {
         FeatureProposal featureProposal = (FeatureProposal) response.getPayload().get("FeatureProposal");
         assertEquals("State was not set to Rejected", rejectedFeatureProposal.getState(), featureProposal.getState());
     }
+    
+    @Test
+    public void testInvalidReject() {
+        response = featureProposalController.reject(TEST_FEATURE_PROPOSAL1);
+        assertEquals("Ffeature proposal without feedback was not rejected", INVALID, response.getMeta().getStatus());
+    }
 
     @Test
     public void testRemove() {

src/test/java/edu/tamu/app/controller/IdeaControllerTest.java

@@ -35,6 +35,8 @@
 import edu.tamu.app.model.repo.UserRepo;
 import edu.tamu.app.model.repo.specification.IdeaSpecification;
 import edu.tamu.app.model.request.FilteredPageRequest;
+import edu.tamu.app.model.request.IssueRequest;
+import edu.tamu.app.service.ProjectService;
 import edu.tamu.weaver.auth.model.Credentials;
 import edu.tamu.weaver.response.ApiResponse;
 
@@ -44,6 +46,15 @@ public class IdeaControllerTest {
     private static User TEST_USER1 = new User("123456789");
     private static User TEST_USER2 = new User("987654321");
 
+    private static final Credentials TEST_CREDENTIALS_1 = new Credentials();
+    static {
+        TEST_CREDENTIALS_1.setUin("123456789");
+        TEST_CREDENTIALS_1.setEmail("aggieJack@tamu.edu");
+        TEST_CREDENTIALS_1.setFirstName("Aggie");
+        TEST_CREDENTIALS_1.setLastName("Jack");
+        TEST_CREDENTIALS_1.setRole("ROLE_USER");
+    }
+
     private static final String TEST_IDEA_TITLE1 = "Test Idea Title 1";
     private static final String TEST_IDEA_TITLE2 = "Test Idea Title 2";
     private static final String TEST_IDEA_TITLE3 = "Test Idea Title 3";
@@ -56,14 +67,15 @@ public class IdeaControllerTest {
     private static final String TEST_FEEDBACK = "Test Rejection Feedback";
 
     private static Service TEST_SERVICE = new Service(TEST_SERVICE_NAME, Status.UP, false, true, true, "", "");
-    private static Idea TEST_IDEA1 = new Idea(TEST_IDEA_TITLE1, TEST_IDEA_DESCRIPTION1, TEST_USER1);
+    private static Idea TEST_IDEA1 = new Idea(TEST_IDEA_TITLE1, TEST_IDEA_DESCRIPTION1, TEST_USER1, TEST_SERVICE);
     private static Idea TEST_IDEA2 = new Idea(TEST_IDEA_TITLE2, TEST_IDEA_DESCRIPTION2, TEST_USER1);
     private static Idea TEST_IDEA3 = new Idea(TEST_IDEA_TITLE3, TEST_IDEA_DESCRIPTION3, TEST_USER1);
     private static Idea TEST_MODIFIED_IDEA = new Idea(TEST_MODIFIED_IDEA_TITLE, TEST_MODIFIED_IDEA_DESCRIPTION, TEST_USER2, TEST_SERVICE);
     private static Idea ideaWithFeedback = new Idea(TEST_IDEA_TITLE1, TEST_IDEA_DESCRIPTION1, TEST_USER1);
     private Idea rejectedIdea = new Idea(TEST_IDEA_TITLE1, TEST_IDEA_DESCRIPTION1, TEST_USER1);
     private static List<Idea> mockIdeaList = new ArrayList<Idea>(Arrays.asList(new Idea[] { TEST_IDEA1, TEST_IDEA2, TEST_IDEA3 }));
     private static Page<Idea> mockPageableIdeaList = new PageImpl<Idea>(Arrays.asList(new Idea[] { TEST_IDEA1, TEST_IDEA2, TEST_IDEA3 }));
+    private static IssueRequest TEST_ISSUE_REQUEST = new IssueRequest(TEST_IDEA1, TEST_CREDENTIALS_1);
 
     private static User user = new User("123456789");
 
@@ -78,6 +90,9 @@ public class IdeaControllerTest {
     @Mock
     private ServiceRepo serviceRepo;
 
+    @Mock
+    private ProjectService projectService;
+
     @Mock
     private SimpMessagingTemplate simpMessagingTemplate;
 
@@ -102,6 +117,7 @@ public void setup() throws UserNotFoundException {
         when(ideaRepo.update(any(Idea.class))).thenReturn(TEST_MODIFIED_IDEA);
         when(ideaRepo.reject(TEST_IDEA1)).thenReturn(rejectedIdea);
         when(serviceRepo.findOne(any(Long.class))).thenReturn(TEST_SERVICE);
+        when(projectService.submitIssueRequest(any(IssueRequest.class))).thenReturn(new ApiResponse(SUCCESS, TEST_ISSUE_REQUEST));
         doNothing().when(ideaRepo).delete(any(Idea.class));
         doNothing().when(ideaRepo).delete(any(Idea.class));
     }
@@ -153,7 +169,14 @@ public void testInvalidReject() {
         response = ideaController.reject(TEST_IDEA1);
         assertEquals("Idea without feedback was successfull", INVALID, response.getMeta().getStatus());
     }
-    
+
+    @Test
+    public void testHelpdesk() {
+        when(ideaRepo.update(any(Idea.class))).thenReturn(TEST_IDEA1);
+        response = ideaController.helpdesk(TEST_IDEA1, credentials);
+        assertEquals("Request was not successfull", SUCCESS, response.getMeta().getStatus());
+    }
+
     @Test
     public void testRemove() {
         response = ideaController.remove(TEST_MODIFIED_IDEA);

src/test/java/edu/tamu/app/controller/ProjectControllerTest.java

@@ -27,6 +27,8 @@
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import edu.tamu.app.exception.UserNotFoundException;
+import edu.tamu.app.model.FeatureProposal;
 import edu.tamu.app.model.response.Project;
 import edu.tamu.app.service.ProjectService;
 import edu.tamu.weaver.response.ApiResponse;
@@ -35,6 +37,9 @@
 @RunWith(SpringRunner.class)
 public class ProjectControllerTest {
 
+    private static String TEST_FEATURE_PROPOSAL_NAME = "Test FP name";
+    private static String TEST_FEATURE_PROPOSAL_DESCRIPTION = "Test FP name";
+    private static FeatureProposal TEST_FEATURE_PROPOSAL = new FeatureProposal(TEST_FEATURE_PROPOSAL_NAME, TEST_FEATURE_PROPOSAL_DESCRIPTION);
     private static List<Project> projects = new ArrayList<Project>();
 
     @Value("classpath:mock/projects.json")
@@ -52,9 +57,11 @@ public class ProjectControllerTest {
     @Before
     public void setup() throws JsonParseException, JsonMappingException, IOException {
         MockitoAnnotations.initMocks(this);
-        projects = objectMapper.readValue(resource.getFile(), new TypeReference<List<Project>>() {});
+        projects = objectMapper.readValue(resource.getFile(), new TypeReference<List<Project>>() {
+        });
         when(projectService.getAll()).thenReturn(new ApiResponse(SUCCESS, projects));
         when(projectService.getById(any(Long.class))).thenReturn(new ApiResponse(SUCCESS, projects.get(0)));
+        when(projectService.submitFeatureRequest(any(FeatureProposal.class))).thenReturn(new ApiResponse(SUCCESS, TEST_FEATURE_PROPOSAL));
     }
 
     @Test
@@ -81,4 +88,10 @@ public void getById() throws JsonParseException, JsonMappingException, Malformed
         assertEquals("Project did not have the correct name!", projects.get(0).getName(), project.getName());
     }
 
+    @Test
+    public void testSubmitFeatureRequest() throws UserNotFoundException {
+        ApiResponse response = projectController.submitFeatureRequest(TEST_FEATURE_PROPOSAL);
+        assertEquals("Request was not successfull", SUCCESS, response.getMeta().getStatus());
+    }
+
 }

src/test/java/edu/tamu/app/controller/StatusControllerTest.java

@@ -0,0 +1,54 @@
+package edu.tamu.app.controller;
+
+import static edu.tamu.weaver.response.ApiStatus.SUCCESS;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import edu.tamu.app.enums.OverallMessageType;
+import edu.tamu.app.model.OverallStatus;
+import edu.tamu.app.service.MonitorService;
+import edu.tamu.weaver.response.ApiResponse;
+
+@RunWith(SpringRunner.class)
+public class StatusControllerTest {
+
+    private static final String TEST_OVERALL_STATUS_MESSAGE = "Test message";
+    private static final OverallMessageType TEST_STATUS = OverallMessageType.SUCCESS;
+
+    private static OverallStatus TEST_OVERALL_STATUS = new OverallStatus(TEST_STATUS, TEST_OVERALL_STATUS_MESSAGE);
+
+    private ApiResponse response;
+
+    @Mock
+    private MonitorService monitorService;
+
+    @InjectMocks
+    private StatusController statusController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        when(monitorService.getOverallStatus()).thenReturn(TEST_OVERALL_STATUS);
+        when(monitorService.getOverallStatusPublic()).thenReturn(TEST_OVERALL_STATUS);
+    }
+
+    @Test
+    public void testOverallFull() {
+        response = statusController.overallFull();
+        assertEquals("Response was not successfull", SUCCESS, response.getMeta().getStatus());
+    }
+
+    @Test
+    public void testOverallPublic() {
+        response = statusController.overallPublic();
+        assertEquals("Response was not successfull", SUCCESS, response.getMeta().getStatus());
+    }
+}

src/test/java/edu/tamu/app/controller/UserControllerTest.java

@@ -1,5 +1,6 @@
 package edu.tamu.app.controller;
 
+import static edu.tamu.weaver.response.ApiStatus.ERROR;
 import static edu.tamu.weaver.response.ApiStatus.SUCCESS;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
@@ -54,7 +55,7 @@ public class UserControllerTest {
 
     @Mock
     private UserRepo userRepo;
-    
+
     @Mock
     private SimpMessagingTemplate simpMessagingTemplate;
 
@@ -74,6 +75,24 @@ public void testCredentials() {
         assertEquals("Unable to get user credentials", SUCCESS, apiResponse.getMeta().getStatus());
     }
 
+    @Test
+    public void testNullCredentials() {
+        apiResponse = userController.credentials(null);
+        assertEquals("Unable to get user credentials", ERROR, apiResponse.getMeta().getStatus());
+    }
+
+    @Test
+    public void testGetUser() {
+        apiResponse = userController.getUser(testUser1);
+        assertEquals("Unable to get user", SUCCESS, apiResponse.getMeta().getStatus());
+    }
+
+    @Test
+    public void testGetNullUser() {
+        apiResponse = userController.getUser(null);
+        assertEquals("Unable to get user", ERROR, apiResponse.getMeta().getStatus());
+    }
+
     @Test
     @SuppressWarnings("unchecked")
     public void testAllUsers() throws Exception {