Update API Integration Tests

Author: teetangh

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

@@ -18,6 +18,7 @@
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.dao.DataRetrievalFailureException;
+import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -111,26 +112,24 @@ void testUpdateAirline() {
                                 .callsign("TEST")
                                 .country("United States")
                                 .build();
-                restTemplate.postForEntity("/api/v1/airline/" + airline.getId(), airline,
-                                Airline.class);
-                
+                restTemplate.postForEntity("/api/v1/airline/" + airline.getId(), airline, Airline.class);
+
                 Airline updatedAirline = Airline.builder()
                                 .id("airline_update")
                                 .type("airline")
-                                .name("Updated Airline")
-                                .iata("Updated TA")
-                                .icao("Updated TST")
-                                .callsign("Updated TEST")
-                                .country("France")
+                                .name("Updated Test Airline")
+                                .iata("TA")
+                                .icao("TST")
+                                .callsign("TEST")
+                                .country("United States")
                                 .build();
-                restTemplate.put("/api/v1/airline/" + updatedAirline.getId(), updatedAirline);
 
-                ResponseEntity<Airline> response = restTemplate
-                                .getForEntity("/api/v1/airline/" + updatedAirline.getId(),
-                                                Airline.class);
+                HttpEntity<Airline> requestEntity = new HttpEntity<>(updatedAirline);
+                ResponseEntity<Airline> responseEntity = restTemplate.exchange("/api/v1/airline/" + updatedAirline.getId(),
+                                HttpMethod.PUT, requestEntity, Airline.class);
 
-                assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
-                Airline retrievedAirline = response.getBody();
+                assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
+                Airline retrievedAirline = responseEntity.getBody();
                 assert retrievedAirline != null;
                 assertThat(retrievedAirline).isEqualTo(updatedAirline);
         }

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

@@ -19,6 +19,7 @@
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.dao.DataRetrievalFailureException;
+import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -103,24 +104,21 @@ void testUpdateAirport() {
                                 .airportname("Test Airport").city("Test City")
                                 .country("Test Country").faa("TST").icao("TEST")
                                 .tz("Test Timezone").geo(new Geo(1.0, 2.0, 3.0)).build();
-                restTemplate.postForEntity("/api/v1/airport/" + airport.getId(), airport,
-                                Airport.class);
+                restTemplate.postForEntity("/api/v1/airport/" + airport.getId(), airport, Airport.class);
 
                 Airport updatedAirport = Airport.builder().id("airport_update").type("airport")
                                 .airportname("Updated Test Airport").city("Updated Test City")
                                 .country("Updated Test Country").faa("TST").icao("TEST")
                                 .tz("Updated Test Timezone").geo(new Geo(1.0, 2.0, 3.0)).build();
 
-                restTemplate.put("/api/v1/airport/" + updatedAirport.getId(), updatedAirport);
-
-                ResponseEntity<Airport> response = restTemplate.getForEntity(
-                                "/api/v1/airport/" + updatedAirport.getId(),
-                                Airport.class);
+                HttpEntity<Airport> requestEntity = new HttpEntity<>(updatedAirport);
+                ResponseEntity<Airport> responseEntity = restTemplate.exchange("/api/v1/airport/" + updatedAirport.getId(),
+                                HttpMethod.PUT, requestEntity, Airport.class);
 
-                assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
-                Airport createdAirport = response.getBody();
-                assert createdAirport != null;
-                assertThat(createdAirport).isEqualTo(updatedAirport);
+                assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
+                Airport retrievedAirport = responseEntity.getBody();
+                assert retrievedAirport != null;
+                assertThat(retrievedAirport).isEqualTo(updatedAirport);
         }
 
         @Test

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

@@ -16,6 +16,7 @@
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.dao.DataRetrievalFailureException;
+import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -238,16 +239,14 @@ void testUpdateRoute() throws Exception {
                                 .distance(2881.617376098415)
                                 .build();
 
-                restTemplate.put("/api/v1/route/" + updatedRoute.getId(), updatedRoute);
+                HttpEntity<Route> requestEntity = new HttpEntity<>(updatedRoute);
+                ResponseEntity<Route> responseEntity = restTemplate.exchange("/api/v1/route/" + updatedRoute.getId(),
+                                HttpMethod.PUT, requestEntity, Route.class);
 
-                ResponseEntity<Route> response = restTemplate.getForEntity(
-                                "/api/v1/route/" + updatedRoute.getId(),
-                                Route.class);
-
-                assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
-                Route createdRoute = response.getBody();
-                assert createdRoute != null;
-                assertThat(createdRoute).isEqualTo(updatedRoute);
+                assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
+                Route retrievedRoute = responseEntity.getBody();
+                assert retrievedRoute != null;
+                assertThat(retrievedRoute).isEqualTo(updatedRoute);
         }
 
         @Test