diff --git a/src/main/java/com/mrxgrc/inventory/controller/ItemController.java b/src/main/java/com/mrxgrc/inventory/controller/ItemController.java index 653acbe..87dce9b 100644 --- a/src/main/java/com/mrxgrc/inventory/controller/ItemController.java +++ b/src/main/java/com/mrxgrc/inventory/controller/ItemController.java @@ -3,11 +3,13 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController public class ItemController { @GetMapping("/items") - public String getItems() { - return "List of items"; + public List getItems() { + return List.of("Items", "Items2"); } } diff --git a/src/test/java/com/mrxgrc/inventory/ItemControllerTest.java b/src/test/java/com/mrxgrc/inventory/ItemControllerTest.java index da73a3d..464dadc 100644 --- a/src/test/java/com/mrxgrc/inventory/ItemControllerTest.java +++ b/src/test/java/com/mrxgrc/inventory/ItemControllerTest.java @@ -4,8 +4,11 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import static org.hamcrest.Matchers.equalTo; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -17,10 +20,11 @@ public class ItemControllerTest { private MockMvc mockMvc; @Test - void getItemsReturnsListofItems() throws Exception{ - this.mockMvc.perform(get("/items")) + public void getItemsReturnsListofItems() throws Exception{ + this.mockMvc.perform(MockMvcRequestBuilders.get("/items").accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) - .andExpect(content().string("List of items")); + .andExpect(content().contentType(MediaType.APPLICATION_JSON)) + .andExpect(content().json("[\"Items\", \"Items2\"]")); }