increased test coverage for news

server/pom.xml

@@ -51,13 +51,6 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
-
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20180130</version>
-		</dependency>
-
 	</dependencies>
 
 	<build>

server/src/main/java/com/stockr/server/exception/MissingQueryParameters.java

@@ -0,0 +1,9 @@
+package com.stockr.server.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(value = HttpStatus.BAD_REQUEST)
+public class MissingQueryParameters extends RuntimeException{
+
+}

server/src/main/java/com/stockr/server/news/NewsController.java

@@ -1,19 +1,19 @@
 package com.stockr.server.news;
 
+import com.stockr.server.exception.MissingQueryParameters;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
-import java.util.List;
 
 @RestController
+@RequestMapping("news")
 public class NewsController {
     @Autowired
     NewsService ns;
 
-    @GetMapping("/news")
-    public ArrayList<Article> getAllArticles() {
-        return ns.getAllArticles();
+    @GetMapping// root
+    public ArrayList<Article> getAllArticles(@RequestParam("query") String query) throws MissingQueryParameters{
+        return ns.getAllArticles(query);
     }
 }

server/src/main/java/com/stockr/server/news/NewsService.java

@@ -1,6 +1,10 @@
 package com.stockr.server.news;
 
 import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
@@ -8,24 +12,42 @@ import java.util.ArrayList;
 
 @Service
 public class NewsService {
-    private final String url = "https://newsapi.org/v2/everything?q=facebook" +
-            "&language=en" +
-            "&sources=bloomberg,business-insider,cnbc,the-wall-street-journal" +
-            "&pageSize=100" +
-            "&apiKey=";
-    // TODO - http header "X-Api-Key": "key"
+    // TODO - hide key(?)
     private final String key = "471b872d96ca40c4a1d0f21de4bb061e";
     private final RestTemplate rt;
+    private HttpEntity entity;
 
     public NewsService(RestTemplateBuilder rtb) {
+        initHeaders();
         rt = rtb.build();
     }
 
-    public News getNews() {
-        return rt.getForObject(url + key, News.class);
+    private void initHeaders() {
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("X-Api-Key", key);
+        entity = new HttpEntity(headers);
     }
 
-    public ArrayList<Article> getAllArticles() {
-        return getNews().getArticles();
+    News getNews(String query) {
+        ResponseEntity<News> re = rt.exchange(
+                insertQueryInUrl(query),
+                HttpMethod.GET,
+                entity,
+                News.class
+        );
+        News n = re.getBody();
+        return n;
+    }
+
+    ArrayList<Article> getAllArticles(String query) {
+        return getNews(query)
+                .getArticles();
+    }
+
+    String insertQueryInUrl(String query) {
+        return  "https://newsapi.org/v2/everything?q=" + query +
+                "&language=en" +
+                "&sources=bloomberg,business-insider,cnbc,the-wall-street-journal" +
+                "&pageSize=100";
     }
 }

server/src/test/java/com/stockr/server/news/ArticleTest.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
 
 import java.io.IOException;
-import java.util.ArrayList;
 
 import static org.junit.Assert.*;
 

server/src/test/java/com/stockr/server/news/NewsControllerTest.java

@@ -0,0 +1,51 @@
+package com.stockr.server.news;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.handler;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+
+@RunWith(SpringRunner.class)
+@WebMvcTest(NewsController.class)
+public class NewsControllerTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @MockBean
+    private NewsService service;
+
+    @Test
+    public void news_Should_Use_Method_getAllArticles() throws Exception {
+        when(service.getNews("test")).thenReturn(new News());
+        this.mockMvc.perform(get("/news?query=fb"))
+                .andDo(print())
+                .andExpect(handler().methodName("getAllArticles"));
+    }
+
+    @Test
+    public void news_Should_Return_A_Json_Array() throws Exception {
+        when(service.getNews("test")).thenReturn(new News());
+        this.mockMvc.perform(get("/news?query=fb"))
+                .andDo(print())
+                .andExpect(content().string("[]"));
+    }
+
+    @Test
+    public void news_When_No_Queries_Throw_Exception() throws Exception {
+        when(service.getNews("test")).thenReturn(new News());
+        this.mockMvc.perform(get("/news"))
+                .andDo(print())
+                .andExpect(content().string("[]"));
+    }
+}

server/src/test/java/com/stockr/server/news/NewsServiceTest.java

@@ -2,26 +2,25 @@ package com.stockr.server.news;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.hamcrest.Matchers;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.client.RestClientTest;
 import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.client.MockRestServiceServer;
-import org.springframework.web.client.RestTemplate;
 
-import javax.print.attribute.standard.Media;
-import java.awt.*;
 import java.util.ArrayList;
 
 import static org.junit.Assert.*;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.header;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
 import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
 import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
 
@@ -37,36 +36,64 @@ public class NewsServiceTest {
     @Autowired
     private ObjectMapper om;
 
+    private String JSON;
+
     @Before
     public void setUp() throws JsonProcessingException {
+        setUpJsonResponse();
+        setUpMrss();
+    }
+
+    private void setUpMrss() {
+        mrss.expect(requestTo(ns.insertQueryInUrl("test")))
+                .andExpect(method(HttpMethod.GET))
+                .andExpect(header("X-Api-Key", Matchers.containsString("")))
+                .andRespond(withSuccess(JSON, MediaType.APPLICATION_JSON));
+    }
+
+    private void setUpJsonResponse() throws JsonProcessingException {
         ArrayList<Article> al = new ArrayList<>();
         Article a = new Article();
         a.setAuthor("Author Name");
         al.add(a);
         News n = new News();
         n.setArticles(al);
+        JSON = om.writeValueAsString(n);
+    }
 
-        String nstr = om.writeValueAsString(n);
-        String url = "https://newsapi.org/v2/everything?q=bitcoin&apiKey=";
-        String key = "471b872d96ca40c4a1d0f21de4bb061e";
+    @Test
+    public void getNews_Should_Hit_The_Proper_Endpoint() {
+        ns.getNews("test");
+        mrss.verify();
+    }
 
-        this.mrss.expect(requestTo(url + key))
-                .andRespond(withSuccess(nstr, MediaType.APPLICATION_JSON));
+    @Test
+    public void getNews_Should_Send_XApiKey_Header() {
+        ns.getNews("test");
+        mrss.verify();
     }
+
     @Test
-    public void getNewsTest() {
-        News ne = this.ns.getNews();
+    public void getNews_Should_Parse_The_JSON_Properly() {
+        News ne = ns.getNews("test");
         assertEquals("Author Name", ne.getArticles().get(0).getAuthor());
     }
 
     @Test
-    @Ignore
-    public void test() {
-        RestTemplateBuilder rt = new RestTemplateBuilder();
-        NewsService ns = new NewsService(rt);
+    public void getAllArticles_Should_Return_An_ArrayList() {
+        ArrayList ne = ns.getAllArticles("test");
+        assertNotNull(ne);
+    }
 
-        ArrayList<Article> ne = ns.getAllArticles();
-        System.out.println(ne);
 
+    @Test
+    public void insertQueryInUrl_Given_Query_Should_Insert_In_Url() {
+        String query = "tesla";
+        String expected = "https://newsapi.org/v2/everything?q=" + query +
+                "&language=en" +
+                "&sources=bloomberg,business-insider,cnbc,the-wall-street-journal" +
+                "&pageSize=100";
+        String actual = ns.insertQueryInUrl(query);
+        assertEquals(expected, actual);
     }
 }