Skip to content

Commit 7ff75eb

Browse files
kaibolaykaibolay
authored
Replace deprecate device models and versions. (#446)
This changes the default from Pixel2 (26) to MediumPhone.arm (26).
1 parent 64d577d commit 7ff75eb

15 files changed

Lines changed: 86 additions & 86 deletions

File tree

‎docs/configuration.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ fladle {
6969
recordVideo = false
7070
performanceMetrics = false
7171
devices = [
72-
[ "model": "NexusLowRes", "version": "28" ],
73-
[ "model": "Nexus5", "version": "23" ]
72+
[ "model": "SmallPhone.arm", "version": "28" ],
73+
[ "model": "MediumPhone.arm", "version": "33" ]
7474
]
7575
projectId("flank-gradle")
7676
flankVersion = "{{ fladle.flank_version }}"
@@ -193,15 +193,15 @@ A list of devices to run the tests against. When list is empty, a default device
193193
=== "Groovy"
194194
``` groovy
195195
devices = [
196-
[ "model": "Pixel2", "version": "26" ],
197-
[ "model": "Nexus5", "version": "23" ]
196+
[ "model": "MediumPhone.arm", "version": "26" ],
197+
[ "model": "MediumPhone.arm", "version": "33" ]
198198
]
199199
```
200200
=== "Kotlin"
201201
``` kotlin
202202
devices.set(listOf(
203-
mapOf("model" to "Pixel2", "version" to "26" ),
204-
mapOf("model" to "Nexus5", "version" to "23" )
203+
mapOf("model" to "MediumPhone.arm", "version" to "26" ),
204+
mapOf("model" to "MediumPhone.arm", "version" to "33" )
205205
))
206206
```
207207

@@ -490,7 +490,7 @@ A list of paths that will be copied from the device's storage to the designated
490490
```
491491

492492
### filesToDownload
493-
List of regex that is matched against bucket paths (for example: `2019-01-09_00:13:06.106000_YCKl/shard_0/NexusLowRes-28-en-portrait/bugreport.txt`) for files to be downloaded after a flank run. The results are downloaded to the `APP_MODULE/build/fladle/RESULTS` directory where RESULTS can be set by [`localResultsDir`](../configuration/#localresultsdir) var otherwise defaulting to `results/`.
493+
List of regex that is matched against bucket paths (for example: `2019-01-09_00:13:06.106000_YCKl/shard_0/SmallPhone.arm-28-en-portrait/bugreport.txt`) for files to be downloaded after a flank run. The results are downloaded to the `APP_MODULE/build/fladle/RESULTS` directory where RESULTS can be set by [`localResultsDir`](../configuration/#localresultsdir) var otherwise defaulting to `results/`.
494494

495495
=== "Groovy"
496496
``` groovy

‎docs/recipes.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@ This recipe will keep track of test durations automatically on firebase test lab
2727

2828
## Run different tests on different devices with different Gradle tasks.
2929

30-
`./gradlew runFlankPerfTests` will execute the performance tests against a Nexus5
31-
`./gradlew runFlankRegresssionTests` will execute the regressions tests against a Nexus5LowRes
30+
`./gradlew runFlankPerfTests` will execute the performance tests against a MediumPhone.arm
31+
`./gradlew runFlankRegresssionTests` will execute the regressions tests against a SmallPhone.arm
3232

3333
=== "Groovy"
3434
``` groovy
3535
fladle {
3636
configs {
3737
perfTests {
3838
devices.set([
39-
["model" : "Nexus5", "version" : "28"],
40-
["model" : "Nexus6", "version" : "28"]
39+
["model" : "MediumPhone.arm", "version" : "28"],
40+
["model" : "MediumPhone.arm", "version" : "28"]
4141
])
4242
testTargets.set([
4343
"class com.sample.MyPerformanceTest"
4444
])
4545
}
4646
regressionTests {
4747
devices.set([
48-
[ "model" : "Nexus5LowRes", "version" : "28"]
48+
[ "model" : "SmallPhone.arm", "version" : "28"]
4949
])
5050
testTargets.set([
5151
"class com.sample.MyRegressionTest"
@@ -60,16 +60,16 @@ This recipe will keep track of test durations automatically on firebase test lab
6060
configs {
6161
create("perfTests") {
6262
devices.set(listOf(
63-
mapOf("model" to "Nexus5", "version" to "28" ),
64-
mapOf("model" to "Nexus5", "version" to "28")
63+
mapOf("model" to "MediumPhone.arm", "version" to "28" ),
64+
mapOf("model" to "MediumPhone.arm", "version" to "28")
6565
))
6666
testTargets.set(listOf(
6767
"class com.sample.MyPerformanceTest"
6868
))
6969
}
7070
create("regressionTests") {
7171
devices.set(listOf(
72-
mapOf("model" to "Nexus5LowRes", "version" to "28" )
72+
mapOf("model" to "SmallPhone.arm", "version" to "28" )
7373
))
7474
testTargets.set(listOf(
7575
"class com.sample.MyRegressionTest"

‎fladle-plugin/src/main/java/com/osacky/flank/gradle/FlankGradleExtension.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ open class FlankGradleExtension
3636
override val autoGoogleLogin: Property<Boolean> = objects.property<Boolean>().convention(false)
3737
override val devices: ListProperty<Map<String, String>> =
3838
objects.listProperty<Map<String, String>>().convention(
39-
listOf(mapOf("model" to "NexusLowRes", "version" to "28")),
39+
listOf(mapOf("model" to "SmallPhone.arm", "version" to "28")),
4040
)
4141

4242
// https://cloud.google.com/sdk/gcloud/reference/firebase/test/android/run

‎fladle-plugin/src/test/java/com/osacky/flank/gradle/MultipleConfigsTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class MultipleConfigsTest {
5454
| app: foo.apk
5555
| test: instrument.apk
5656
| device:
57-
| - model: NexusLowRes
57+
| - model: SmallPhone.arm
5858
| version: 28
5959
|
6060
| use-orchestrator: false
@@ -92,7 +92,7 @@ class MultipleConfigsTest {
9292
| app: foo.apk
9393
| test: instrument.apk
9494
| device:
95-
| - model: NexusLowRes
95+
| - model: SmallPhone.arm
9696
| version: 28
9797
|
9898
| use-orchestrator: false

‎fladle-plugin/src/test/java/com/osacky/flank/gradle/YamlWriterTest.kt‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ class YamlWriterTest {
2323
fun testWriteSingleDevice() {
2424
val devices =
2525
listOf(
26-
mapOf("model" to "NexusLowRes", "version" to "28"),
26+
mapOf("model" to "SmallPhone.arm", "version" to "28"),
2727
)
2828
val deviceString = yamlWriter.createDeviceString(devices)
2929
val expected =
3030
"""
3131
| device:
32-
| - model: NexusLowRes
32+
| - model: SmallPhone.arm
3333
| version: 28
3434
|
3535
""".trimMargin()
@@ -40,17 +40,17 @@ class YamlWriterTest {
4040
fun testWriteTwoDevices() {
4141
val devices =
4242
listOf(
43-
mapOf("model" to "NexusLowRes", "version" to "28"),
44-
mapOf("model" to "Nexus5", "version" to "23"),
43+
mapOf("model" to "SmallPhone.arm", "version" to "28"),
44+
mapOf("model" to "MediumPhone.arm", "version" to "33"),
4545
)
4646
val deviceString = yamlWriter.createDeviceString(devices)
4747
val expected =
4848
"""
4949
| device:
50-
| - model: NexusLowRes
50+
| - model: SmallPhone.arm
5151
| version: 28
52-
| - model: Nexus5
53-
| version: 23
52+
| - model: MediumPhone.arm
53+
| version: 33
5454
|
5555
""".trimMargin()
5656
assertThat(deviceString).isEqualTo(expected)
@@ -60,17 +60,17 @@ class YamlWriterTest {
6060
fun testWriteTwoCustomDevices() {
6161
val devices =
6262
listOf(
63-
mapOf("model" to "NexusLowRes", "version" to "23", "orientation" to "portrait"),
64-
mapOf("model" to "Nexus5", "orientation" to "landscape", "version" to "28"),
63+
mapOf("model" to "SmallPhone.arm", "version" to "33", "orientation" to "portrait"),
64+
mapOf("model" to "MediumPhone.arm", "orientation" to "landscape", "version" to "28"),
6565
)
6666
val deviceString = yamlWriter.createDeviceString(devices)
6767
val expected =
6868
"""
6969
| device:
70-
| - model: NexusLowRes
71-
| version: 23
70+
| - model: SmallPhone.arm
71+
| version: 33
7272
| orientation: portrait
73-
| - model: Nexus5
73+
| - model: MediumPhone.arm
7474
| version: 28
7575
| orientation: landscape
7676
|
@@ -82,18 +82,18 @@ class YamlWriterTest {
8282
fun testWriteTwoCustomDevicesWithLocale() {
8383
val devices =
8484
listOf(
85-
mapOf("model" to "NexusLowRes", "version" to "23", "orientation" to "portrait", "locale" to "en"),
86-
mapOf("model" to "Nexus5", "orientation" to "landscape", "locale" to "es_ES", "version" to "28"),
85+
mapOf("model" to "SmallPhone.arm", "version" to "33", "orientation" to "portrait", "locale" to "en"),
86+
mapOf("model" to "MediumPhone.arm", "orientation" to "landscape", "locale" to "es_ES", "version" to "28"),
8787
)
8888
val deviceString = yamlWriter.createDeviceString(devices)
8989
val expected =
9090
"""
9191
| device:
92-
| - model: NexusLowRes
93-
| version: 23
92+
| - model: SmallPhone.arm
93+
| version: 33
9494
| orientation: portrait
9595
| locale: en
96-
| - model: Nexus5
96+
| - model: MediumPhone.arm
9797
| version: 28
9898
| orientation: landscape
9999
| locale: es_ES
@@ -120,7 +120,7 @@ class YamlWriterTest {
120120
fun testThrowsExceptionWhenMissingVersionKeyInDevice() {
121121
val devices =
122122
listOf(
123-
mapOf("model" to "NexusLowRes", "orientation" to "portrait", "locale" to "en"),
123+
mapOf("model" to "SmallPhone.arm", "orientation" to "portrait", "locale" to "en"),
124124
)
125125
try {
126126
yamlWriter.createDeviceString(devices)
@@ -160,7 +160,7 @@ class YamlWriterTest {
160160
app: path
161161
test: instrument
162162
device:
163-
- model: NexusLowRes
163+
- model: SmallPhone.arm
164164
version: 28
165165
166166
use-orchestrator: false
@@ -330,7 +330,7 @@ class YamlWriterTest {
330330
gcloud:
331331
app: path
332332
device:
333-
- model: NexusLowRes
333+
- model: SmallPhone.arm
334334
version: 28
335335
336336
use-orchestrator: false
@@ -367,7 +367,7 @@ class YamlWriterTest {
367367
gcloud:
368368
app: path
369369
device:
370-
- model: NexusLowRes
370+
- model: SmallPhone.arm
371371
version: 28
372372
373373
use-orchestrator: false

‎fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/AutoConfigureFladleTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ class AutoConfigureFladleTest {
5353
app: [0-9a-zA-Z\/_]*/android-project/build/outputs/apk/debug/android-project-debug.apk
5454
test: [0-9a-zA-Z\/_]*/android-project/build/outputs/apk/androidTest/debug/android-project-debug-androidTest.apk
5555
device:
56-
- model: Pixel2
56+
- model: SmallPhone.arm
5757
version: 26
58-
- model: Nexus5
59-
version: 23
58+
- model: MediumPhone.arm
59+
version: 33
6060
6161
use-orchestrator: true
6262
auto-google-login: false

‎fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/FulladlePluginIntegrationTest.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class FulladlePluginIntegrationTest {
101101
app: [0-9a-zA-Z\/_]*/android-project/build/outputs/apk/debug/android-project-debug.apk
102102
test: [0-9a-zA-Z\/_]*/android-project/build/outputs/apk/androidTest/debug/android-project-debug-androidTest.apk
103103
device:
104-
- model: NexusLowRes
104+
- model: SmallPhone.arm
105105
version: 28
106106
107107
use-orchestrator: false
@@ -283,7 +283,7 @@ class FulladlePluginIntegrationTest {
283283
app: [0-9a-zA-Z\/_]*/android-project/build/outputs/apk/debug/android-project-debug.apk
284284
test: [0-9a-zA-Z\/_]*/android-project/build/outputs/apk/androidTest/debug/android-project-debug-androidTest.apk
285285
device:
286-
- model: NexusLowRes
286+
- model: SmallPhone.arm
287287
version: 28
288288
289289
use-orchestrator: false
@@ -407,7 +407,7 @@ class FulladlePluginIntegrationTest {
407407
app: [0-9a-zA-Z\/_]*/android-project/build/outputs/apk/debug/android-project-debug.apk
408408
test: [0-9a-zA-Z\/_]*/android-project/build/outputs/apk/androidTest/debug/android-project-debug-androidTest.apk
409409
device:
410-
- model: NexusLowRes
410+
- model: SmallPhone.arm
411411
version: 28
412412
413413
use-orchestrator: false
@@ -498,7 +498,7 @@ class FulladlePluginIntegrationTest {
498498
app: [0-9a-zA-Z\/_]*/android-project/build/outputs/apk/debug/android-project-debug.apk
499499
test: [0-9a-zA-Z\/_]*/android-project/build/outputs/apk/androidTest/debug/android-project-debug-androidTest.apk
500500
device:
501-
- model: NexusLowRes
501+
- model: SmallPhone.arm
502502
version: 28
503503
504504
use-orchestrator: false
@@ -982,7 +982,7 @@ class FulladlePluginIntegrationTest {
982982
app: [0-9a-zA-Z\/_]*/android-project/build/outputs/apk/debug/android-project-debug.apk
983983
test: [0-9a-zA-Z\/_]*/android-project/build/outputs/apk/androidTest/debug/android-project-debug-androidTest.apk
984984
device:
985-
- model: NexusLowRes
985+
- model: SmallPhone.arm
986986
version: 28
987987
988988
use-orchestrator: false

‎fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/SanityRoboTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ class SanityRoboTest {
209209
| app: foo.apk
210210
| test: test.apk
211211
| device:
212-
| - model: NexusLowRes
212+
| - model: SmallPhone.arm
213213
| version: 28
214214
|
215215
| use-orchestrator: false
@@ -242,7 +242,7 @@ class SanityRoboTest {
242242
|gcloud:
243243
| app: foo.apk
244244
| device:
245-
| - model: NexusLowRes
245+
| - model: SmallPhone.arm
246246
| version: 28
247247
|
248248
| use-orchestrator: false
@@ -300,7 +300,7 @@ class SanityRoboTest {
300300
|gcloud:
301301
| app: foo.apk
302302
| device:
303-
| - model: NexusLowRes
303+
| - model: SmallPhone.arm
304304
| version: 28
305305
|
306306
| use-orchestrator: false
@@ -330,7 +330,7 @@ class SanityRoboTest {
330330
| app: foo.apk
331331
| test: test.apk
332332
| device:
333-
| - model: NexusLowRes
333+
| - model: SmallPhone.arm
334334
| version: 28
335335
|
336336
| use-orchestrator: false

0 commit comments

Comments
 (0)