Skip to content

Commit e4c651d

Browse files
committed
Update AndroidTestOrchestrator sample to monitor 1.5.0-beta01,
orchestrator 1.4.1-beta01. And remove obsolete android.test libraries from dependencies.
1 parent fb3f187 commit e4c651d

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

runner/AndroidTestOrchestratorSample/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ This project uses the Gradle build system. You don't need an IDE to build and ex
1414
1. Check out the relevant code:
1515
* The application under test is located in `src/main/java`
1616
* Tests are in `src/androidTest/java`
17-
1. Create the test configuration with a custom runner: `androidx.test.runner.AndroidJUnitRunner`
17+
1. Create the test configuration
1818
* Open *Run* menu | *Edit Configurations*
1919
* Add a new *Android Tests* configuration
2020
* Choose a module
21-
* Add a *Specific instrumentation runner*: `androidx.test.runner.AndroidJUnitRunner`
2221
1. Connect a device or start an emulator
2322
* Turn animations off.
2423
(On your device, under Settings->Developer options disable the following 3 settings: "Window animation scale", "Transition animation scale" and "Animator duration scale")

runner/AndroidTestOrchestratorSample/app/build.gradle

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ android {
2222
productFlavors {
2323
}
2424

25-
useLibrary 'android.test.runner'
26-
27-
useLibrary 'android.test.base'
28-
useLibrary 'android.test.mock'
29-
3025
testOptions {
3126
execution 'ANDROIDX_TEST_ORCHESTRATOR'
3227
}
@@ -41,6 +36,7 @@ dependencies {
4136
androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion;
4237
androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion;
4338
androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion;
39+
androidTestImplementation 'androidx.test:monitor:' + rootProject.monitorVersion;
4440
androidTestImplementation 'androidx.test.espresso:espresso-core:' + rootProject.espressoVersion;
45-
androidTestUtil 'androidx.test:orchestrator:' + rootProject.runnerVersion;
41+
androidTestUtil 'androidx.test:orchestrator:' + rootProject.orchestratorVersion;
4642
}

runner/AndroidTestOrchestratorSample/app/src/androidTest/java/com/example/android/testing/androidtestorchestratorsample/CalculatorInstrumentationTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.example.android.testing.androidtestorchestratorsample;
1818

19+
import androidx.test.platform.graphics.HardwareRendererCompat;
1920
import junit.framework.TestSuite;
2021

2122
import org.junit.Before;

runner/AndroidTestOrchestratorSample/build.gradle

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ ext {
2727
buildToolsVersion = "31.0.0"
2828
androidxAnnotationVersion = "1.2.0"
2929
guavaVersion = "30.1.1-android"
30-
coreVersion = "1.4.1-alpha03"
31-
extJUnitVersion = "1.1.4-alpha03"
32-
runnerVersion = "1.4.1-alpha03"
33-
rulesVersion = "1.4.1-alpha03"
34-
espressoVersion = "3.5.0-alpha03"
30+
coreVersion = "1.4.0"
31+
extJUnitVersion = "1.1.3"
32+
runnerVersion = "1.4.0"
33+
monitorVersion = "1.5.0-beta01"
34+
rulesVersion = "1.4.0"
35+
espressoVersion = "3.4.0"
36+
orchestratorVersion = "1.4.1-beta01"
3537
}

0 commit comments

Comments
 (0)