From 0e051c27c473c84efa2f1733cdef47ca7fdb56a7 Mon Sep 17 00:00:00 2001 From: Thomas Leing Date: Mon, 12 Dec 2022 16:24:12 -0500 Subject: [PATCH 1/2] Increase Geo timeout so that it runs successfully on a Pixel 3a XL --- .../testutils/sync/SynchronousGeo.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/testutils/src/main/java/com/amplifyframework/testutils/sync/SynchronousGeo.java b/testutils/src/main/java/com/amplifyframework/testutils/sync/SynchronousGeo.java index d800a79133..42d6bf4d5f 100644 --- a/testutils/src/main/java/com/amplifyframework/testutils/sync/SynchronousGeo.java +++ b/testutils/src/main/java/com/amplifyframework/testutils/sync/SynchronousGeo.java @@ -41,6 +41,7 @@ */ public final class SynchronousGeo { private final GeoCategoryBehavior asyncDelegate; + private final int TIMEOUT = 20 * 1000; private SynchronousGeo(GeoCategoryBehavior asyncDelegate) { this.asyncDelegate = asyncDelegate; @@ -76,7 +77,7 @@ public static SynchronousGeo delegatingToAmplify() { * @throws GeoException if maps are not configured. */ public Collection getAvailableMaps() throws GeoException { - return Await.result(asyncDelegate::getAvailableMaps); + return Await.result(TIMEOUT, asyncDelegate::getAvailableMaps); } /** @@ -86,7 +87,7 @@ public Collection getAvailableMaps() throws GeoException { * @throws GeoException if default map is not configured. */ public MapStyle getDefaultMap() throws GeoException { - return Await.result(asyncDelegate::getDefaultMap); + return Await.result(TIMEOUT, asyncDelegate::getDefaultMap); } /** @@ -99,7 +100,7 @@ public MapStyle getDefaultMap() throws GeoException { public MapStyleDescriptor getMapStyleDescriptor( GetMapStyleDescriptorOptions options ) throws GeoException { - return Await.result((onResult, onError) -> + return Await.result(TIMEOUT, (onResult, onError) -> asyncDelegate.getMapStyleDescriptor(options, onResult, onError)); } @@ -115,7 +116,7 @@ public GeoSearchResult searchByText( String query, GeoSearchByTextOptions options ) throws GeoException { - return Await.result((onResult, onError) -> + return Await.result(TIMEOUT, (onResult, onError) -> asyncDelegate.searchByText(query, options, onResult, onError)); } @@ -131,7 +132,7 @@ public GeoSearchResult searchByCoordinates( Coordinates coordinates, GeoSearchByCoordinatesOptions options ) throws GeoException { - return Await.result((onResult, onError) -> + return Await.result(TIMEOUT, (onResult, onError) -> asyncDelegate.searchByCoordinates(coordinates, options, onResult, onError)); } } From 1237015761ffc0d2f9646a07e0d49a15004cf605 Mon Sep 17 00:00:00 2001 From: Thomas Leing Date: Mon, 12 Dec 2022 16:51:43 -0500 Subject: [PATCH 2/2] Fix lint --- .../com/amplifyframework/testutils/sync/SynchronousGeo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testutils/src/main/java/com/amplifyframework/testutils/sync/SynchronousGeo.java b/testutils/src/main/java/com/amplifyframework/testutils/sync/SynchronousGeo.java index 42d6bf4d5f..18fd5d043c 100644 --- a/testutils/src/main/java/com/amplifyframework/testutils/sync/SynchronousGeo.java +++ b/testutils/src/main/java/com/amplifyframework/testutils/sync/SynchronousGeo.java @@ -40,8 +40,8 @@ * performing various operations. */ public final class SynchronousGeo { + private static final int TIMEOUT = 20 * 1000; private final GeoCategoryBehavior asyncDelegate; - private final int TIMEOUT = 20 * 1000; private SynchronousGeo(GeoCategoryBehavior asyncDelegate) { this.asyncDelegate = asyncDelegate;