Revert "Revert "More testing of testing methods""

This reverts commit 70a143389cc721df677a6458f326869ee95d416d.

src/main/java/io/zipcoder/tc_spring_poll_application/controller/PollController.java

     @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
     public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long pollId) {
         // Save the entity
-        verifyPoll(poll);
+        verifyPoll(poll.getId());
         Poll p = pollRepository.save(poll);
         return new ResponseEntity<>(p, HttpStatus.OK);
     }
 
 
     @RequestMapping(method = RequestMethod.GET)
-    public void verifyPoll(Poll poll) throws ResourceNotFoundException {
-        if (pollRepository.findOne(poll.getId()) == null) {
-            throw new ResourceNotFoundException();
-        }
-    }
-
-    @RequestMapping(method = RequestMethod.GET)
     public void verifyPoll(Long pollId) throws ResourceNotFoundException {
         if (pollRepository.findOne(pollId) == null) {
             throw new ResourceNotFoundException();
         }
     }
-
 }

src/main/java/io/zipcoder/tc_spring_poll_application/controller/VoteController.java

 
 @RestController
 public class VoteController {
+
     private VoteRepository voteRepository;
 
     @Autowired

src/main/java/io/zipcoder/tc_spring_poll_application/domain/Vote.java

     public void setOption(Option option) {
         this.option = option;
     }
+
+    @Override
+    public String toString() {
+        return "{\"id\":" + id
+                + ",\"option\":" + option + "}";
+    }
 }

src/main/java/io/zipcoder/tc_spring_poll_application/repositories/VoteRepository.java

             "FROM Option o, Vote v " +
             "WHERE o.POLL_ID = ?1 " +
             "AND v.OPTION_ID = o.OPTION_ID", nativeQuery = true)
-
-    public Iterable<Vote> findVotesByPoll(Long pollId);
+    Iterable<Vote> findVotesByPoll(Long pollId);
 
 }

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

+package io.zipcoder.tc_spring_poll_application.controller;
+
+import io.zipcoder.tc_spring_poll_application.repositories.VoteRepository;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import static org.junit.Assert.*;
+
+
+public class ComputeResultControllerTest {
+    private ComputeResultController computeResultController;
+
+    @MockBean
+    private VoteRepository voteRepository;
+
+    @Before
+    public void setUp(){
+        computeResultController = new ComputeResultController(voteRepository);
+    }
+
+    @Test
+    public void testComputeResults() {
+        voteRepository.findVotesByPoll(1L);
+        computeResultController.computeResult(1L);
+    }
+}

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

 package io.zipcoder.tc_spring_poll_application.controller;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+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.domain.Vote;
 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.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 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.HttpStatus;
 import org.springframework.http.MediaType;
 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.setup.MockMvcBuilders;
+import org.springframework.web.bind.annotation.RequestAttribute;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 
+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.*;
 
-@SpringBootTest
+//@SpringBootTest
 @RunWith(SpringRunner.class)
-@AutoConfigureMockMvc
+@WebMvcTest
 public class VoteControllerTest {
-
     @Autowired
     private MockMvc mvc;
+
     private Vote testVote;
     private Iterable<Vote> votes;
-    private Long testId;
-
+    private final Long TEST_ID = 1L;
+    private final Long BAD_ID = 400L;
 
-    @Mock
+    @MockBean
     private VoteRepository voteRepository;
 
+    @MockBean
+    private PollRepository pollRepository;
+
     @InjectMocks
     private VoteController voteController;
 
+    private Poll testPoll;
+
     @Before
     public void setUp() {
 
                 .build();
 
         testVote = new Vote();
-        testId = 1L;
-        testVote.setId(1L);
+        testVote.setId(TEST_ID);
 
         Vote[] votearr = {testVote};
         votes = Arrays.asList(votearr);
 
+        testPoll = new Poll();
+        testPoll.setId(TEST_ID);
     }
 
     @Test
     public void testGetVotePollIdSuccess() throws Exception {
 
-//        given(voteRepository.findVotesByPoll(testId))
-//                .willReturn(votes);
-//
-//        MockHttpServletResponse response = mvc.perform(get("polls/1/votes")
-//                .accept(MediaType.APPLICATION_JSON))
-//                .andReturn().getResponse();
-//
-//        Assert.assertEquals((response.getStatus()), HttpStatus.OK.value());
-//        Assert.assertEquals(response.getContentAsString(), testVote.toString());
+        given(voteRepository.findVotesByPoll(TEST_ID))
+                .willReturn(votes);
+
+        MockHttpServletResponse response = mvc.perform(get("/polls/1/votes")
+                .content(asJsonString(votes))
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+                .andReturn().getResponse();
+
+        Assert.assertEquals(HttpStatus.OK.value(), response.getStatus());
+        Assert.assertEquals(response.getContentAsString(), votes.toString());
     }
 
+//    @Test(expected = ResourceNotFoundException.class)
     @Test
     public void testGetVoteIdFail() throws Exception {
+        given(voteRepository.findVotesByPoll(BAD_ID))
+                .willThrow(new ResourceNotFoundException());
 
-        given(voteRepository.findAll())
-                .willReturn(null);
+        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());
+    }
 
-        MockHttpServletResponse response = mvc.perform(get("polls/200/votes")
+    @Test
+    public void testGetAllVotes() throws Exception {
+        given(voteController.getAllVotes())
+                .willReturn(votes);
+
+        MockHttpServletResponse response = mvc.perform(get("/polls/votes")
                 .accept(MediaType.APPLICATION_JSON))
                 .andReturn().getResponse();
 
-        Assert.assertEquals((response.getStatus()), HttpStatus.OK.value());
+        Assert.assertEquals(response.getStatus(), HttpStatus.OK.value());
         Assert.assertEquals(response.getContentAsString(), votes.toString());
     }
 
-//    @Test
-//    public void testGetAllVotes() throws Exception {
-//
-//        given(voteRepository.findOne(200L))
-//                .willThrow(new ResourceNotFoundException());
-//
-//        MockHttpServletResponse response = mvc.perform(
-//                get("polls/votes")
-//                        .accept(MediaType.APPLICATION_JSON))
-//                .andReturn().getResponse();
-//
-//        Assert.assertEquals(response.getStatus(), HttpStatus.NOT_FOUND.value());
-//        Assert.assertTrue(response.getContentAsString().isEmpty());
-//    }
-
     @Test
-    public void testGetAllVotesFail() {
+    public void testGetAllVotesFail() throws Exception {
+        given(voteController.getAllVotes())
+                .willThrow(new ResourceNotFoundException());
+
+        MockHttpServletResponse response = mvc.perform(
+                get("polls/votes")
+                        .accept(MediaType.APPLICATION_JSON))
+                .andReturn().getResponse();
 
+        Assert.assertEquals(response.getStatus(), HttpStatus.NOT_FOUND.value());
+        Assert.assertTrue(response.getContentAsString().isEmpty());
     }
 
     @Test