Skip to content

Commit 92bc69b

Browse files
kiryldzkiryldz
authored
Update CI devices for robo / instrument tests (#486)
* Update CI devices for robo / instrument tests * Update API 28 device * Try enabling animations for API 23 * Try using gradle config to enable animations * Ignore some tests for API <= 23 * Remove old CI device for style job
1 parent a132095 commit 92bc69b

4 files changed

Lines changed: 60 additions & 16 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,20 @@ commands:
233233
no_output_timeout: 50m
234234
command: |
235235
if [[ -n "${GCLOUD_SERVICE_ACCOUNT_JSON}" ]]; then
236-
gcloud firebase test android run --type instrumentation \
236+
if [ << parameters.module_target >> == "extension-style-app" ]; then
237+
gcloud firebase test android run --type instrumentation \
238+
--app << parameters.app_target >>/build/outputs/apk/debug/<< parameters.app_target >>-debug.apk \
239+
--test << parameters.module_target >>/build/outputs/apk/androidTest/debug/<< parameters.module_target >>-debug-androidTest.apk \
240+
--device model=AOP_sprout,version=28,locale=en,orientation=portrait \
241+
--timeout 45m --use-orchestrator --num-flaky-test-attempts 3
242+
else
243+
gcloud firebase test android run --type instrumentation \
237244
--app << parameters.app_target >>/build/outputs/apk/debug/<< parameters.app_target >>-debug.apk \
238245
--test << parameters.module_target >>/build/outputs/apk/androidTest/debug/<< parameters.module_target >>-debug-androidTest.apk \
239-
--device-ids sailfish --os-version-ids "26" --locales en --orientations portrait --timeout 45m --use-orchestrator
246+
--device model=harpia,version=23,locale=en,orientation=portrait \
247+
--device model=AOP_sprout,version=28,locale=en,orientation=portrait \
248+
--timeout 45m --use-orchestrator --num-flaky-test-attempts 3
249+
fi
240250
fi
241251
242252
run-firebase-robo:
@@ -248,8 +258,8 @@ commands:
248258
if [[ -n "${GCLOUD_SERVICE_ACCOUNT_JSON}" ]]; then
249259
gcloud firebase test android run --type robo \
250260
--app app/build/outputs/apk/release/app-release.apk \
251-
--device model=sailfish,version=28,locale=en,orientation=portrait \
252-
--device model=zeroflte,version=23,locale=en,orientation=portrait \
261+
--device model=AOP_sprout,version=28,locale=en,orientation=portrait \
262+
--device model=harpia,version=23,locale=en,orientation=portrait \
253263
--device model=Pixel2,version=30,locale=en,orientation=portrait \
254264
--device model=mata,version=25,locale=en,orientation=portrait \
255265
--timeout 90s

‎sdk/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ android {
3131
unitTests.apply {
3232
isIncludeAndroidResources = true
3333
}
34+
animationsDisabled = true
3435
if (!project.hasProperty("android.injected.invoked.from.ide")) {
3536
execution = "ANDROIDX_TEST_ORCHESTRATOR"
3637
}

‎sdk/src/androidTest/java/com/mapbox/maps/BaseAnimationMapTest.kt‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.mapbox.maps
22

3-
import android.os.Build
43
import androidx.test.ext.junit.rules.ActivityScenarioRule
54
import androidx.test.ext.junit.runners.AndroidJUnit4
65
import androidx.test.filters.LargeTest
@@ -31,14 +30,14 @@ abstract class BaseAnimationMapTest {
3130

3231
@Before
3332
fun before() {
34-
if (!BuildConfig.RUN_FROM_IDE && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
33+
if (!BuildConfig.RUN_FROM_IDE) {
3534
with(InstrumentationRegistry.getInstrumentation().uiAutomation) {
3635
executeShellCommand("settings put global window_animation_scale 1")
3736
executeShellCommand("settings put global transition_animation_scale 1")
3837
executeShellCommand("settings put global animator_duration_scale 1")
3938
}
4039
}
41-
val latch = CountDownLatch(1)
40+
val latch = CountDownLatch(2)
4241
rule.scenario.onActivity {
4342
it.runOnUiThread {
4443
val context = InstrumentationRegistry.getInstrumentation().targetContext
@@ -47,12 +46,16 @@ abstract class BaseAnimationMapTest {
4746
cameraAnimationPlugin = mapView.camera
4847
it.setContentView(mapView)
4948

50-
mapboxMap = mapView.getMapboxMap()
51-
mapboxMap.loadStyleUri(
52-
Style.DARK
53-
) { style ->
54-
this@BaseAnimationMapTest.style = style
55-
latch.countDown()
49+
mapboxMap = mapView.getMapboxMap().apply {
50+
loadStyleUri(
51+
Style.DARK
52+
) { style ->
53+
this@BaseAnimationMapTest.style = style
54+
latch.countDown()
55+
}
56+
addOnMapIdleListener {
57+
latch.countDown()
58+
}
5659
}
5760
mapView.onStart()
5861
}
@@ -65,7 +68,7 @@ abstract class BaseAnimationMapTest {
6568

6669
@After
6770
fun tearDown() {
68-
if (!BuildConfig.RUN_FROM_IDE && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
71+
if (!BuildConfig.RUN_FROM_IDE) {
6972
with(InstrumentationRegistry.getInstrumentation().uiAutomation) {
7073
executeShellCommand("settings put global window_animation_scale 0")
7174
executeShellCommand("settings put global transition_animation_scale 0")

‎sdk/src/androidTest/java/com/mapbox/maps/CameraAnimationsPluginTest.kt‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.mapbox.maps
33
import android.animation.Animator
44
import android.animation.AnimatorSet
55
import android.animation.ValueAnimator
6+
import android.os.Build
67
import android.os.Handler
78
import android.os.Looper
89
import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -28,6 +29,9 @@ class CameraAnimationsPluginTest : BaseAnimationMapTest() {
2829

2930
@Test
3031
fun testAnimatorWithAnimatorDelay() {
32+
if (ignoreTestForGivenAbi()) {
33+
return
34+
}
3135
val duration = 2000L
3236
val delay = 1000L
3337
val animatorListener = CameraAnimatorListener()
@@ -70,6 +74,9 @@ class CameraAnimationsPluginTest : BaseAnimationMapTest() {
7074

7175
@Test
7276
fun testCancelAnimatorWithDelayed() {
77+
if (ignoreTestForGivenAbi()) {
78+
return
79+
}
7380
val duration = 2000L
7481
val delay = 500L
7582
val animatorListener = CameraAnimatorListener()
@@ -107,6 +114,9 @@ class CameraAnimationsPluginTest : BaseAnimationMapTest() {
107114

108115
@Test
109116
fun testAnimatorWithHandlerPostDelay() {
117+
if (ignoreTestForGivenAbi()) {
118+
return
119+
}
110120
val duration = 1000L
111121
val delay = 2000L
112122
val animatorListener = CameraAnimatorListener()
@@ -153,6 +163,9 @@ class CameraAnimationsPluginTest : BaseAnimationMapTest() {
153163

154164
@Test
155165
fun testCameraUpdateFrequency() {
166+
if (ignoreTestForGivenAbi()) {
167+
return
168+
}
156169
val duration = 3000L
157170

158171
// Considering min update frequency is not less than 20 ms assuming running on x86 emulator on CI
@@ -183,6 +196,9 @@ class CameraAnimationsPluginTest : BaseAnimationMapTest() {
183196

184197
@Test
185198
fun testRegisterExistedAnimatorTypeAndStart() {
199+
if (ignoreTestForGivenAbi()) {
200+
return
201+
}
186202
val duration = 2000L
187203

188204
val animatorListener1 = CameraAnimatorListener()
@@ -253,6 +269,9 @@ class CameraAnimationsPluginTest : BaseAnimationMapTest() {
253269

254270
@Test
255271
fun testEaseToSingleDurationShort() {
272+
if (ignoreTestForGivenAbi()) {
273+
return
274+
}
256275
val targetBearing = 5.0
257276
val cameraOptions = CameraOptions.Builder().bearing(targetBearing).build()
258277
val expectedValues = mutableSetOf(-0.0, targetBearing)
@@ -307,7 +326,9 @@ class CameraAnimationsPluginTest : BaseAnimationMapTest() {
307326

308327
@Test
309328
fun testEaseToSequenceDurationShort() {
310-
329+
if (ignoreTestForGivenAbi()) {
330+
return
331+
}
311332
val targetBearing1 = 5.0
312333
val targetBearing2 = 10.0
313334
val targetBearing3 = 15.0
@@ -337,7 +358,9 @@ class CameraAnimationsPluginTest : BaseAnimationMapTest() {
337358

338359
@Test
339360
fun testEaseToAnimatorSequenceLessThenFrameUpdate() {
340-
361+
if (ignoreTestForGivenAbi()) {
362+
return
363+
}
341364
val targetBearing1 = 5.0
342365
val targetBearing2 = 10.0
343366
val targetBearing3 = 15.0
@@ -395,6 +418,9 @@ class CameraAnimationsPluginTest : BaseAnimationMapTest() {
395418

396419
@Test
397420
fun testPostDelayedAndStartDelayedAnimators() {
421+
if (ignoreTestForGivenAbi()) {
422+
return
423+
}
398424
val pitchAnimatorOne = createPitchAnimator(cameraAnimationPlugin, 10.0, 0, 1000L)
399425
val pitchListenerOne = CameraAnimatorListener()
400426
pitchAnimatorOne.addListener(pitchListenerOne)
@@ -595,6 +621,10 @@ class CameraAnimationsPluginTest : BaseAnimationMapTest() {
595621
startDelay = animatorDelay
596622
}
597623

624+
// TODO some tests must have animations enabled
625+
// before https://github.com/mapbox/mapbox-maps-android/issues/490 is resolved we ignore those tests
626+
private fun ignoreTestForGivenAbi() = Build.VERSION.SDK_INT <= Build.VERSION_CODES.M
627+
598628
companion object {
599629
private const val TAG = "Mbgl-CameraManager"
600630
private const val EPS = 0.000001

0 commit comments

Comments
 (0)