updating tests

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

@@ -5,6 +5,7 @@ import io.zipcoder.tc_spring_poll_application.domain.Option;
 import io.zipcoder.tc_spring_poll_application.domain.Poll;
 import io.zipcoder.tc_spring_poll_application.exception.ResourceNotFoundException;
 import io.zipcoder.tc_spring_poll_application.repositories.PollRepository;
+import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -13,8 +14,10 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.json.JacksonTester;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -22,6 +25,7 @@ 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;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
 import java.util.Arrays;
@@ -31,25 +35,29 @@ import java.util.Set;
 import static io.zipcoder.tc_spring_poll_application.JsonTestUtilities.asJsonString;
 import static org.mockito.BDDMockito.given;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 
-@SpringBootTest
 @RunWith(SpringRunner.class)
-@AutoConfigureMockMvc
+@WebMvcTest(PollController.class)
 public class PollControllerTest {
+
     @Autowired
     private MockMvc mvc;
+
+    // ==== Instance variables ==== //
     private Poll testPoll, testPoll2;
     private Iterable<Poll> polls;
     private final Long POLL_ID = 1L;
+    private final Long BAD_ID = 1100L;
     private Set<Option> options1, options2;
     private Option option1, option2, option3, option4;
 
-
-    @Mock
+    @MockBean
     private PollRepository pollRepository;
 
     @InjectMocks
+    @Autowired
     private PollController pollController;
 
     @Before
@@ -102,6 +110,8 @@ public class PollControllerTest {
         polls = Arrays.asList(pollArr);
     }
 
+    // =================== Get one =================== //
+
     @Test
     public void testGetPollByIdSuccess() throws Exception {
 
@@ -109,12 +119,15 @@ public class PollControllerTest {
                 .willReturn(testPoll);
 
         MockHttpServletResponse response = mvc.perform(get("/polls/1")
+                .content(asJsonString(testPoll))
                 .accept(MediaType.APPLICATION_JSON))
                 .andReturn().getResponse();
 
         Assert.assertEquals(HttpStatus.OK.value(), (response.getStatus()));
     }
 
+    // =================== Get All =================== //
+
     @Test
     public void testGetAllPollsSuccess() throws Exception {
 
@@ -143,9 +156,11 @@ public class PollControllerTest {
         Assert.assertTrue(response.getContentAsString().isEmpty());
     }
 
+    // =================== Create Poll =================== //
+
     @Test
     public void testCreatePollSuccess() throws Exception {
-        given(pollController.createPoll(testPoll2)).willReturn(null);
+        given(pollRepository.save(testPoll2)).willReturn(testPoll2);
 
         MockHttpServletResponse response = mvc.perform(post("/polls/")
                 .content(asJsonString(testPoll2))
@@ -156,16 +171,18 @@ public class PollControllerTest {
         Assert.assertEquals(HttpStatus.CREATED.value(),(response.getStatus()));
     }
 
+    // =================== Update Poll =================== //
+
     @Test
     public void testUpdatePollSuccess() {
 
         /* can't get it to work, rewriting */
     }
 
-    @Test(expected = ResourceNotFoundException.class)
+    @Test
     public void testUpdatePollFail() throws Exception {
-        given(pollController.updatePoll(testPoll, 100L))
-                .willThrow(new ResourceNotFoundException());
+
+        given(pollRepository.findOne(BAD_ID)).willReturn(null);
 
         MockHttpServletResponse response = mvc.perform(put("/polls/10101")
                 .content(asJsonString(testPoll))
@@ -176,23 +193,21 @@ public class PollControllerTest {
         Assert.assertEquals(HttpStatus.NOT_FOUND.value(),(response.getStatus()));
     }
 
+    // =================== Delete Poll =================== //
+
     @Test
     public void testDeletePollSuccess() throws Exception {
-        given(pollController.deletePoll(testPoll.getId()))
-                .willReturn(null);
+        given(pollRepository.findOne(1l))
+                .willReturn(new Poll());
 
-        MockHttpServletResponse response = mvc.perform(delete("/polls")
-                .content(asJsonString(testPoll))
-                .contentType(MediaType.APPLICATION_JSON)
+        mvc.perform(delete("/polls/1")
                 .accept(MediaType.APPLICATION_JSON))
-                .andReturn().getResponse();
-
-        Assert.assertEquals(HttpStatus.OK.value(),(response.getStatus()));
+                .andExpect(status().isOk());
     }
 
-    @Test(expected = ResourceNotFoundException.class)
+    @Test
     public void testDeletePollFail() throws Exception {
-        given(pollController.deletePoll(400L))
+        given(pollRepository.findOne(BAD_ID))
                 .willThrow(new ResourceNotFoundException());
 
         MockHttpServletResponse response = mvc.perform(delete("/polls/400")
@@ -202,4 +217,7 @@ public class PollControllerTest {
         Assert.assertEquals(HttpStatus.NOT_FOUND.value(),(response.getStatus()));
 
     }
+
+
+    // =================== Test Exception Thrown =================== //
 }

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

@@ -11,17 +11,13 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.Mock;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.json.JacksonTester;
 import org.springframework.boot.test.mock.mockito.MockBean;
 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;
@@ -32,15 +28,11 @@ import java.util.Arrays;
 
 import static io.zipcoder.tc_spring_poll_application.JsonTestUtilities.asJsonString;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@SpringBootTest
 @RunWith(SpringRunner.class)
-@AutoConfigureMockMvc
+@WebMvcTest(VoteController.class)
 public class VoteControllerTest {
 
     @Autowired
@@ -51,13 +43,14 @@ public class VoteControllerTest {
     private final Long TEST_ID = 1L;
     private final Long BAD_ID = 400L;
 
-    @Mock
+    @MockBean
     private VoteRepository voteRepository;
 
-    @Mock
+    @MockBean
     private PollRepository pollRepository;
 
     @InjectMocks
+    @Autowired
     private VoteController voteController;
 
     private Poll testPoll;
@@ -100,7 +93,7 @@ public class VoteControllerTest {
 
     @Test
     public void testGetAllVotes() throws Exception {
-        given(voteController.getAllVotes())
+        given(voteRepository.findAll())
                 .willReturn(votes);
 
         MockHttpServletResponse response = mvc.perform(get("/polls/votes")
@@ -113,11 +106,11 @@ public class VoteControllerTest {
 
     @Test
     public void testGetAllVotesFail() throws Exception {
-        given(voteController.getAllVotes())
+        given(voteRepository.findAll())
                 .willThrow(new ResourceNotFoundException());
 
         MockHttpServletResponse response = mvc.perform(
-                get("polls/votes")
+                get("polls/votesBADBAD")
                     .accept(MediaType.APPLICATION_JSON))
                     .andReturn().getResponse();
 
@@ -128,12 +121,9 @@ public class VoteControllerTest {
     @Test
     public void testCreateVoteSuccess() throws Exception {
         Vote testVote2 = new Vote();
-        Long pollId = 2L;
-        HttpHeaders responseHeaders = new HttpHeaders();
-        responseHeaders.setLocation(ServletUriComponentsBuilder.
-                fromCurrentRequest().path("/{id}").buildAndExpand(testVote2.getId()).toUri());
-        given(voteController.createVote(pollId, testVote2))
-                .willReturn(new ResponseEntity<>(null, responseHeaders ,HttpStatus.CREATED));
+
+        given(voteRepository.save(testVote2))
+                .willReturn(testVote2);
 
         MockHttpServletResponse response = mvc.perform(post("/polls/2/votes")
                 .contentType(MediaType.APPLICATION_JSON)