Skip to content

Commit 482c83e

Browse files
jushgithub-actions[bot]
authored andcommitted
Make CameraForCoordinatesTest more robust (#4329)
Camera for coordinates test are a bit flaky. This PR tries to make them more robust by: - Use an empty style - Force pixel ratio 1.0 - force mercator cc @mapbox/maps-android GitOrigin-RevId: 7dd41280c392dd8fbe477acdac2371b02ded6a7d
1 parent 6f76f14 commit 482c83e

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

maps-sdk/src/androidTest/java/com/mapbox/maps/CameraForCoordinatesTest.kt

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.mapbox.maps
33
import androidx.test.annotation.UiThreadTest
44
import androidx.test.ext.junit.rules.ActivityScenarioRule
55
import androidx.test.ext.junit.runners.AndroidJUnit4
6+
import com.mapbox.bindgen.Value
67
import com.mapbox.geojson.Point
78
import com.mapbox.maps.dsl.cameraOptions
89
import com.mapbox.maps.util.isEmpty
@@ -28,10 +29,15 @@ class CameraForCoordinatesTest {
2829
fun setUp() {
2930
val latch = CountDownLatch(2)
3031
rule.scenario.onActivity {
31-
mapView = MapView(it, MapInitOptions(it))
32+
val mapOptions = MapInitOptions.getDefaultMapOptions(it).toBuilder()
33+
.pixelRatio(1F)
34+
.build()
35+
mapView = MapView(it, MapInitOptions(it, mapOptions = mapOptions))
3236
mapboxMap = mapView.mapboxMap
37+
mapboxMap.loadStyle("{}")
3338
// Hardcoded width and height to avoid issues with different screen sizes
3439
it.frameLayout.addView(mapView, 200, 200)
40+
mapboxMap.setStyleProjection(Value.valueOf(hashMapOf("name" to Value.valueOf("mercator"))))
3541
mapboxMap.getStyle {
3642
latch.countDown()
3743
}
@@ -65,7 +71,7 @@ class CameraForCoordinatesTest {
6571
Assert.assertFalse(cameraForCoordinates.isEmpty)
6672
Assert.assertEquals(2.001, cameraForCoordinates.center!!.latitude(), 0.001)
6773
Assert.assertEquals(2.001, cameraForCoordinates.center!!.longitude(), 0.001)
68-
Assert.assertEquals(3.738, cameraForCoordinates.zoom!!, 0.001)
74+
Assert.assertEquals(5.134, cameraForCoordinates.zoom!!, 0.001)
6975
countDownLatch.countDown()
7076
}
7177
}
@@ -91,9 +97,10 @@ class CameraForCoordinatesTest {
9197
offset = null,
9298
)
9399
Assert.assertFalse(cameraForCoordinates.isEmpty)
94-
Assert.assertEquals(-180.0, cameraForCoordinates.center!!.longitude(), 0.001)
95-
Assert.assertEquals(85.902, cameraForCoordinates.center!!.latitude(), 0.001)
96-
Assert.assertEquals(0.0, cameraForCoordinates.zoom!!, 0.001)
100+
mapboxMap.setCamera(cameraForCoordinates)
101+
Assert.assertEquals(0.0, cameraForCoordinates.center!!.longitude(), 0.001)
102+
Assert.assertEquals(15.058, cameraForCoordinates.center!!.latitude(), 0.001)
103+
Assert.assertEquals(-1.356, cameraForCoordinates.zoom!!, 0.001)
97104
countDownLatch.countDown()
98105
}
99106
}
@@ -120,9 +127,8 @@ class CameraForCoordinatesTest {
120127
)
121128
Assert.assertFalse(cameraForCoordinates.isEmpty)
122129
Assert.assertEquals(-167.5, cameraForCoordinates.center!!.longitude(), 0.001)
123-
Assert.assertEquals(20.179, cameraForCoordinates.center!!.latitude(), 0.001)
124-
Assert.assertEquals(0.478, cameraForCoordinates.zoom!!, 0.001)
125-
mapboxMap.setCamera(cameraForCoordinates)
130+
Assert.assertEquals(19.750, cameraForCoordinates.center!!.latitude(), 0.001)
131+
Assert.assertEquals(2.006, cameraForCoordinates.zoom!!, 0.001)
126132
countDownLatch.countDown()
127133
}
128134
}

0 commit comments

Comments
 (0)