Remove our own API client

ibi-group · Aug 10, 2023 · 3952618 · 3952618
1 parent 6071055
commit 3952618
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 174 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1011,7 +1011,7 @@
         <dependency>
             <groupId>org.opentripplanner</groupId>
             <artifactId>otp-client</artifactId>
-            <version>0.0.5</version>
+            <version>0.0.7</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/src/test/java/org/opentripplanner/smoketest/SeattleSmokeTest.java b/src/test/java/org/opentripplanner/smoketest/SeattleSmokeTest.java
@@ -16,8 +16,7 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.client.model.Coordinate;
-import org.opentripplanner.client.model.RequestMode;
-import org.opentripplanner.smoketest.util.GraphQLClient;
+import org.opentripplanner.client.model.Route;
 import org.opentripplanner.smoketest.util.SmokeTestRequest;
 
 @Tag("smoke-test")
@@ -50,14 +49,17 @@ public void flexAndTransit() {
 
   @Test
   public void monorailRoute() {
-    var modes = GraphQLClient
-      .routes()
-      .stream()
-      .map(GraphQLClient.Route::mode)
-      .map(Objects::toString)
-      .collect(Collectors.toSet());
-
-    assertEquals(Set.of("MONORAIL", "TRAM", "FERRY", "BUS"), modes);
+    try {
+      Set<Object> modes = SmokeTest.API_CLIENT
+        .routes()
+        .stream()
+        .map(Route::mode)
+        .map(Objects::toString)
+        .collect(Collectors.toSet());
+      assertEquals(Set.of("MONORAIL", "TRAM", "FERRY", "BUS"), modes);
+    } catch (IOException | InterruptedException e) {
+      throw new RuntimeException(e);
+    }
   }
 
   @Test

diff --git a/src/test/java/org/opentripplanner/smoketest/SmokeTest.java b/src/test/java/org/opentripplanner/smoketest/SmokeTest.java
@@ -23,8 +23,8 @@
 import org.opentripplanner.client.OtpApiClient;
 import org.opentripplanner.client.model.TripPlan;
 import org.opentripplanner.client.model.TripPlan.Itinerary;
+import org.opentripplanner.client.model.VehicleRentalStation;
 import org.opentripplanner.model.fare.ItineraryFares;
-import org.opentripplanner.smoketest.util.GraphQLClient;
 import org.opentripplanner.smoketest.util.SmokeTestRequest;
 
 /**
@@ -38,6 +38,10 @@
 public class SmokeTest {
 
   public static final ObjectMapper mapper;
+  public static final OtpApiClient API_CLIENT = new OtpApiClient(
+    ZoneId.of("America/New_York"),
+    "http://localhost:8080"
+  );
 
   static {
     var provider = new JSONObjectMapperProvider();
@@ -67,8 +71,12 @@ public static LocalDate nextMonday() {
   }
 
   public static void assertThatThereAreVehicleRentalStations() {
-    var stations = GraphQLClient.vehicleRentalStations();
-    assertFalse(stations.isEmpty(), "Found no vehicle rental stations.");
+    try {
+      List<VehicleRentalStation> stations = API_CLIENT.vehicleRentalStations();
+      assertFalse(stations.isEmpty(), "Found no vehicle rental stations.");
+    } catch (IOException | InterruptedException e) {
+      throw new RuntimeException(e);
+    }
   }
 
   /**
@@ -92,9 +100,7 @@ static void assertThatItineraryHasModes(List<Itinerary> itineraries, List<String
 
   static TripPlan basicRouteTest(SmokeTestRequest req, List<String> expectedModes) {
     try {
-      var client = new OtpApiClient(ZoneId.of("America/New_York"), "localhost:8080");
-
-      TripPlan plan = client.plan(
+      TripPlan plan = API_CLIENT.plan(
         req.from(),
         req.to(),
         SmokeTest.nextMonday().atTime(LocalTime.of(12, 0)),
@@ -112,18 +118,17 @@ static TripPlan basicRouteTest(SmokeTestRequest req, List<String> expectedModes)
   }
 
   static void assertThereArePatternsWithVehiclePositions() {
-    GraphQLClient.VehiclePositionResponse positions = GraphQLClient.patternWithVehiclePositionsQuery();
-
-    var vehiclePositions = positions
-      .patterns()
-      .stream()
-      .flatMap(p -> p.vehiclePositions().stream())
-      .toList();
+    try {
+      var patterns = API_CLIENT.patterns();
+      var vehiclePositions = patterns.stream().flatMap(p -> p.vehiclePositions().stream()).toList();
 
-    assertFalse(
-      vehiclePositions.isEmpty(),
-      "Found no patterns that have realtime vehicle positions."
-    );
+      assertFalse(
+        vehiclePositions.isEmpty(),
+        "Found no patterns that have realtime vehicle positions."
+      );
+    } catch (IOException | InterruptedException e) {
+      throw new RuntimeException(e);
+    }
   }
 
   /**

diff --git a/src/test/java/org/opentripplanner/smoketest/util/GraphQLClient.java b/src/test/java/org/opentripplanner/smoketest/util/GraphQLClient.java