Refactor integration tests to use RestResponsePage

Author: teetangh

src/main/java/org/couchbase/quickstart/springdata/models/RestResponsePage.java

@@ -0,0 +1,40 @@
+package org.couchbase.quickstart.springdata.models;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.JsonNode;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RestResponsePage<T> extends PageImpl<T> {
+    @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+    public RestResponsePage(@JsonProperty("content") List<T> content,
+            @JsonProperty("number") int number,
+            @JsonProperty("size") int size,
+            @JsonProperty("totalElements") Long totalElements,
+            @JsonProperty("pageable") JsonNode pageable,
+            @JsonProperty("last") boolean last,
+            @JsonProperty("totalPages") int totalPages,
+            @JsonProperty("sort") JsonNode sort,
+            @JsonProperty("first") boolean first,
+            @JsonProperty("numberOfElements") int numberOfElements) {
+
+        super(content, PageRequest.of(number, size), totalElements);
+    }
+
+    public RestResponsePage(List<T> content, Pageable pageable, long total) {
+        super(content, pageable, total);
+    }
+
+    public RestResponsePage(List<T> content) {
+        super(content);
+    }
+
+    public RestResponsePage() {
+        super(new ArrayList<>());
+    }
+}

src/test/java/org/couchbase/quickstart/springdata/controllers/AirlineIntegrationTest.java

@@ -2,16 +2,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.List;
-
 import org.couchbase.quickstart.springdata.models.Airline;
+import org.couchbase.quickstart.springdata.models.RestResponsePage;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.data.domain.Page;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -95,13 +93,13 @@ void testDeleteAirline() {
 
     @Test
     void testListAirlines() {
-        ResponseEntity<Page<Airline>> response = restTemplate.exchange(
+        ResponseEntity<RestResponsePage<Airline>> response = restTemplate.exchange(
                 "http://localhost:" + port + "/api/v1/airline/list", HttpMethod.GET, null,
-                new ParameterizedTypeReference<Page<Airline>>() {
+                new ParameterizedTypeReference<RestResponsePage<Airline>>() {
                 });
         assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
 
-        Page<Airline> airlines = response.getBody();
+        RestResponsePage<Airline> airlines = response.getBody();
         assertThat(airlines).isNotNull();
         assertThat(airlines.getSize()).isEqualTo(10);
 
@@ -113,16 +111,16 @@ void testListAirlinesByCountry() {
         // airline_10226{"id":10226,"type":"airline","name":"Atifly","iata":"A1","icao":"A1F","callsign":"atifly","country":"United
         // States"}
         String country = "United States";
-        ResponseEntity<Page<Airline>> response = restTemplate.exchange(
+        ResponseEntity<RestResponsePage<Airline>> response = restTemplate.exchange(
                 "http://localhost:" + port + "/api/v1/airline/country/" + country,
-                HttpMethod.GET, null, new ParameterizedTypeReference<Page<Airline>>() {
+                HttpMethod.GET, null, new ParameterizedTypeReference<RestResponsePage<Airline>>() {
                 });
         assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
 
-        Page<Airline> airlines = response.getBody();
-        Airline airline = airlines.stream().filter(a -> a.getId().equals("10226")).findFirst().orElse(null);
+        RestResponsePage<Airline> airlines = response.getBody();
+        Airline airline = airlines.stream().filter(a -> a.getId().equals("airline_10226")).findFirst().orElse(null);
         assertThat(airline).isNotNull();
-        assertThat(airline.getId()).isEqualTo("10226");
+        assertThat(airline.getId()).isEqualTo("airline_10226");
         assertThat(airline.getType()).isEqualTo("airline");
         assertThat(airline.getName()).isEqualTo("Atifly");
         assertThat(airline.getIata()).isEqualTo("A1");
@@ -134,16 +132,16 @@ void testListAirlinesByCountry() {
         // Austral","iata":"UU","icao":"REU","callsign":"REUNION","country":"France"}
 
         country = "France";
-        ResponseEntity<Page<Airline>> response2 = restTemplate.exchange(
+        ResponseEntity<RestResponsePage<Airline>> response2 = restTemplate.exchange(
                 "http://localhost:" + port + "/api/v1/airline/country/" + country,
-                HttpMethod.GET, null, new ParameterizedTypeReference<Page<Airline>>() {
+                HttpMethod.GET, null, new ParameterizedTypeReference<RestResponsePage<Airline>>() {
                 });
         assertThat(response2.getStatusCode()).isEqualTo(HttpStatus.OK);
 
-        Page<Airline> airlines2 = response2.getBody();
-        Airline airline2 = airlines2.stream().filter(a -> a.getId().equals("1191")).findFirst().orElse(null);
+        RestResponsePage<Airline> airlines2 = response2.getBody();
+        Airline airline2 = airlines2.stream().filter(a -> a.getId().equals("airline_1191")).findFirst().orElse(null);
         assertThat(airline2).isNotNull();
-        assertThat(airline2.getId()).isEqualTo("1191");
+        assertThat(airline2.getId()).isEqualTo("airline_1191");
         assertThat(airline2.getType()).isEqualTo("airline");
         assertThat(airline2.getName()).isEqualTo("Air Austral");
         assertThat(airline2.getIata()).isEqualTo("UU");

src/test/java/org/couchbase/quickstart/springdata/controllers/AirportIntegrationTest.java

@@ -5,6 +5,7 @@
 import java.util.List;
 
 import org.couchbase.quickstart.springdata.models.Airport;
+import org.couchbase.quickstart.springdata.models.RestResponsePage;
 import org.couchbase.quickstart.springdata.models.Airport.Geo;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -98,12 +99,12 @@ void testDeleteAirport() throws Exception {
 
     @Test
      void testListAirports() throws Exception {
-        ResponseEntity<List<Airport>> response = restTemplate.exchange("http://localhost:" + port + "/api/v1/airport/list", HttpMethod.GET, null, new ParameterizedTypeReference<List<Airport>>() {});
+        ResponseEntity<RestResponsePage<Airport>> response = restTemplate.exchange("http://localhost:" + port + "/api/v1/airport/list", HttpMethod.GET, null, new ParameterizedTypeReference<RestResponsePage<Airport>>() {});
         assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
 
-        List<Airport> airports = response.getBody();
+        RestResponsePage<Airport> airports = response.getBody();
         assertThat(airports).isNotNull();
-        assertThat(airports.size()).isGreaterThan(100);
+        assertThat(airports.getTotalElements()).isGreaterThan(100);
     }
 
     // @Test

src/test/java/org/couchbase/quickstart/springdata/controllers/RouteIntegrationTest.java

@@ -6,6 +6,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.couchbase.quickstart.springdata.models.RestResponsePage;
 import org.couchbase.quickstart.springdata.models.Route;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -116,13 +117,13 @@ void testDeleteRoute() {
 
     @Test
     void testListRoutes() {
-        ResponseEntity<List<Route>> response = restTemplate.exchange("http://localhost:" + port + "/api/v1/route/list",
-                HttpMethod.GET, null, new ParameterizedTypeReference<List<Route>>() {
+        ResponseEntity<RestResponsePage<Route>> response = restTemplate.exchange("http://localhost:" + port + "/api/v1/route/list",
+                HttpMethod.GET, null, new ParameterizedTypeReference<RestResponsePage<Route>>() {
                 });
         assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
 
-        List<Route> routes = response.getBody();
+        RestResponsePage<Route> routes = response.getBody();
         assertThat(routes).isNotNull();
-        assertThat(routes.size()).isGreaterThan(100);
+        assertThat(routes.getTotalElements()).isGreaterThan(100);
     }
 }