From b90090ab59253f71ab6c8edc5770d9850b1e8790 Mon Sep 17 00:00:00 2001 From: Gustavo Martin Morcuende Date: Sun, 11 Dec 2016 18:51:39 +0100 Subject: [PATCH] CarControllerIntegrationTest --- .../webservices/rest/controller/CarController.java | 2 +- .../controller/CarControllerIntegrationTest.java | 21 +++++++++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/SpringJava/RxJava/web-services-spring-rxjava-server/src/main/java/de/spring/webservices/rest/controller/CarController.java b/SpringJava/RxJava/web-services-spring-rxjava-server/src/main/java/de/spring/webservices/rest/controller/CarController.java index 2e22f83..67cce2a 100644 --- a/SpringJava/RxJava/web-services-spring-rxjava-server/src/main/java/de/spring/webservices/rest/controller/CarController.java +++ b/SpringJava/RxJava/web-services-spring-rxjava-server/src/main/java/de/spring/webservices/rest/controller/CarController.java @@ -27,7 +27,7 @@ import de.spring.webservices.rest.business.service.AwesomeBusinessLogic; @RestController @RequestMapping("/api/cars/") public class CarController { - private static final Logger LOGGER = LoggerFactory.getLogger(DeferrableCarController.class); + private static final Logger LOGGER = LoggerFactory.getLogger(CompletableFutureCarController.class); private static final int PAGE = 2; private static final int PAGE_SIZE = 10; diff --git a/SpringJava/RxJava/web-services-spring-rxjava-server/src/test/java/de/spring/webservices/rest/controller/CarControllerIntegrationTest.java b/SpringJava/RxJava/web-services-spring-rxjava-server/src/test/java/de/spring/webservices/rest/controller/CarControllerIntegrationTest.java index 06ce410..053f7b9 100644 --- a/SpringJava/RxJava/web-services-spring-rxjava-server/src/test/java/de/spring/webservices/rest/controller/CarControllerIntegrationTest.java +++ b/SpringJava/RxJava/web-services-spring-rxjava-server/src/test/java/de/spring/webservices/rest/controller/CarControllerIntegrationTest.java @@ -15,7 +15,6 @@ import java.util.ArrayList; import java.util.List; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.data.domain.PageImpl; @@ -34,7 +33,8 @@ import de.spring.webservices.domain.Car; import de.spring.webservices.rest.business.service.AwesomeBusinessLogic; -@Ignore +// jsonPath, how to: https://github.com/jayway/JsonPath | http://jsonpath.herokuapp.com/ + @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration({ "classpath*:spring-configuration/mvc/rest/*.xml"}) public class CarControllerIntegrationTest { @@ -57,26 +57,21 @@ public class CarControllerIntegrationTest { public void testWhenGetAllCarsThenRetrieveJsonValues() throws Exception { final List cars = new ArrayList<>(); cars.add(new Car(1L, String.format(TEMPLATE, 1))); - cars.add(new Car(2L, String.format(TEMPLATE, 2))); - cars.add(new Car(3L, String.format(TEMPLATE, 3))); - given(awesomeBusinessLogic.findAll(new PageRequest(PAGE, PAGE_SIZE))).willReturn(new PageImpl<>(cars)); mockMvc.perform(get("/api/cars/") .accept(MediaType.APPLICATION_JSON_UTF8)) .andExpect(status().isOk()) - .andExpect(jsonPath("$[0].id", any(Integer.class))) - .andExpect(jsonPath("$[0].content", is("Car: 1"))) - .andExpect(jsonPath("$[1].content", is("Car: 2"))) - .andExpect(jsonPath("$[1].id", any(Integer.class))) - .andExpect(jsonPath("$[2].content", is("Car: 3"))) - .andExpect(jsonPath("$[2].id", any(Integer.class))) + .andExpect(jsonPath("$.content[0].id", any(Integer.class))) + .andExpect(jsonPath("$.content[0].content", is("Car: 1"))) .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8)); } @Test public void testWhenGetOneCarThenRetrieveJsonValue() throws Exception { + given(awesomeBusinessLogic.findById(1L)).willReturn(new Car(1L, String.format(TEMPLATE, 1))); + mockMvc.perform(get("/api/cars/{id}", 1L) .accept(MediaType.APPLICATION_JSON_UTF8)) @@ -88,7 +83,9 @@ public class CarControllerIntegrationTest { @Test public void testWhenCreateNewCarThenRetrieveJsonValue() throws Exception { - Car car = new Car(2L, "nothing"); + Car car = new Car(null, "nothing"); + given(awesomeBusinessLogic.create(car)).willReturn(new Car(1L, String.format(TEMPLATE, 1))); + mockMvc.perform(post("/api/cars/") .contentType(MediaType.APPLICATION_JSON_UTF8) .content(asJsonString(car)) -- 2.1.4