Add try/catch to find the problem of the flaky test

mfdz · Feb 10, 2022 · 2f02051 · 2f02051
1 parent ed0437b
commit 2f02051
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptor/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptor/router/TransitRouter.java
@@ -1,6 +1,5 @@
 package org.opentripplanner.routing.algorithm.raptor.router;
 
-import java.time.Duration;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -178,13 +177,7 @@ private AccessEgresses getAccessEgresses(
                         CompletableFuture.runAsync(egressCalculator)
                 ).join();
             } catch (CompletionException e) {
-                if (e.getCause() instanceof RoutingValidationException) {
-                    throw (RoutingValidationException) e.getCause();
-                } else if (e.getCause() instanceof RuntimeException) {
-                    LOG.warn("Unknown exception from access/egress calculation", e.getCause());
-                    throw (RuntimeException) e.getCause();
-                }
-                throw e;
+                RoutingValidationException.unwrapAndRethrowCompletionException(e);
             }
         } else {
             accessCalculator.run();

diff --git a/src/main/java/org/opentripplanner/routing/error/RoutingValidationException.java b/src/main/java/org/opentripplanner/routing/error/RoutingValidationException.java
@@ -1,5 +1,6 @@
 package org.opentripplanner.routing.error;
 
+import java.util.concurrent.CompletionException;
 import org.opentripplanner.routing.api.response.RoutingError;
 
 import java.util.List;
@@ -21,4 +22,13 @@ public RoutingValidationException(List<RoutingError> routingErrors) {
   public List<RoutingError> getRoutingErrors() {
     return routingErrors;
   }
+
+  public static void unwrapAndRethrowCompletionException(CompletionException e) {
+    if (e.getCause() instanceof RoutingValidationException) {
+      throw (RoutingValidationException) e.getCause();
+    } else if (e.getCause() instanceof RuntimeException) {
+      throw (RuntimeException) e.getCause();
+    }
+    throw e;
+  }
 }
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/BikeRentalSnapshotTest.java b/src/test/java/org/opentripplanner/routing/algorithm/mapping/BikeRentalSnapshotTest.java
@@ -3,6 +3,7 @@
 import au.com.origin.snapshots.junit5.SnapshotExtension;
 import java.util.Locale;
 import java.util.Set;
+import java.util.concurrent.CompletionException;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
@@ -15,6 +16,7 @@
 import org.opentripplanner.routing.api.request.RequestModes;
 import org.opentripplanner.routing.api.request.RoutingRequest;
 import org.opentripplanner.routing.api.request.StreetMode;
+import org.opentripplanner.routing.error.RoutingValidationException;
 
 @ExtendWith(SnapshotExtension.class)
 @ResourceLock(Resources.LOCALE)
@@ -105,7 +107,11 @@ public void directBikeRental() {
         request.from = p1;
         request.to = p3;
 
-        expectArriveByToMatchDepartAtAndSnapshot(request);
+        try {
+            expectArriveByToMatchDepartAtAndSnapshot(request);
+        } catch (CompletionException e) {
+            RoutingValidationException.unwrapAndRethrowCompletionException(e);
+        }
     }
 
     @DisplayName("Egress BIKE_RENTAL")