Revert "Revert "before converting tests to mockito""

This reverts commit 4792e6a461ef1795560e0efce2919b7fa7a01035.

src/test/java/io/zipcoder/tc_spring_poll_application/controller/PollControllerTest.java

@@ -17,6 +17,7 @@ import org.springframework.boot.test.json.JacksonTester;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
@@ -26,8 +27,14 @@ import java.net.URI;
 import java.util.Arrays;
 
 import static io.zipcoder.tc_spring_poll_application.JsonTestUtilities.asJsonString;
+import static org.hamcrest.Matchers.containsString;
 import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @SpringBootTest
 @RunWith(SpringRunner.class)
@@ -111,23 +118,32 @@ public class PollControllerTest {
      postURLtemplate URL */
     public void testCreatePollSuccess() throws Exception {
         Poll testPoll2 = new Poll();
-        String expected = "http://localhost/polls/2/";
+//        String expected = "http://localhost/polls/2/";
 
-        HttpHeaders responseHeader =  new HttpHeaders();
-        responseHeader.setLocation(URI.create(expected));
+//        HttpHeaders responseHeader =  new HttpHeaders();
+//        responseHeader.setLocation(URI.create(expected));
 
         given(pollController.createPoll(testPoll2)).willReturn(null);
+//        doNothing().when(pollController).createPoll(testPoll2);
 
-        MockHttpServletResponse response = mvc.perform(post("/polls/2")
-                .content(asJsonString(testPoll2))
+//        MockHttpServletResponse response = mvc.perform(post("/polls/2")
+//                .content(asJsonString(testPoll2))
+//                .contentType(MediaType.APPLICATION_JSON)
+//                .accept(MediaType.APPLICATION_JSON))
+//                .andReturn().getResponse();
+
+        mvc.perform(post("/polls/{id}",2)
                 .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-                .andReturn().getResponse();
+                .contentType(asJsonString(testPoll2)))
+                .andExpect(status().isCreated())
+                .andExpect(header().string("location", containsString("/polls/2")));
 
-        String header = response.getHeader("Location");
+        verify(pollController, times(1)).createPoll(testPoll2);
 
-        Assert.assertEquals(HttpStatus.CREATED.value(),(response.getStatus()));
-        Assert.assertEquals(expected, header);
+//        String header = response.getHeader("Location");
+//
+//        Assert.assertEquals(HttpStatus.CREATED.value(),(response.getStatus()));
+//        Assert.assertEquals(expected, header);
     }
 
     @Test

src/test/java/io/zipcoder/tc_spring_poll_application/controller/VoteControllerTest.java

@@ -36,7 +36,10 @@ import java.util.List;
 
 import static io.zipcoder.tc_spring_poll_application.JsonTestUtilities.asJsonString;
 import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.*;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 //@SpringBootTest
 @RunWith(SpringRunner.class)
@@ -97,21 +100,6 @@ public class VoteControllerTest {
         Assert.assertEquals(response.getContentAsString(), votes.toString());
     }
 
-//    @Test(expected = ResourceNotFoundException.class)
-    @Test
-    public void testGetVoteIdFail() throws Exception {
-        given(voteRepository.findVotesByPoll(BAD_ID))
-                .willThrow(new ResourceNotFoundException());
-
-        MockHttpServletResponse response = mvc.perform(get("/polls/500/votes")
-                .accept(MediaType.APPLICATION_JSON))
-                .andReturn().getResponse();
-
-        System.out.println(response.getStatus());
-
-        Assert.assertEquals(HttpStatus.NOT_FOUND.value(), response.getStatus());
-    }
-
     @Test
     public void testGetAllVotes() throws Exception {
         given(voteController.getAllVotes())
@@ -132,15 +120,39 @@ public class VoteControllerTest {
 
         MockHttpServletResponse response = mvc.perform(
                 get("polls/votes")
-                        .accept(MediaType.APPLICATION_JSON))
-                .andReturn().getResponse();
+                    .accept(MediaType.APPLICATION_JSON))
+                    .andReturn().getResponse();
 
         Assert.assertEquals(response.getStatus(), HttpStatus.NOT_FOUND.value());
         Assert.assertTrue(response.getContentAsString().isEmpty());
     }
 
     @Test
-    public void testCreateVoteSuccess() {
+    public void testCreateVoteSuccess() throws Exception {
+        Vote testVote2 = new Vote();
+        Long pollId = 2L;
+        given(voteController.createVote(pollId, testVote2)).willReturn(null);
 
+        mvc.perform(post("/polls/{id}/votes",pollId)
+                .contentType(MediaType.APPLICATION_JSON)
+                .contentType(asJsonString(testVote2)))
+                .andExpect(status().isCreated());
+
+        verify(voteController, times(1)).createVote(pollId, testVote2);
+    }
+//
+//    @Test
+//    public void test_create_user_fail_404_not_found() throws Exception {
+//        User user = new User("username exists");
+//
+//        when(userService.exists(user)).thenReturn(true);
+//
+//        mockMvc.perform(
+//                post("/users")
+//                        .contentType(MediaType.APPLICATION_JSON)
+//                        .content(asJsonString(user)))
+//                .andExpect(status().isConflict());
+//
+//        verify(userService, times(1)).exists(user);
+//        verifyNoMoreInteractions(userService);
     }
-}