From 273756e4c4b74d75e985e9f8d0d25234447f17ec Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Wed, 19 Apr 2023 11:26:59 +0300 Subject: [PATCH] Port #1496 to v10.13. (#1643) * Fix old CircleCI parameter usage in reporting commands. * Fix flacky geojson test. --- .../extension/style/sources/generated/GeoJsonSourceTest.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/extension-style/src/testPublic/java/com/mapbox/maps/extension/style/sources/generated/GeoJsonSourceTest.kt b/extension-style/src/testPublic/java/com/mapbox/maps/extension/style/sources/generated/GeoJsonSourceTest.kt index 834288a064..12a51910c8 100644 --- a/extension-style/src/testPublic/java/com/mapbox/maps/extension/style/sources/generated/GeoJsonSourceTest.kt +++ b/extension-style/src/testPublic/java/com/mapbox/maps/extension/style/sources/generated/GeoJsonSourceTest.kt @@ -79,20 +79,25 @@ class GeoJsonSourceTest { @Test fun dataSet() { + Shadows.shadowOf(GeoJsonSource.workerThread.looper).pause() val testSource = geoJsonSource("testId") { data(TEST_GEOJSON) } testSource.bindTo(style) + Shadows.shadowOf(GeoJsonSource.workerThread.looper).idle() + verify { style.setStyleGeoJSONSourceData("testId", capture(jsonSlot)) } assertTrue(jsonSlot.captured.string.contains("{\"type\":\"FeatureCollection\",\"features\":[]}")) } @Test fun dataSetWithId() { + Shadows.shadowOf(GeoJsonSource.workerThread.looper).pause() val testSource = geoJsonSource("testId") { data(TEST_GEOJSON, DATA_ID) } testSource.bindTo(style) + Shadows.shadowOf(GeoJsonSource.workerThread.looper).idle() verify { style.setStyleGeoJSONSourceData("testId", DATA_ID, capture(jsonSlot)) } assertTrue(jsonSlot.captured.string.contains("{\"type\":\"FeatureCollection\",\"features\":[]}")) @@ -131,10 +136,12 @@ class GeoJsonSourceTest { @Test fun urlSetTest() { + Shadows.shadowOf(GeoJsonSource.workerThread.looper).pause() val testSource = geoJsonSource("testId") { url("testUrl") } testSource.bindTo(style) + Shadows.shadowOf(GeoJsonSource.workerThread.looper).idle() verify { style.setStyleGeoJSONSourceData("testId", capture(jsonSlot)) } assertEquals(jsonSlot.captured.string, "testUrl")