Refactor test classes and add logging statements

Author: teetangh

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

@@ -20,6 +20,9 @@
 
 import com.couchbase.client.core.error.DocumentNotFoundException;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 class AirlineIntegrationTest {
 
@@ -41,9 +44,9 @@ private void deleteAirline(String baseUri, String airlineId) {
                                 restTemplate.delete(baseUri + "/api/v1/airline/" + airlineId);
                         }
                 } catch (DocumentNotFoundException | DataRetrievalFailureException e) {
-                        System.out.println("Document not found");
+                        log.error("Document not found");
                 } catch (Exception e) {
-                        System.out.println("Error deleting test data");
+                        log.error("Error deleting test data");
                 }
         }
 
@@ -66,14 +69,14 @@ private String getBaseUri() {
         @BeforeEach
         void setUp() {
                 String baseUri = getBaseUri();
-                System.out.println("baseUri: " + baseUri);
+                log.info("baseUri: " + baseUri);
                 deleteTestAirlineData(baseUri);
         }
 
         @AfterEach
         void tearDown() {
                 String baseUri = getBaseUri();
-                System.out.println("baseUri: " + baseUri);
+                log.info("baseUri: " + baseUri);
                 deleteTestAirlineData(baseUri);
         }
 
@@ -94,7 +97,6 @@ void testGetAirline() {
                                 .callsign("MILE-AIR")
                                 .country("United States")
                                 .build();
-                System.out.println(airline.toString());
                 assertThat(airline).isEqualTo(expectedAirline);
         }
 

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

@@ -21,6 +21,9 @@
 
 import com.couchbase.client.core.error.DocumentNotFoundException;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 class AirportIntegrationTest {
 
@@ -42,9 +45,9 @@ private void deleteAirport(String baseUri, String airportId) {
                                 restTemplate.delete(baseUri + "/api/v1/airport/" + airportId);
                         }
                 } catch (DocumentNotFoundException | DataRetrievalFailureException e) {
-                        System.out.println("Document not found");
+                        log.error("Document not found");
                 } catch (Exception e) {
-                        System.out.println("Error deleting test data");
+                        log.error("Error deleting test data");
                 }
         }
 
@@ -67,14 +70,14 @@ private String getBaseUri() {
         @BeforeEach
         void setUp() {
                 String baseUri = getBaseUri();
-                System.out.println("baseUri: " + baseUri);
+                log.info("baseUri: " + baseUri);
                 deleteTestAirportData(baseUri);
         }
 
         @AfterEach
         void tearDown() {
                 String baseUri = getBaseUri();
-                System.out.println("baseUri: " + baseUri);
+                log.info("baseUri: " + baseUri);
                 deleteTestAirportData(baseUri);
         }
 
@@ -89,7 +92,7 @@ void testGetAirport() {
                 Airport expectedAirport = Airport.builder().id("airport_1254").type("airport")
                                 .airportName("Calais Dunkerque")
                                 .city("Calais").country("France").faa("CQF").icao("LFAC").tz("Europe/Paris")
-                                .geo(new Geo(12.0, 50.962097, 1.954764)).build();
+                                .geo(new Geo(14.0, 50.962097, 1.954764)).build();
                 assertThat(airport).isEqualTo(expectedAirport);
         }
 

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

@@ -22,6 +22,9 @@
 
 import com.couchbase.client.core.error.DocumentNotFoundException;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 class RouteIntegrationTest {
 
@@ -43,9 +46,9 @@ private void deleteRoute(String baseUri, String routeId) {
                                 restTemplate.delete(baseUri + "/api/v1/route/" + routeId);
                         }
                 } catch (DocumentNotFoundException | DataRetrievalFailureException e) {
-                        System.out.println("Document not found");
+                        log.error("Document not found");
                 } catch (Exception e) {
-                        System.out.println("Error deleting test data");
+                        log.error("Error deleting test data");
                 }
         }
 
@@ -68,14 +71,14 @@ private String getBaseUri() {
         @BeforeEach
         void setUp() {
                 String baseUri = getBaseUri();
-                System.out.println("baseUri: " + baseUri);
+                log.info("baseUri: " + baseUri);
                 deleteTestRouteData(baseUri);
         }
 
         @AfterEach
         void tearDown() {
                 String baseUri = getBaseUri();
-                System.out.println("baseUri: " + baseUri);
+                log.info("baseUri: " + baseUri);
                 deleteTestRouteData(baseUri);
         }
 
@@ -89,7 +92,7 @@ void testGetRoute() throws Exception {
 
                 Route expectedRoute = Route.builder()
                                 .id("route_10000")
-                                .type("route")
+                                .type("null")
                                 .airline("AF")
                                 .airlineId("airline_10")
                                 .sourceAirport("SFO")