Revert "More testing of testing methods"

This reverts commit a02510d20a59ddecd6abb4c63acd2f7f2fe99820.

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

@@ -52,7 +52,7 @@ public class PollController {
     @RequestMapping(value="/polls/{pollId}", method=RequestMethod.PUT)
     public ResponseEntity<?> updatePoll(@RequestBody Poll poll, @PathVariable Long pollId) {
         // Save the entity
-        verifyPoll(poll.getId());
+        verifyPoll(poll);
         Poll p = pollRepository.save(poll);
         return new ResponseEntity<>(p, HttpStatus.OK);
     }
@@ -66,9 +66,17 @@ public class PollController {
 
 
     @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

@@ -11,7 +11,6 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
 @RestController
 public class VoteController {
-
     private VoteRepository voteRepository;
 
     @Autowired

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

@@ -28,10 +28,4 @@ public class Vote {
     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

@@ -9,6 +9,7 @@ public interface VoteRepository extends CrudRepository<Vote, Long> {
             "FROM Option o, Vote v " +
             "WHERE o.POLL_ID = ?1 " +
             "AND v.OPTION_ID = o.OPTION_ID", nativeQuery = true)
-    Iterable<Vote> findVotesByPoll(Long pollId);
+
+    public Iterable<Vote> findVotesByPoll(Long pollId);
 
 }

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

@@ -1,27 +0,0 @@
-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

@@ -1,11 +1,9 @@
 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;
@@ -13,54 +11,41 @@ import org.junit.Test;
 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)
-@WebMvcTest
+@AutoConfigureMockMvc
 public class VoteControllerTest {
+
     @Autowired
     private MockMvc mvc;
-
     private Vote testVote;
     private Iterable<Vote> votes;
-    private final Long TEST_ID = 1L;
-    private final Long BAD_ID = 400L;
+    private Long testId;
 
-    @MockBean
-    private VoteRepository voteRepository;
 
-    @MockBean
-    private PollRepository pollRepository;
+    @Mock
+    private VoteRepository voteRepository;
 
     @InjectMocks
     private VoteController voteController;
 
-    private Poll testPoll;
-
     @Before
     public void setUp() {
 
@@ -72,71 +57,60 @@ public class VoteControllerTest {
                 .build();
 
         testVote = new Vote();
-        testVote.setId(TEST_ID);
+        testId = 1L;
+        testVote.setId(1L);
 
         Vote[] votearr = {testVote};
         votes = Arrays.asList(votearr);
 
-        testPoll = new Poll();
-        testPoll.setId(TEST_ID);
     }
 
     @Test
     public void testGetVotePollIdSuccess() throws Exception {
 
-        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());
+//        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());
     }
 
-//    @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());
-    }
+        given(voteRepository.findAll())
+                .willReturn(null);
 
-    @Test
-    public void testGetAllVotes() throws Exception {
-        given(voteController.getAllVotes())
-                .willReturn(votes);
-
-        MockHttpServletResponse response = mvc.perform(get("/polls/votes")
+        MockHttpServletResponse response = mvc.perform(get("polls/200/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 testGetAllVotesFail() throws Exception {
-        given(voteController.getAllVotes())
-                .willThrow(new ResourceNotFoundException());
+//    @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());
+//    }
 
-        MockHttpServletResponse response = mvc.perform(
-                get("polls/votes")
-                        .accept(MediaType.APPLICATION_JSON))
-                .andReturn().getResponse();
+    @Test
+    public void testGetAllVotesFail() {
 
-        Assert.assertEquals(response.getStatus(), HttpStatus.NOT_FOUND.value());
-        Assert.assertTrue(response.getContentAsString().isEmpty());
     }
 
     @Test