Revert "wip"

This reverts commit f884bac620719c470cb2161f6301fb5828fe81e8.

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

@@ -1,5 +1,6 @@
 package io.zipcoder.tc_spring_poll_application.controller;
 
+import io.zipcoder.tc_spring_poll_application.domain.Option;
 import io.zipcoder.tc_spring_poll_application.domain.Vote;
 import io.zipcoder.tc_spring_poll_application.dtos.OptionCount;
 import io.zipcoder.tc_spring_poll_application.dtos.VoteResult;
@@ -48,22 +49,22 @@ public class ComputeResultController {
 //    ]
 //        }
 
-//        for (Vote v: allVotes) {
-//            Long optionID = (v.getOption().getId());
-//            OptionCount temp;
-//            if (!optionCountsMap.keySet().contains(optionID)) {
-//                temp = new OptionCount();
-//                temp.setOptionId(optionID);
-//                temp.setCount(1);
-//                optionCountsMap.put(optionID,temp);
-//            } else {
-//                temp = optionCountsMap.get(optionID);
-//                temp.setCount(temp.getCount()+1);
-//                optionCountsMap.replace(optionID, temp);
-//            }
-//        }
-//        voteResult.setTotalVotes((int)voteCount);
-//        voteResult.setResults(optionCountsMap.values());
+        for (Vote v: allVotes) {
+            Long optionID = (v.getOption().getId());
+            OptionCount temp;
+            if (!optionCountsMap.keySet().contains(optionID)) {
+                temp = new OptionCount();
+                temp.setOptionId(optionID);
+                temp.setCount(1);
+                optionCountsMap.put(optionID,temp);
+            } else {
+                temp = optionCountsMap.get(optionID);
+                temp.setCount(temp.getCount()+1);
+                optionCountsMap.replace(optionID, temp);
+            }
+        }
+        voteResult.setTotalVotes((int)voteCount);
+        voteResult.setResults(optionCountsMap.values());
 
         //TODO: Implement algorithm to count votes
         return new ResponseEntity<>(voteResult, HttpStatus.OK);

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

@@ -48,6 +48,6 @@ public class Poll {
     public String toString() {
         return "{\"id\":" + this.id
                 + ",\"question\":" + question
-                + ",`\"options\":" + options + "}";
+                + ",\"options\":" + options + "}";
     }
 }

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

@@ -1,27 +1,27 @@
-//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);
-//    }
-//}
+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/PollControllerTest.java

@@ -1,206 +1,206 @@
-//package io.zipcoder.tc_spring_poll_application.controller;
-//
-//import com.fasterxml.jackson.databind.ObjectMapper;
-//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 org.junit.Assert;
-//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.context.SpringBootTest;
-//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;
-//import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-//
-//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)
-//@AutoConfigureMockMvc
-//public class PollControllerTest {
-//    @Autowired
-//    private MockMvc mvc;
-//    private Poll testPoll;
-//    private Iterable<Poll> polls;
-//
-//    @Mock
-//    private PollRepository pollRepository;
-//
-//    @InjectMocks
-//    private PollController pollController;
-//
-//    private JacksonTester<Poll> pollJacksonTester;
-//
-//    @Before
-//    public void setUp() {
-//
-//        pollController = new PollController(pollRepository);
-//        JacksonTester.initFields(this, new ObjectMapper());
-//
-//        mvc = MockMvcBuilders.standaloneSetup(pollController)
-//                .setControllerAdvice( new ResourceNotFoundException())
-//                .build();
-//
-//        testPoll = new Poll();
-//        pollController.createPoll(testPoll);
-//
-//        Poll[] pollArr = {testPoll};
-//        polls = Arrays.asList(pollArr);
-//
-//    }
-//
-//    @Test
-//    public void testGetPollByIdSuccess() throws Exception {
-//
-//        given(pollRepository.findOne(1L))
-//                .willReturn(testPoll);
-//
-//        MockHttpServletResponse response = mvc.perform(get("/polls/1")
-//                .accept(MediaType.APPLICATION_JSON))
-//                .andReturn().getResponse();
-//
-//        Assert.assertEquals((response.getStatus()), HttpStatus.OK.value());
-//        Assert.assertEquals(response.getContentAsString(), testPoll.toString());
-//    }
-//
-//    @Test
-//    public void testGetAllPollsSuccess() throws Exception {
-//
-//        given(pollRepository.findAll())
-//                .willReturn(polls);
-//
-//        MockHttpServletResponse response = mvc.perform(get("/polls")
-//                .accept(MediaType.APPLICATION_JSON))
-//                .andReturn().getResponse();
-//
-//        Assert.assertEquals((response.getStatus()), HttpStatus.OK.value());
-//        Assert.assertEquals(response.getContentAsString(), polls.toString());
-//    }
-//
-//    @Test
-//    public void testGetPollByIdFailException() throws Exception {
-//
-//        given(pollRepository.findOne(200L))
-//                .willThrow(new ResourceNotFoundException());
-//
-//        MockHttpServletResponse response = mvc.perform(
-//                get("/polls/200")
-//                .accept(MediaType.APPLICATION_JSON))
-//                .andReturn().getResponse();
-//
-//        Assert.assertEquals(response.getStatus(), HttpStatus.NOT_FOUND.value());
-//        Assert.assertTrue(response.getContentAsString().isEmpty());
-//    }
-//
-//    @Test /* This one is failing ??? mock the response better??, changed the
-//     postURLtemplate URL */
-//    public void testCreatePollSuccess() throws Exception {
-//        Poll testPoll2 = new Poll();
-//        String expected = "http://localhost/polls/2/";
-//
-//        HttpHeaders responseHeader =  new HttpHeaders();
-//        responseHeader.setLocation(URI.create(expected));
-//
-//        given(pollController.createPoll(testPoll2)).willReturn(null);
-//
-//        MockHttpServletResponse response = mvc.perform(post("/polls/2")
-//                .content(asJsonString(testPoll2))
-//                .contentType(MediaType.APPLICATION_JSON)
-//                .accept(MediaType.APPLICATION_JSON))
-//                .andReturn().getResponse();
-//
-//        String header = response.getHeader("Location");
-//
-//        Assert.assertEquals(HttpStatus.CREATED.value(),(response.getStatus()));
-//        Assert.assertEquals(expected, header);
-//
-//        // =============== Mockito Version to implement
-//
-////        doNothing().when(pollController).createPoll(testPoll2);
-////        mvc.perform(post("/polls/{id}",2)
-////                .contentType(MediaType.APPLICATION_JSON)
-////                .contentType(asJsonString(testPoll2)))
-////                .andExpect(status().isCreated())
-////                .andExpect(header().string("location", containsString("/polls/2")));
-////
-////        verify(pollController, times(1)).createPoll(testPoll2);
-//    }
-//
-//    @Test
-//    public void testUpdatePollSuccess() throws Exception {
-//        given(pollController.updatePoll(testPoll, 1L))
-//                .willReturn(null);
-//
-//        MockHttpServletResponse response = mvc.perform(put("/polls/1")
-//                .content(asJsonString(testPoll))
+package io.zipcoder.tc_spring_poll_application.controller;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+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 org.junit.Assert;
+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.context.SpringBootTest;
+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;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+
+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)
+@AutoConfigureMockMvc
+public class PollControllerTest {
+    @Autowired
+    private MockMvc mvc;
+    private Poll testPoll;
+    private Iterable<Poll> polls;
+
+    @Mock
+    private PollRepository pollRepository;
+
+    @InjectMocks
+    private PollController pollController;
+
+    private JacksonTester<Poll> pollJacksonTester;
+
+    @Before
+    public void setUp() {
+
+        pollController = new PollController(pollRepository);
+        JacksonTester.initFields(this, new ObjectMapper());
+
+        mvc = MockMvcBuilders.standaloneSetup(pollController)
+                .setControllerAdvice( new ResourceNotFoundException())
+                .build();
+
+        testPoll = new Poll();
+        pollController.createPoll(testPoll);
+
+        Poll[] pollArr = {testPoll};
+        polls = Arrays.asList(pollArr);
+
+    }
+
+    @Test
+    public void testGetPollByIdSuccess() throws Exception {
+
+        given(pollRepository.findOne(1L))
+                .willReturn(testPoll);
+
+        MockHttpServletResponse response = mvc.perform(get("/polls/1")
+                .accept(MediaType.APPLICATION_JSON))
+                .andReturn().getResponse();
+
+        Assert.assertEquals((response.getStatus()), HttpStatus.OK.value());
+        Assert.assertEquals(response.getContentAsString(), testPoll.toString());
+    }
+
+    @Test
+    public void testGetAllPollsSuccess() throws Exception {
+
+        given(pollRepository.findAll())
+                .willReturn(polls);
+
+        MockHttpServletResponse response = mvc.perform(get("/polls")
+                .accept(MediaType.APPLICATION_JSON))
+                .andReturn().getResponse();
+
+        Assert.assertEquals((response.getStatus()), HttpStatus.OK.value());
+        Assert.assertEquals(response.getContentAsString(), polls.toString());
+    }
+
+    @Test
+    public void testGetPollByIdFailException() throws Exception {
+
+        given(pollRepository.findOne(200L))
+                .willThrow(new ResourceNotFoundException());
+
+        MockHttpServletResponse response = mvc.perform(
+                get("/polls/200")
+                .accept(MediaType.APPLICATION_JSON))
+                .andReturn().getResponse();
+
+        Assert.assertEquals(response.getStatus(), HttpStatus.NOT_FOUND.value());
+        Assert.assertTrue(response.getContentAsString().isEmpty());
+    }
+
+    @Test /* This one is failing ??? mock the response better??, changed the
+     postURLtemplate URL */
+    public void testCreatePollSuccess() throws Exception {
+        Poll testPoll2 = new Poll();
+        String expected = "http://localhost/polls/2/";
+
+        HttpHeaders responseHeader =  new HttpHeaders();
+        responseHeader.setLocation(URI.create(expected));
+
+        given(pollController.createPoll(testPoll2)).willReturn(null);
+
+        MockHttpServletResponse response = mvc.perform(post("/polls/2")
+                .content(asJsonString(testPoll2))
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+                .andReturn().getResponse();
+
+        String header = response.getHeader("Location");
+
+        Assert.assertEquals(HttpStatus.CREATED.value(),(response.getStatus()));
+        Assert.assertEquals(expected, header);
+
+        // =============== Mockito Version to implement
+
+//        doNothing().when(pollController).createPoll(testPoll2);
+//        mvc.perform(post("/polls/{id}",2)
 //                .contentType(MediaType.APPLICATION_JSON)
-//                .accept(MediaType.APPLICATION_JSON))
-//                .andReturn().getResponse();
-//
-//        Assert.assertEquals(HttpStatus.OK.value(),(response.getStatus()));
-//    }
-//
+//                .contentType(asJsonString(testPoll2)))
+//                .andExpect(status().isCreated())
+//                .andExpect(header().string("location", containsString("/polls/2")));
+//
+//        verify(pollController, times(1)).createPoll(testPoll2);
+    }
+
+    @Test
+    public void testUpdatePollSuccess() throws Exception {
+        given(pollController.updatePoll(testPoll, 1L))
+                .willReturn(null);
+
+        MockHttpServletResponse response = mvc.perform(put("/polls/1")
+                .content(asJsonString(testPoll))
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+                .andReturn().getResponse();
+
+        Assert.assertEquals(HttpStatus.OK.value(),(response.getStatus()));
+    }
+
+    @Test(expected = ResourceNotFoundException.class)
+    public void testUpdatePollFail() throws Exception {
+        given(pollController.updatePoll(testPoll, 100L))
+                .willThrow(new ResourceNotFoundException());
+
+        MockHttpServletResponse response = mvc.perform(put("/polls/10101")
+                .content(asJsonString(testPoll))
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+                .andReturn().getResponse();
+
+        Assert.assertEquals(HttpStatus.NOT_FOUND.value(),(response.getStatus()));
+    }
+
+    @Test
+    public void testDeletePollSuccess() throws Exception {
+        given(pollController.updatePoll(testPoll, 1L))
+                .willReturn(null);
+
+        MockHttpServletResponse response = mvc.perform(delete("/polls/1")
+                .content(asJsonString(testPoll))
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+                .andReturn().getResponse();
+
+        Assert.assertEquals(HttpStatus.OK.value(),(response.getStatus()));
+    }
+
 //    @Test(expected = ResourceNotFoundException.class)
-//    public void testUpdatePollFail() throws Exception {
-//        given(pollController.updatePoll(testPoll, 100L))
-//                .willThrow(new ResourceNotFoundException());
-//
-//        MockHttpServletResponse response = mvc.perform(put("/polls/10101")
-//                .content(asJsonString(testPoll))
-//                .contentType(MediaType.APPLICATION_JSON)
-//                .accept(MediaType.APPLICATION_JSON))
-//                .andReturn().getResponse();
-//
-//        Assert.assertEquals(HttpStatus.NOT_FOUND.value(),(response.getStatus()));
-//    }
-//
-//    @Test
-//    public void testDeletePollSuccess() throws Exception {
-//        given(pollController.updatePoll(testPoll, 1L))
-//                .willReturn(null);
-//
-//        MockHttpServletResponse response = mvc.perform(delete("/polls/1")
-//                .content(asJsonString(testPoll))
-//                .contentType(MediaType.APPLICATION_JSON)
-//                .accept(MediaType.APPLICATION_JSON))
-//                .andReturn().getResponse();
-//
-//        Assert.assertEquals(HttpStatus.OK.value(),(response.getStatus()));
-//    }
-//
-////    @Test(expected = ResourceNotFoundException.class)
-//    @Test
-//    public void testDeletePollFail() throws Exception {
-//        given(pollController.deletePoll(400L))
-//                .willThrow(new ResourceNotFoundException());
-//
-//        MockHttpServletResponse response = mvc.perform(delete("/polls/400")
-//                .accept(MediaType.APPLICATION_JSON))
-//                .andReturn().getResponse();
-//
-//        Assert.assertEquals(HttpStatus.NOT_FOUND.value(),(response.getStatus()));
-//
-//    }
-//}
+    @Test
+    public void testDeletePollFail() throws Exception {
+        given(pollController.deletePoll(400L))
+                .willThrow(new ResourceNotFoundException());
+
+        MockHttpServletResponse response = mvc.perform(delete("/polls/400")
+                .accept(MediaType.APPLICATION_JSON))
+                .andReturn().getResponse();
+
+        Assert.assertEquals(HttpStatus.NOT_FOUND.value(),(response.getStatus()));
+
+    }
+}

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

@@ -1,143 +1,143 @@
-//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.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.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)
-//@WebMvcTest
-//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;
-//
-//    @MockBean
-//    private VoteRepository voteRepository;
-//
-//    @MockBean
-//    private PollRepository pollRepository;
-//
-//    @InjectMocks
-//    private VoteController voteController;
-//
-//    private Poll testPoll;
-//
-//    @Before
-//    public void setUp() {
-//
-//        voteController = new VoteController(voteRepository);
-//        JacksonTester.initFields(this, new ObjectMapper());
-//
-//        mvc = MockMvcBuilders.standaloneSetup(voteController)
-//                .setControllerAdvice(new ResourceNotFoundException())
-//                .build();
-//
-//        testVote = new Vote();
-//        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(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
-//    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.getContentAsString(), votes.toString());
-//    }
-//
-//    @Test
-//    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
-//    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);
-//    }
-//    }
+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.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.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)
+@WebMvcTest
+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;
+
+    @MockBean
+    private VoteRepository voteRepository;
+
+    @MockBean
+    private PollRepository pollRepository;
+
+    @InjectMocks
+    private VoteController voteController;
+
+    private Poll testPoll;
+
+    @Before
+    public void setUp() {
+
+        voteController = new VoteController(voteRepository);
+        JacksonTester.initFields(this, new ObjectMapper());
+
+        mvc = MockMvcBuilders.standaloneSetup(voteController)
+                .setControllerAdvice(new ResourceNotFoundException())
+                .build();
+
+        testVote = new Vote();
+        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(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
+    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.getContentAsString(), votes.toString());
+    }
+
+    @Test
+    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
+    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);
+    }
+    }