Upgrade to androidx.test 1.3.0-rc01
Test: ./gradlew assembleAndroidTest
Change-Id: Ia255e360e76c190e5f0793350a9731bd5dd32ab4
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/AndroidPointerInputTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/AndroidPointerInputTest.kt
index ac5ba57..0d1068b 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/AndroidPointerInputTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/AndroidPointerInputTest.kt
@@ -29,7 +29,6 @@
import androidx.compose.remember
import androidx.compose.setValue
import androidx.test.filters.SmallTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.pointerinput.PointerInputFilter
import androidx.ui.core.pointerinput.PointerInputModifier
import androidx.ui.unit.IntPxSize
@@ -51,8 +50,9 @@
@SmallTest
@RunWith(JUnit4::class)
class AndroidPointerInputTest {
+ @Suppress("DEPRECATION")
@get:Rule
- val rule = ActivityTestRule<AndroidPointerInputTestActivity>(
+ val rule = androidx.test.rule.ActivityTestRule<AndroidPointerInputTestActivity>(
AndroidPointerInputTestActivity::class.java
)
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/PainterModifierTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/PainterModifierTest.kt
index 4eae0ed..c3be581 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/PainterModifierTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/PainterModifierTest.kt
@@ -21,7 +21,6 @@
import androidx.compose.Composable
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.test.AlignTopLeft
import androidx.ui.core.test.AtLeastSize
import androidx.ui.core.test.FixedSize
@@ -61,8 +60,9 @@
val containerWidth = 100.0f
val containerHeight = 100.0f
+ @Suppress("DEPRECATION")
@get:Rule
- val rule = ActivityTestRule<TestActivity>(TestActivity::class.java)
+ val rule = androidx.test.rule.ActivityTestRule<TestActivity>(TestActivity::class.java)
private lateinit var activity: TestActivity
private lateinit var drawLatch: CountDownLatch
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/gesture/LongPressDragGestureFilterTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/gesture/LongPressDragGestureFilterTest.kt
index 2f232b7..8b2cc84 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/gesture/LongPressDragGestureFilterTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/gesture/LongPressDragGestureFilterTest.kt
@@ -20,7 +20,6 @@
import android.view.ViewGroup
import androidx.compose.emptyContent
import androidx.test.filters.LargeTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.Layout
import androidx.ui.core.Modifier
import androidx.ui.core.setContent
@@ -50,8 +49,11 @@
@LargeTest
@RunWith(JUnit4::class)
class LongPressDragGestureFilterTest {
+ @Suppress("DEPRECATION")
@get:Rule
- val activityTestRule = ActivityTestRule<TestActivity>(TestActivity::class.java)
+ val activityTestRule = androidx.test.rule.ActivityTestRule<TestActivity>(
+ TestActivity::class.java
+ )
private lateinit var longPressDragObserver: LongPressDragObserver
private lateinit var longPressCountDownLatch: CountDownLatch
private lateinit var view: View
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/gesture/ScaleGestureFilterTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/gesture/ScaleGestureFilterTest.kt
index 4d02809..7772258 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/gesture/ScaleGestureFilterTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/gesture/ScaleGestureFilterTest.kt
@@ -20,7 +20,6 @@
import android.view.ViewGroup
import androidx.compose.emptyContent
import androidx.test.filters.LargeTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.DensityAmbient
import androidx.ui.core.Layout
import androidx.ui.core.Modifier
@@ -48,8 +47,11 @@
@LargeTest
@RunWith(JUnit4::class)
class ScaleGestureFilterTest {
+ @Suppress("DEPRECATION")
@get:Rule
- val activityTestRule = ActivityTestRule<TestActivity>(TestActivity::class.java)
+ val activityTestRule = androidx.test.rule.ActivityTestRule<TestActivity>(
+ TestActivity::class.java
+ )
private lateinit var scaleObserver: ScaleObserver
private lateinit var view: View
private var touchSlop: Float = Float.NEGATIVE_INFINITY
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/gesture/TouchSlopDragGestureFilterTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/gesture/TouchSlopDragGestureFilterTest.kt
index f26061c1..e3cb056 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/gesture/TouchSlopDragGestureFilterTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/gesture/TouchSlopDragGestureFilterTest.kt
@@ -19,7 +19,6 @@
import android.view.View
import android.view.ViewGroup
import androidx.test.filters.LargeTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.DensityAmbient
import androidx.ui.core.Layout
import androidx.ui.core.Modifier
@@ -45,8 +44,11 @@
@LargeTest
@RunWith(JUnit4::class)
class TouchSlopDragGestureFilterTest {
+ @Suppress("DEPRECATION")
@get:Rule
- val activityTestRule = ActivityTestRule<TestActivity>(TestActivity::class.java)
+ val activityTestRule = androidx.test.rule.ActivityTestRule<TestActivity>(
+ TestActivity::class.java
+ )
private lateinit var dragObserver: DragObserver
private lateinit var view: View
private var touchSlop: Float = Float.NEGATIVE_INFINITY
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/gesture/utils.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/gesture/utils.kt
index e74b53a5..d50e43b 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/gesture/utils.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/gesture/utils.kt
@@ -17,10 +17,10 @@
package androidx.ui.core.gesture
import android.view.MotionEvent
-import androidx.test.rule.ActivityTestRule
// We only need this because IR compiler doesn't like converting lambdas to Runnables
-internal fun ActivityTestRule<*>.runOnUiThreadIR(block: () -> Unit) {
+@Suppress("DEPRECATION")
+internal fun androidx.test.rule.ActivityTestRule<*>.runOnUiThreadIR(block: () -> Unit) {
val runnable: Runnable = object : Runnable {
override fun run() {
block()
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/selection/SelectionHandlesTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/selection/SelectionHandlesTest.kt
index 574bdc9..299ab1f 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/selection/SelectionHandlesTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/selection/SelectionHandlesTest.kt
@@ -19,7 +19,6 @@
import android.os.Build
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.setContent
import androidx.ui.core.test.runOnUiThreadIR
import androidx.ui.core.test.waitAndScreenShot
@@ -39,8 +38,9 @@
@SmallTest
@RunWith(JUnit4::class)
class SelectionHandlesTest {
+ @Suppress("DEPRECATION")
@get:Rule
- val rule = ActivityTestRule<TestActivity>(TestActivity::class.java)
+ val rule = androidx.test.rule.ActivityTestRule<TestActivity>(TestActivity::class.java)
private lateinit var activity: TestActivity
private val HANDLE_COLOR = Color(0xFF2B28F5.toInt())
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/AndroidLayoutDrawTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/AndroidLayoutDrawTest.kt
index 65134c0..3ec4340 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/AndroidLayoutDrawTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/AndroidLayoutDrawTest.kt
@@ -39,7 +39,6 @@
import androidx.compose.state
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.Constraints
import androidx.ui.core.ContentDrawScope
import androidx.ui.core.DrawLayerModifier
@@ -107,8 +106,9 @@
@SmallTest
@RunWith(JUnit4::class)
class AndroidLayoutDrawTest {
+ @Suppress("DEPRECATION")
@get:Rule
- val activityTestRule = ActivityTestRule<TestActivity>(
+ val activityTestRule = androidx.test.rule.ActivityTestRule<TestActivity>(
TestActivity::class.java
)
@get:Rule
@@ -2632,7 +2632,8 @@
}
}
-fun ActivityTestRule<*>.validateSquareColors(
+@Suppress("DEPRECATION")
+fun androidx.test.rule.ActivityTestRule<*>.validateSquareColors(
drawLatch: CountDownLatch,
outerColor: Color,
innerColor: Color,
@@ -3015,8 +3016,9 @@
var innerColor: Color by mutableStateOf(innerColor)
}
+@Suppress("DEPRECATION")
// We only need this because IR compiler doesn't like converting lambdas to Runnables
-fun ActivityTestRule<*>.runOnUiThreadIR(block: () -> Unit) {
+fun androidx.test.rule.ActivityTestRule<*>.runOnUiThreadIR(block: () -> Unit) {
val runnable: Runnable = object : Runnable {
override fun run() {
block()
@@ -3025,7 +3027,8 @@
runOnUiThread(runnable)
}
-fun ActivityTestRule<*>.findAndroidComposeView(): ViewGroup {
+@Suppress("DEPRECATION")
+fun androidx.test.rule.ActivityTestRule<*>.findAndroidComposeView(): ViewGroup {
val contentViewGroup = activity.findViewById<ViewGroup>(android.R.id.content)
return findAndroidComposeView(contentViewGroup)!!
}
@@ -3047,8 +3050,11 @@
return null
}
+@Suppress("DEPRECATION")
@RequiresApi(Build.VERSION_CODES.O)
-fun ActivityTestRule<*>.waitAndScreenShot(forceInvalidate: Boolean = true): Bitmap {
+fun androidx.test.rule.ActivityTestRule<*>.waitAndScreenShot(
+ forceInvalidate: Boolean = true
+): Bitmap {
val view = findAndroidComposeView()
val flushListener = DrawCounterListener(view)
val offset = intArrayOf(0, 0)
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/ClipTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/ClipTest.kt
index e05ff33..3ecb706 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/ClipTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/ClipTest.kt
@@ -21,7 +21,6 @@
import androidx.compose.mutableStateOf
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.DrawLayerModifier
import androidx.ui.core.Modifier
import androidx.ui.core.clip
@@ -56,8 +55,9 @@
@RunWith(JUnit4::class)
class ClipTest {
+ @Suppress("DEPRECATION")
@get:Rule
- val rule = ActivityTestRule<TestActivity>(TestActivity::class.java)
+ val rule = androidx.test.rule.ActivityTestRule<TestActivity>(TestActivity::class.java)
private lateinit var activity: TestActivity
private lateinit var drawLatch: CountDownLatch
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/DrawLayerTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/DrawLayerTest.kt
index a5a6d81..6137791 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/DrawLayerTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/DrawLayerTest.kt
@@ -17,7 +17,6 @@
package androidx.ui.core.test
import androidx.test.filters.SmallTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.LayoutCoordinates
import androidx.ui.core.Modifier
import androidx.ui.core.TransformOrigin
@@ -47,8 +46,9 @@
@SmallTest
@RunWith(JUnit4::class)
class DrawLayerTest {
+ @Suppress("DEPRECATION")
@get:Rule
- val activityTestRule = ActivityTestRule<TestActivity>(
+ val activityTestRule = androidx.test.rule.ActivityTestRule<TestActivity>(
TestActivity::class.java
)
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/DrawReorderingTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/DrawReorderingTest.kt
index ffa9f55..4306bd0 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/DrawReorderingTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/DrawReorderingTest.kt
@@ -26,7 +26,6 @@
import androidx.compose.mutableStateOf
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.Constraints
import androidx.ui.core.DrawLayerModifier
import androidx.ui.core.Layout
@@ -53,8 +52,9 @@
@SmallTest
@RunWith(JUnit4::class)
class DrawReorderingTest {
+ @Suppress("DEPRECATION")
@get:Rule
- val rule = ActivityTestRule<TestActivity>(
+ val rule = androidx.test.rule.ActivityTestRule<TestActivity>(
TestActivity::class.java
)
@get:Rule
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/DrawShadowTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/DrawShadowTest.kt
index f3c685c..6d66d0bc5 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/DrawShadowTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/DrawShadowTest.kt
@@ -23,7 +23,6 @@
import androidx.compose.mutableStateOf
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.Modifier
import androidx.ui.core.drawBehind
import androidx.ui.core.drawLayer
@@ -55,8 +54,9 @@
@RunWith(JUnit4::class)
class DrawShadowTest {
+ @Suppress("DEPRECATION")
@get:Rule
- val rule = ActivityTestRule<TestActivity>(TestActivity::class.java)
+ val rule = androidx.test.rule.ActivityTestRule<TestActivity>(TestActivity::class.java)
private lateinit var activity: TestActivity
private lateinit var drawLatch: CountDownLatch
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/LayoutTagTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/LayoutTagTest.kt
index 448ca22..350815a 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/LayoutTagTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/LayoutTagTest.kt
@@ -18,7 +18,6 @@
import androidx.compose.emptyContent
import androidx.test.filters.SmallTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.Layout
import androidx.ui.core.Modifier
import androidx.ui.core.setContent
@@ -39,8 +38,9 @@
@SmallTest
@RunWith(JUnit4::class)
class LayoutTagTest {
+ @Suppress("DEPRECATION")
@get:Rule
- val rule = ActivityTestRule<TestActivity>(TestActivity::class.java)
+ val rule = androidx.test.rule.ActivityTestRule<TestActivity>(TestActivity::class.java)
private lateinit var activity: TestActivity
@Before
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/ModelReadsTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/ModelReadsTest.kt
index 95cb933..a89f1ff 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/ModelReadsTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/ModelReadsTest.kt
@@ -20,7 +20,6 @@
import androidx.compose.MutableState
import androidx.compose.mutableStateOf
import androidx.test.filters.SmallTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.Layout
import androidx.ui.core.Modifier
import androidx.ui.core.drawBehind
@@ -42,8 +41,9 @@
@RunWith(JUnit4::class)
class ModelReadsTest {
+ @Suppress("DEPRECATION")
@get:Rule
- val rule = ActivityTestRule<TestActivity>(TestActivity::class.java)
+ val rule = androidx.test.rule.ActivityTestRule<TestActivity>(TestActivity::class.java)
@get:Rule
val excessiveAssertions = AndroidOwnerExtraAssertionsRule()
private lateinit var activity: TestActivity
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/OnPositionedTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/OnPositionedTest.kt
index a391eb4..4549778 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/OnPositionedTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/OnPositionedTest.kt
@@ -20,7 +20,6 @@
import androidx.compose.mutableStateOf
import androidx.compose.setValue
import androidx.test.filters.SmallTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.Layout
import androidx.ui.core.LayoutCoordinates
import androidx.ui.core.Modifier
@@ -49,8 +48,9 @@
@RunWith(JUnit4::class)
class OnPositionedTest {
+ @Suppress("DEPRECATION")
@get:Rule
- val rule = ActivityTestRule<TestActivity>(TestActivity::class.java)
+ val rule = androidx.test.rule.ActivityTestRule<TestActivity>(TestActivity::class.java)
private lateinit var activity: TestActivity
@Before
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/OpacityTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/OpacityTest.kt
index 7ac8d3b..0378a4a 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/OpacityTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/OpacityTest.kt
@@ -24,7 +24,6 @@
import androidx.compose.setValue
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.Layout
import androidx.ui.core.Modifier
import androidx.ui.core.drawBehind
@@ -48,8 +47,9 @@
@RunWith(JUnit4::class)
class OpacityTest {
+ @Suppress("DEPRECATION")
@get:Rule
- val rule = ActivityTestRule<TestActivity>(TestActivity::class.java)
+ val rule = androidx.test.rule.ActivityTestRule<TestActivity>(TestActivity::class.java)
private lateinit var activity: TestActivity
private lateinit var drawLatch: CountDownLatch
private val unlatch = Modifier.drawBehind { drawLatch.countDown() }
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/ParentDataModifierTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/ParentDataModifierTest.kt
index d505357..b41ee6c 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/ParentDataModifierTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/ParentDataModifierTest.kt
@@ -18,7 +18,6 @@
import androidx.compose.Composable
import androidx.compose.emptyContent
import androidx.test.filters.SmallTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.Layout
import androidx.ui.core.LayoutTagParentData
import androidx.ui.core.Modifier
@@ -43,8 +42,9 @@
@SmallTest
@RunWith(JUnit4::class)
class ParentDataModifierTest {
+ @Suppress("DEPRECATION")
@get:Rule
- val activityTestRule = ActivityTestRule<TestActivity>(
+ val activityTestRule = androidx.test.rule.ActivityTestRule<TestActivity>(
TestActivity::class.java
)
private lateinit var activity: TestActivity
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/RootNodeLayoutTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/RootNodeLayoutTest.kt
index 5e5ca89..1d2e46d 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/RootNodeLayoutTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/RootNodeLayoutTest.kt
@@ -20,7 +20,6 @@
import android.widget.FrameLayout
import androidx.compose.Recomposer
import androidx.test.filters.SmallTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.Constraints
import androidx.ui.core.Layout
import androidx.ui.core.LayoutCoordinates
@@ -48,8 +47,9 @@
@RunWith(JUnit4::class)
class RootNodeLayoutTest {
+ @Suppress("DEPRECATION")
@get:Rule
- val rule = ActivityTestRule<TestActivity>(TestActivity::class.java)
+ val rule = androidx.test.rule.ActivityTestRule<TestActivity>(TestActivity::class.java)
private lateinit var activity: TestActivity
@Before
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/RtlLayoutTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/RtlLayoutTest.kt
index 4acf3dd..91cdffa 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/RtlLayoutTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/RtlLayoutTest.kt
@@ -21,7 +21,6 @@
import androidx.compose.mutableStateOf
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.Constraints
import androidx.ui.core.IntrinsicMeasurable
import androidx.ui.core.IntrinsicMeasureScope
@@ -61,8 +60,10 @@
@SmallTest
@RunWith(JUnit4::class)
class RtlLayoutTest {
+ @Suppress("DEPRECATION")
@get:Rule
- val activityTestRule = ActivityTestRule<androidx.ui.framework.test.TestActivity>(
+ val activityTestRule =
+ androidx.test.rule.ActivityTestRule<androidx.ui.framework.test.TestActivity>(
androidx.ui.framework.test.TestActivity::class.java
)
private lateinit var activity: androidx.ui.framework.test.TestActivity
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/WithConstraintsTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/WithConstraintsTest.kt
index 8598aeb..62d2a13 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/WithConstraintsTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/WithConstraintsTest.kt
@@ -31,7 +31,6 @@
import androidx.compose.state
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.Constraints
import androidx.ui.core.DensityAmbient
import androidx.ui.core.Layout
@@ -75,8 +74,9 @@
@RunWith(JUnit4::class)
class WithConstraintsTest {
+ @Suppress("DEPRECATION")
@get:Rule
- val rule = ActivityTestRule<TestActivity>(
+ val rule = androidx.test.rule.ActivityTestRule<TestActivity>(
TestActivity::class.java
)
@get:Rule
diff --git a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/WrapperTest.kt b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/WrapperTest.kt
index d524623..8325f0d 100644
--- a/ui/ui-core/src/androidTest/java/androidx/ui/core/test/WrapperTest.kt
+++ b/ui/ui-core/src/androidTest/java/androidx/ui/core/test/WrapperTest.kt
@@ -28,7 +28,6 @@
import androidx.lifecycle.LifecycleRegistry
import androidx.lifecycle.ViewTreeLifecycleOwner
import androidx.test.filters.SmallTest
-import androidx.test.rule.ActivityTestRule
import androidx.ui.core.LifecycleOwnerAmbient
import androidx.ui.core.setContent
import androidx.ui.framework.test.TestActivity
@@ -49,8 +48,9 @@
@SmallTest
@RunWith(JUnit4::class)
class WrapperTest {
+ @Suppress("DEPRECATION")
@get:Rule
- val activityTestRule = ActivityTestRule<TestActivity>(
+ val activityTestRule = androidx.test.rule.ActivityTestRule<TestActivity>(
TestActivity::class.java
)
private lateinit var activity: TestActivity