Refactor test code and update dependencies

Author: teetangh

.github/workflows/tests.yaml

@@ -41,8 +41,10 @@ jobs:
       - name: Run Maven Tests
         id: run
         run: |
-            mvn test "-Dtest=org.couchbase.quickstart.springdata.controllers.*Test"
-
+            chmod +x mvnw
+            ./mvnw clean
+            ./mvnw test "-Dtest=org.couchbase.quickstart.springdata.controllers.*Test" -X
+            
       - name: Report Status
         if: always()
         uses: ravsamhq/notify-slack-action@v1

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

@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -222,27 +223,22 @@ void testListAirlinesByCountry() {
 
         @Test
         void testListAirlinesByDestinationAirport() {
-                Map<String, List<Airline>> expectedAirlinesByDestination = Map.of(
-                                "SFO", Arrays.asList(
-                                                Airline.builder().id("3029").type("airline").name("JetBlue Airways")
-                                                                .iata("B6").icao("JBU")
-                                                                .callsign("JETBLUE").country("United States").build(),
-                                                Airline.builder().id("1355").type("airline").name("British Airways")
-                                                                .iata("BA").icao("BAW")
-                                                                .callsign("SPEEDBIRD").country("United Kingdom")
-                                                                .build()),
-                                // Add more expected airlines for SFO
-                                "MRS", Arrays.asList(
-                                                Airline.builder().id("137").type("airline").name("Air France")
-                                                                .iata("AF").icao("AFR")
-                                                                .callsign("AIRFRANS").country("France").build(),
-                                                Airline.builder().id("24").type("airline").name("American Airlines")
-                                                                .iata("AA").icao("AAL").callsign("AMERICAN")
-                                                                .country("United States").build()
-                                // Add more expected airlines for MRS
-                                )
-                // Add more airports and their expected airlines as needed
-                );
+                Map<String, List<Airline>> expectedAirlinesByDestination = new HashMap<>();
+
+                expectedAirlinesByDestination.put("SFO", Arrays.asList(
+                                Airline.builder().id("3029").type("airline").name("JetBlue Airways")
+                                                .iata("B6").icao("JBU").callsign("JETBLUE").country("United States")
+                                                .build(),
+                                Airline.builder().id("1355").type("airline").name("British Airways")
+                                                .iata("BA").icao("BAW").callsign("SPEEDBIRD").country("United Kingdom")
+                                                .build()));
+
+                expectedAirlinesByDestination.put("MRS", Arrays.asList(
+                                Airline.builder().id("137").type("airline").name("Air France")
+                                                .iata("AF").icao("AFR").callsign("AIRFRANS").country("France").build(),
+                                Airline.builder().id("24").type("airline").name("American Airlines")
+                                                .iata("AA").icao("AAL").callsign("AMERICAN").country("United States")
+                                                .build()));
 
                 int limit = 10;
                 int offset = 0;

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

@@ -3,6 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -149,11 +150,16 @@ void testListAirports() {
         @Test
         void testListDirectConnections() {
                 List<String> destinationAirportCodes = Arrays.asList("SFO", "LAX", "JFK", "MRS");
-                Map<String, List<String>> expectedDirectConnections = Map.of(
-                                "SFO", Arrays.asList("JFK", "HKG", "ICN", "ATL", "BJX", "GDL", "MEX", "MLM", "PVR", "SJD"),
-                                "LAX", Arrays.asList("NRT", "CUN", "GDL", "HMO", "MEX", "MZT", "PVR", "SJD", "ZIH", "ZLO"),
-                                "JFK", Arrays.asList("DEL", "LHR", "EZE", "ATL", "CUN", "MEX", "EZE", "LAX", "SAN", "SEA"),
-                                "MRS", Arrays.asList("AAE", "ALG", "BJA", "BLJ", "CZL", "ORN", "QSF", "TLM", "CDG", "CMN"));
+
+                Map<String, List<String>> expectedDirectConnections = new HashMap<>();
+                expectedDirectConnections.put("SFO",
+                                Arrays.asList("JFK", "HKG", "ICN", "ATL", "BJX", "GDL", "MEX", "MLM", "PVR", "SJD"));
+                expectedDirectConnections.put("LAX",
+                                Arrays.asList("NRT", "CUN", "GDL", "HMO", "MEX", "MZT", "PVR", "SJD", "ZIH", "ZLO"));
+                expectedDirectConnections.put("JFK",
+                                Arrays.asList("DEL", "LHR", "EZE", "ATL", "CUN", "MEX", "EZE", "LAX", "SAN", "SEA"));
+                expectedDirectConnections.put("MRS",
+                                Arrays.asList("AAE", "ALG", "BJA", "BLJ", "CZL", "ORN", "QSF", "TLM", "CDG", "CMN"));
 
                 for (String airportCode : destinationAirportCodes) {
                         int limit = 10;