Skip to content

Commit 5fba65c

Browse files
brettchabotbrettchabot
committed
Use managedDevices syntax.
1 parent b3bb4c1 commit 5fba65c

File tree

18 files changed

+174
-171
lines changed

18 files changed

+174
-171
lines changed

‎integration/ServiceTestRuleSample/app/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ android {
1818
productFlavors {
1919
}
2020
testOptions {
21-
devices {
22-
// run with ../gradlew nexusOneApi30DebugAndroidTest
23-
nexusOneApi30 (com.android.build.api.dsl.ManagedVirtualDevice) {
24-
// A lower resolution device is used here for better emulator performance
25-
device = "Nexus One"
26-
apiLevel = 30
27-
// Also use the AOSP ATD image for better emulator performance
28-
// The androidx.test screenshot APIs will automatically enable hardware rendering
29-
// to take a screenshot
30-
systemImageSource = "aosp-atd"
21+
managedDevices {
22+
devices {
23+
// run with ../gradlew nexusOneApi30DebugAndroidTest
24+
nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
25+
// A lower resolution device is used here for better emulator performance
26+
device = "Nexus One"
27+
apiLevel = 30
28+
// Also use the AOSP ATD image for better emulator performance
29+
systemImageSource = "aosp-atd"
30+
}
3131
}
3232
}
3333
}

‎runner/AndroidJunitRunnerSample/app/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ android {
2222
productFlavors {
2323
}
2424
testOptions {
25-
devices {
26-
// run with ../gradlew nexusOneApi30DebugAndroidTest
27-
nexusOneApi30 (com.android.build.api.dsl.ManagedVirtualDevice) {
28-
// A lower resolution device is used here for better emulator performance
29-
device = "Nexus One"
30-
apiLevel = 30
31-
// Also use the AOSP ATD image for better emulator performance
32-
// The androidx.test screenshot APIs will automatically enable hardware rendering
33-
// to take a screenshot
34-
systemImageSource = "aosp-atd"
25+
managedDevices {
26+
devices {
27+
// run with ../gradlew nexusOneApi30DebugAndroidTest
28+
nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
29+
// A lower resolution device is used here for better emulator performance
30+
device = "Nexus One"
31+
apiLevel = 30
32+
// Also use the AOSP ATD image for better emulator performance
33+
systemImageSource = "aosp-atd"
34+
}
3535
}
3636
}
3737
}

‎runner/AndroidTestOrchestratorSample/app/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ android {
2424

2525
testOptions {
2626
execution 'ANDROIDX_TEST_ORCHESTRATOR'
27-
devices {
28-
// run with ../gradlew nexusOneApi30DebugAndroidTest
29-
nexusOneApi30 (com.android.build.api.dsl.ManagedVirtualDevice) {
30-
// A lower resolution device is used here for better emulator performance
31-
device = "Nexus One"
32-
apiLevel = 30
33-
// Also use the AOSP ATD image for better emulator performance
34-
// The androidx.test screenshot APIs will automatically enable hardware rendering
35-
// to take a screenshot
36-
systemImageSource = "aosp-atd"
27+
managedDevices {
28+
devices {
29+
// run with ../gradlew nexusOneApi30DebugAndroidTest
30+
nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
31+
// A lower resolution device is used here for better emulator performance
32+
device = "Nexus One"
33+
apiLevel = 30
34+
// Also use the AOSP ATD image for better emulator performance
35+
systemImageSource = "aosp-atd"
36+
}
3737
}
3838
}
3939
}

‎test_all.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ for p in $(cat projects.conf); do
99
echo "====================================================================="
1010

1111
pushd $p > /dev/null # Silent pushd
12-
./gradlew $@ nexusOneApi30DebugAndroidTest | sed "s@^@$p @" # Prefix every line with directory
12+
./gradlew $@ testDebug nexusOneApi30DebugAndroidTest | sed "s@^@$p @" # Prefix every line with directory
1313
code=${PIPESTATUS[0]}
1414
if [ "$code" -ne "0" ]; then
1515
exit $code

‎ui/espresso/AccessibilitySample/app/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ android {
2323
unitTests {
2424
includeAndroidResources = true
2525
}
26-
devices {
27-
// run with ../gradlew nexusOneApi30DebugAndroidTest
28-
nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
29-
// A lower resolution device is used here for better emulator performance
30-
device = "Nexus One"
31-
apiLevel = 30
32-
// Also use the AOSP ATD image for better emulator performance
33-
// The androidx.test screenshot APIs will automatically enable hardware rendering
34-
// to take a screenshot
35-
systemImageSource = "aosp-atd"
26+
managedDevices {
27+
devices {
28+
// run with ../gradlew nexusOneApi30DebugAndroidTest
29+
nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
30+
// A lower resolution device is used here for better emulator performance
31+
device = "Nexus One"
32+
apiLevel = 30
33+
// Also use the AOSP ATD image for better emulator performance
34+
systemImageSource = "aosp-atd"
35+
}
3636
}
3737
}
3838
}

‎ui/espresso/BasicSample/app/build.gradle‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,17 @@ android {
2525
unitTests {
2626
includeAndroidResources = true
2727
}
28-
devices {
29-
// run with ../gradlew nexusOneApi30DebugAndroidTest
30-
nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
31-
// A lower resolution device is used here for better emulator performance
32-
device = "Nexus One"
33-
apiLevel = 30
34-
// Also use the AOSP ATD image for better emulator performance
35-
// The androidx.test screenshot APIs will automatically enable hardware rendering
36-
// to take a screenshot
37-
systemImageSource = "aosp-atd"
28+
managedDevices {
29+
devices {
30+
31+
// run with ../gradlew nexusOneApi30DebugAndroidTest
32+
nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
33+
// A lower resolution device is used here for better emulator performance
34+
device = "Nexus One"
35+
apiLevel = 30
36+
// Also use the AOSP ATD image for better emulator performance
37+
systemImageSource = "aosp-atd"
38+
}
3839
}
3940
}
4041
}

‎ui/espresso/CustomMatcherSample/app/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ android {
3636
unitTests {
3737
includeAndroidResources = true
3838
}
39-
devices {
40-
// run with ../gradlew nexusOneApi30DebugAndroidTest
41-
nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
42-
// A lower resolution device is used here for better emulator performance
43-
device = "Nexus One"
44-
apiLevel = 30
45-
// Also use the AOSP ATD image for better emulator performance
46-
// The androidx.test screenshot APIs will automatically enable hardware rendering
47-
// to take a screenshot
48-
systemImageSource = "aosp-atd"
39+
managedDevices {
40+
devices {
41+
// run with ../gradlew nexusOneApi30DebugAndroidTest
42+
nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
43+
// A lower resolution device is used here for better emulator performance
44+
device = "Nexus One"
45+
apiLevel = 30
46+
// Also use the AOSP ATD image for better emulator performance
47+
systemImageSource = "aosp-atd"
48+
}
4949
}
5050
}
5151
}

‎ui/espresso/DataAdapterSample/app/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ android {
1818
unitTests {
1919
includeAndroidResources = true
2020
}
21-
devices {
22-
// run with ../gradlew nexusOneApi30DebugAndroidTest
23-
nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
24-
// A lower resolution device is used here for better emulator performance
25-
device = "Nexus One"
26-
apiLevel = 30
27-
// Also use the AOSP ATD image for better emulator performance
28-
// The androidx.test screenshot APIs will automatically enable hardware rendering
29-
// to take a screenshot
30-
systemImageSource = "aosp-atd"
21+
managedDevices {
22+
devices {
23+
// run with ../gradlew nexusOneApi30DebugAndroidTest
24+
nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
25+
// A lower resolution device is used here for better emulator performance
26+
device = "Nexus One"
27+
apiLevel = 30
28+
// Also use the AOSP ATD image for better emulator performance
29+
systemImageSource = "aosp-atd"
30+
}
3131
}
3232
}
3333
}

‎ui/espresso/FragmentScenarioSample/app/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ android {
3333
unitTests {
3434
includeAndroidResources = true
3535
}
36-
devices {
37-
// run with ../gradlew nexusOneApi30DebugAndroidTest
38-
nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
39-
// A lower resolution device is used here for better emulator performance
40-
device = "Nexus One"
41-
apiLevel = 30
42-
// Also use the AOSP ATD image for better emulator performance
43-
// The androidx.test screenshot APIs will automatically enable hardware rendering
44-
// to take a screenshot
45-
systemImageSource = "aosp-atd"
36+
managedDevices {
37+
devices {
38+
// run with ../gradlew nexusOneApi30DebugAndroidTest
39+
nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
40+
// A lower resolution device is used here for better emulator performance
41+
device = "Nexus One"
42+
apiLevel = 30
43+
// Also use the AOSP ATD image for better emulator performance
44+
systemImageSource = "aosp-atd"
45+
}
4646
}
4747
}
4848
}

‎ui/espresso/IdlingResourceSample/app/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ android {
3636
unitTests {
3737
includeAndroidResources = true
3838
}
39-
devices {
40-
// run with ../gradlew nexusOneApi30DebugAndroidTest
41-
nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
42-
// A lower resolution device is used here for better emulator performance
43-
device = "Nexus One"
44-
apiLevel = 30
45-
// Also use the AOSP ATD image for better emulator performance
46-
// The androidx.test screenshot APIs will automatically enable hardware rendering
47-
// to take a screenshot
48-
systemImageSource = "aosp-atd"
39+
managedDevices {
40+
devices {
41+
// run with ../gradlew nexusOneApi30DebugAndroidTest
42+
nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
43+
// A lower resolution device is used here for better emulator performance
44+
device = "Nexus One"
45+
apiLevel = 30
46+
// Also use the AOSP ATD image for better emulator performance
47+
systemImageSource = "aosp-atd"
48+
}
4949
}
5050
}
5151
}

0 commit comments

Comments
 (0)