Upgrade to androidx.test:core:1.5.0-alpha02
This version has a fix for API 33 explicit activity
requirement
Bug: 240365524
Test: ./gradlew assembleDebug
Change-Id: I2dfcd1402f67b95d06f6a4fbc983f4d020d22cd1
diff --git a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/widget/TooltipCompatTest.kt b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/widget/TooltipCompatTest.kt
index 77ef02c..b5f34ae 100644
--- a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/widget/TooltipCompatTest.kt
+++ b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/widget/TooltipCompatTest.kt
@@ -42,7 +42,9 @@
*/
@Test
fun testDoubleShow() {
- ActivityScenario.launch(TooltipCompatTestActivity::class.java).use { scenario ->
+ ActivityScenario.launchActivityForResult(
+ TooltipCompatTestActivity::class.java
+ ).use { scenario ->
scenario.onActivity { activity ->
val button = activity.findViewById<Button>(R.id.button)
button.setOnClickListener {
diff --git a/camera/camera-testing/build.gradle b/camera/camera-testing/build.gradle
index e3e837c..ec93470 100644
--- a/camera/camera-testing/build.gradle
+++ b/camera/camera-testing/build.gradle
@@ -26,7 +26,7 @@
}
dependencies {
- implementation(libs.testCore)
+ implementation("androidx.test:core:1.4.0")
implementation(libs.testRules)
implementation(libs.testUiautomator)
api("androidx.annotation:annotation:1.2.0")
diff --git a/camera/integration-tests/coretestapp/build.gradle b/camera/integration-tests/coretestapp/build.gradle
index ca2fe62..6b8335e 100644
--- a/camera/integration-tests/coretestapp/build.gradle
+++ b/camera/integration-tests/coretestapp/build.gradle
@@ -82,6 +82,7 @@
debugImplementation(libs.leakcanary)
// Testing resource dependency for manifest
debugImplementation(project(":camera:camera-testing"))
+ debugImplementation(libs.testCore)
// Testing framework
androidTestImplementation(libs.testCore)
diff --git a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ExistingActivityLifecycleTest.kt b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ExistingActivityLifecycleTest.kt
index 1c49fe3..2b52f77 100644
--- a/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ExistingActivityLifecycleTest.kt
+++ b/camera/integration-tests/coretestapp/src/androidTest/java/androidx/camera/integration/core/ExistingActivityLifecycleTest.kt
@@ -356,7 +356,9 @@
@Test
fun checkPreviewUpdatedWithNewInstance() {
- ActivityScenario.launch<CameraXActivity>(launchIntent).use { firstActivity ->
+ ActivityScenario.launchActivityForResult<CameraXActivity>(
+ launchIntent
+ ).use { firstActivity ->
// Arrange. Check the 1st activity Preview.
firstActivity.waitForViewfinderIdle()
diff --git a/camera/integration-tests/extensionstestapp/build.gradle b/camera/integration-tests/extensionstestapp/build.gradle
index 220b5e9..b37efba 100644
--- a/camera/integration-tests/extensionstestapp/build.gradle
+++ b/camera/integration-tests/extensionstestapp/build.gradle
@@ -75,5 +75,6 @@
// Testing resource dependency for manifest
debugImplementation(project(":camera:camera-testing"))
+ debugImplementation(libs.testCore)
}
diff --git a/compose/ui/ui-test-junit4/build.gradle b/compose/ui/ui-test-junit4/build.gradle
index cf2c7bc..7162318 100644
--- a/compose/ui/ui-test-junit4/build.gradle
+++ b/compose/ui/ui-test-junit4/build.gradle
@@ -48,7 +48,7 @@
implementation("androidx.annotation:annotation:1.1.0")
implementation("androidx.lifecycle:lifecycle-common:2.3.0")
implementation("androidx.lifecycle:lifecycle-runtime:2.3.0")
- implementation(libs.testCore)
+ implementation("androidx.test:core:1.4.0")
implementation(libs.testMonitor)
implementation("androidx.test.espresso:espresso-core:3.3.0")
implementation("androidx.test.espresso:espresso-idling-resource:3.3.0")
@@ -106,7 +106,7 @@
implementation(project(":compose:runtime:runtime-saveable"))
implementation("androidx.lifecycle:lifecycle-common:2.3.0")
implementation("androidx.lifecycle:lifecycle-runtime:2.3.0")
- implementation(libs.testCore)
+ implementation("androidx.test:core:1.4.0")
implementation(libs.testMonitor)
implementation("androidx.test.espresso:espresso-core:3.3.0")
implementation("androidx.test.espresso:espresso-idling-resource:3.3.0")
diff --git a/concurrent/concurrent-futures-ktx/build.gradle b/concurrent/concurrent-futures-ktx/build.gradle
index f3e56aa..2d4b84f 100644
--- a/concurrent/concurrent-futures-ktx/build.gradle
+++ b/concurrent/concurrent-futures-ktx/build.gradle
@@ -30,8 +30,6 @@
testImplementation(libs.junit)
testImplementation(libs.kotlinTest)
testImplementation(libs.kotlinCoroutinesTest)
- testImplementation(libs.testExtJunit)
- testImplementation(libs.testCore)
}
androidx {
diff --git a/core/core-animation-testing/build.gradle b/core/core-animation-testing/build.gradle
index 746fb4f..b11eb6e 100644
--- a/core/core-animation-testing/build.gradle
+++ b/core/core-animation-testing/build.gradle
@@ -26,7 +26,7 @@
implementation("androidx.core:core:1.3.1")
implementation(project(":core:core-animation"))
implementation(libs.testExtJunit)
- implementation(libs.testCore)
+ implementation("androidx.test:core:1.4.0")
}
androidx {
diff --git a/core/core-google-shortcuts/src/androidTest/java/androidx/core/google/shortcuts/TrampolineActivityTest.java b/core/core-google-shortcuts/src/androidTest/java/androidx/core/google/shortcuts/TrampolineActivityTest.java
index 9a9d94c..ca4966c 100644
--- a/core/core-google-shortcuts/src/androidTest/java/androidx/core/google/shortcuts/TrampolineActivityTest.java
+++ b/core/core-google-shortcuts/src/androidTest/java/androidx/core/google/shortcuts/TrampolineActivityTest.java
@@ -76,7 +76,7 @@
public void testOnCreate_withTrampolineIntent_launchesShortcut() throws Exception {
Intent trampolineIntent = createIntentToTestActivity();
- ActivityScenario.launch(trampolineIntent);
+ ActivityScenario.launchActivityForResult(trampolineIntent);
// Verify test activity was launched.
intended(hasComponent(TestActivity.class.getName()));
@@ -88,7 +88,8 @@
Intent trampolineIntent = createIntentToTestActivity();
trampolineIntent.putExtra(SHORTCUT_TAG_KEY, "bad_tag");
- ActivityScenario<Activity> scenario = ActivityScenario.launch(trampolineIntent);
+ ActivityScenario<Activity> scenario =
+ ActivityScenario.launchActivityForResult(trampolineIntent);
// Verify test activity was not launched.
intended(hasComponent(TestActivity.class.getName()), times(0));
@@ -102,7 +103,8 @@
Intent trampolineIntent = createIntentToTestActivity();
trampolineIntent.removeExtra(SHORTCUT_TAG_KEY);
- ActivityScenario<Activity> scenario = ActivityScenario.launch(trampolineIntent);
+ ActivityScenario<Activity> scenario =
+ ActivityScenario.launchActivityForResult(trampolineIntent);
// Verify test activity was not launched.
intended(hasComponent(TestActivity.class.getName()), times(0));
@@ -116,7 +118,8 @@
Intent trampolineIntent = createIntentToTestActivity();
trampolineIntent.removeExtra(SHORTCUT_URL_KEY);
- ActivityScenario<Activity> scenario = ActivityScenario.launch(trampolineIntent);
+ ActivityScenario<Activity> scenario =
+ ActivityScenario.launchActivityForResult(trampolineIntent);
// Verify test activity was not launched.
intended(hasComponent(TestActivity.class.getName()), times(0));
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 79223f5..5f453b8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,7 +17,7 @@
androidxTestRunner = "1.4.0"
androidxTestRules = "1.4.0"
androidxTestMonitor = "1.5.0"
-androidxTestCore = "1.4.0"
+androidxTestCore = "1.5.0-alpha02"
androidxTestExtJunit = "1.1.3"
androidxTestExtTruth = "1.4.0"
atomicFu = "0.17.0"
diff --git a/testutils/testutils-gradle-plugin/build.gradle b/testutils/testutils-gradle-plugin/build.gradle
index e8d7ab2..b1885a3 100644
--- a/testutils/testutils-gradle-plugin/build.gradle
+++ b/testutils/testutils-gradle-plugin/build.gradle
@@ -23,9 +23,7 @@
dependencies {
implementation(libs.kotlinStdlib)
- implementation(libs.testExtJunit)
- implementation(libs.testCore)
- implementation(libs.testRules)
+ implementation(libs.junit)
}
androidx {