commit 76f17f42859cc83d0890b211829d9bfc515dcffb
author Henrique Nakashima <hnakashima@chromium.org> Thu May 23 22:18:24 2024
committer Copybara-Service <copybara-worker@google.com> Fri May 24 00:31:11 2024
tree 7fa8fb14ccc2bb9300ebea366e609fc277bff5db
parent 37d952f0cc33cdb2cb48484c2e91bc76fd92ca03

[Android] Wrap preCheck() exceptions with TravelException

This allows PublicTransitConfig.setFreezeOnException() and
setOnExceptionCallback() to trigger when pre-checks fail.

Bug: None
Change-Id: I3fbc50ffc68111b8240e302dd2f4d0a77433a892
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5544830
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1305335}
NOKEYCHECK=True
GitOrigin-RevId: f327e3bf2a82e76105f4c74dfbfdf8345b2b3e18

test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckIn.java

diff --git a/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckIn.java b/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckIn.java
index 525d10e..157729e 100644
--- a/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckIn.java
+++ b/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckIn.java
@@ -8,6 +8,7 @@
 
 import org.chromium.base.Log;
 import org.chromium.base.test.transit.ConditionWaiter.ConditionWait;
+import org.chromium.base.test.util.CriteriaNotSatisfiedException;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,7 +38,11 @@
         // and FacilityCheckOut#exitSync().
         onBeforeTransition();
         mWaits = createWaits();
-        ConditionWaiter.preCheck(mWaits, mOptions, mTrigger);
+        try {
+            ConditionWaiter.preCheck(mWaits, mOptions, mTrigger);
+        } catch (CriteriaNotSatisfiedException e) {
+            throw newTransitionException(e);
+        }
         for (ConditionWait wait : mWaits) {
             wait.getCondition().onStartMonitoring();
         }

test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckOut.java

diff --git a/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckOut.java b/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckOut.java
index fb4b371..06f1fe8 100644
--- a/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckOut.java
+++ b/test/android/javatests/src/org/chromium/base/test/transit/FacilityCheckOut.java
@@ -8,6 +8,7 @@
 
 import org.chromium.base.Log;
 import org.chromium.base.test.transit.ConditionWaiter.ConditionWait;
+import org.chromium.base.test.util.CriteriaNotSatisfiedException;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -38,7 +39,11 @@
         // and FacilityCheckOut#exitSync().
         onBeforeTransition();
         mWaits = createWaits();
-        ConditionWaiter.preCheck(mWaits, mOptions, mTrigger);
+        try {
+            ConditionWaiter.preCheck(mWaits, mOptions, mTrigger);
+        } catch (CriteriaNotSatisfiedException e) {
+            throw newTransitionException(e);
+        }
         for (ConditionWait wait : mWaits) {
             wait.getCondition().onStartMonitoring();
         }

test/android/javatests/src/org/chromium/base/test/transit/Trip.java

diff --git a/test/android/javatests/src/org/chromium/base/test/transit/Trip.java b/test/android/javatests/src/org/chromium/base/test/transit/Trip.java
index ba79394..23bf0e1 100644
--- a/test/android/javatests/src/org/chromium/base/test/transit/Trip.java
+++ b/test/android/javatests/src/org/chromium/base/test/transit/Trip.java
@@ -9,6 +9,7 @@
 import org.chromium.base.Log;
 import org.chromium.base.test.transit.ConditionWaiter.ConditionWait;
 import org.chromium.base.test.transit.ConditionalState.Phase;
+import org.chromium.base.test.util.CriteriaNotSatisfiedException;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -79,7 +80,11 @@
         mDestination.setStateTransitioningTo();
 
         mWaits = calculateConditionWaits(mOrigin, mDestination, getTransitionConditions());
-        ConditionWaiter.preCheck(mWaits, mOptions, mTrigger);
+        try {
+            ConditionWaiter.preCheck(mWaits, mOptions, mTrigger);
+        } catch (CriteriaNotSatisfiedException e) {
+            throw newTransitionException(e);
+        }
         for (ConditionWait wait : mWaits) {
             wait.getCondition().onStartMonitoring();
         }