Upgrade to androidx.test 1.3.0-rc01
Test: ./gradlew assembleAndroidTest
Change-Id: Ia255e360e76c190e5f0793350a9731bd5dd32ab4
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/BitmapCapturingTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/BitmapCapturingTest.kt
index 413558a..4dab2cf 100644
--- a/ui/ui-test/src/androidTest/java/androidx/ui/test/BitmapCapturingTest.kt
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/BitmapCapturingTest.kt
@@ -18,7 +18,6 @@
import androidx.activity.ComponentActivity
import androidx.test.filters.MediumTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.Modifier
import androidx.ui.core.testTag
import androidx.ui.foundation.Box
@@ -55,8 +54,11 @@
)
}
+ @Suppress("DEPRECATION")
@get:Rule
- val composeTestRule = AndroidComposeTestRule(ActivityTestRule(config.activityClass))
+ val composeTestRule = AndroidComposeTestRule(
+ androidx.test.rule.ActivityTestRule(config.activityClass)
+ )
private val rootTag = "Root"
private val tag11 = "Rect11"
diff --git a/ui/ui-test/src/androidTest/java/androidx/ui/test/gesturescope/SendClickTest.kt b/ui/ui-test/src/androidTest/java/androidx/ui/test/gesturescope/SendClickTest.kt
index fb07256..cf30e3b 100644
--- a/ui/ui-test/src/androidTest/java/androidx/ui/test/gesturescope/SendClickTest.kt
+++ b/ui/ui-test/src/androidTest/java/androidx/ui/test/gesturescope/SendClickTest.kt
@@ -19,7 +19,6 @@
import androidx.activity.ComponentActivity
import androidx.compose.Composable
import androidx.test.filters.MediumTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.changedToUp
import androidx.ui.core.pointerinput.PointerInputFilter
import androidx.ui.core.pointerinput.PointerInputModifier
@@ -87,9 +86,10 @@
}
}
+ @Suppress("DEPRECATION")
@get:Rule
val composeTestRule = AndroidComposeTestRule(
- ActivityTestRule(config.activityClass),
+ androidx.test.rule.ActivityTestRule(config.activityClass),
disableTransitions = true
)