Add ResourceAccessException to catch block in integration tests

Author: teetangh

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

@@ -17,6 +17,7 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.ResourceAccessException;
 
 import com.couchbase.client.core.error.DocumentNotFoundException;
 
@@ -43,10 +44,10 @@ private void deleteAirline(String baseUri, String airlineId) {
                         if (airlineService.getAirlineById(airlineId).isPresent()) {
                                 restTemplate.delete(baseUri + "/api/v1/airline/" + airlineId);
                         }
-                } catch (DocumentNotFoundException | DataRetrievalFailureException e) {
-                        log.error("Document not found");
+                } catch (DocumentNotFoundException | DataRetrievalFailureException | ResourceAccessException e) {
+                        log.warn("Document " + airlineId + " not present prior to test");
                 } catch (Exception e) {
-                        log.error("Error deleting test data");
+                        log.error("Error deleting test data", e.getMessage());
                 }
         }
 
@@ -69,14 +70,12 @@ private String getBaseUri() {
         @BeforeEach
         void setUp() {
                 String baseUri = getBaseUri();
-                log.info("baseUri: " + baseUri);
                 deleteTestAirlineData(baseUri);
         }
 
         @AfterEach
         void tearDown() {
                 String baseUri = getBaseUri();
-                log.info("baseUri: " + baseUri);
                 deleteTestAirlineData(baseUri);
         }
 

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

@@ -18,6 +18,7 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.ResourceAccessException;
 
 import com.couchbase.client.core.error.DocumentNotFoundException;
 
@@ -44,10 +45,10 @@ private void deleteAirport(String baseUri, String airportId) {
                         if (airportService.getAirportById(airportId).isPresent()) {
                                 restTemplate.delete(baseUri + "/api/v1/airport/" + airportId);
                         }
-                } catch (DocumentNotFoundException | DataRetrievalFailureException e) {
-                        log.error("Document not found");
+                } catch (DocumentNotFoundException | DataRetrievalFailureException | ResourceAccessException e) {
+                        log.warn("Document " + airportId + " not present prior to test");
                 } catch (Exception e) {
-                        log.error("Error deleting test data");
+                        log.error("Error deleting test data", e.getMessage());
                 }
         }
 
@@ -70,14 +71,12 @@ private String getBaseUri() {
         @BeforeEach
         void setUp() {
                 String baseUri = getBaseUri();
-                log.info("baseUri: " + baseUri);
                 deleteTestAirportData(baseUri);
         }
 
         @AfterEach
         void tearDown() {
                 String baseUri = getBaseUri();
-                log.info("baseUri: " + baseUri);
                 deleteTestAirportData(baseUri);
         }
 

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

@@ -20,6 +20,7 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.ResourceAccessException;
 
 import com.couchbase.client.core.error.DocumentNotFoundException;
 
@@ -46,10 +47,10 @@ private void deleteRoute(String baseUri, String routeId) {
                         if (routeService.getRouteById(routeId).isPresent()) {
                                 restTemplate.delete(baseUri + "/api/v1/route/" + routeId);
                         }
-                } catch (DocumentNotFoundException | DataRetrievalFailureException e) {
-                        log.error("Document not found");
+                } catch (DocumentNotFoundException | DataRetrievalFailureException | ResourceAccessException e) {
+                        log.warn("Document " + routeId + " not present prior to test");
                 } catch (Exception e) {
-                        log.error("Error deleting test data");
+                        log.error("Error deleting test data", e.getMessage());
                 }
         }
 
@@ -72,14 +73,12 @@ private String getBaseUri() {
         @BeforeEach
         void setUp() {
                 String baseUri = getBaseUri();
-                log.info("baseUri: " + baseUri);
                 deleteTestRouteData(baseUri);
         }
 
         @AfterEach
         void tearDown() {
                 String baseUri = getBaseUri();
-                log.info("baseUri: " + baseUri);
                 deleteTestRouteData(baseUri);
         }