Migrates :compose:testutils to androidx.compose.testutils
Bug: b/160233169
Test: ./gradlew bOS
Change-Id: I10e982aec49c4555a02e2793b8b098ecd526e71a
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/EmptyBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/EmptyBenchmark.kt
index 1f34ec3..6f81cc95 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/EmptyBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/EmptyBenchmark.kt
@@ -16,13 +16,13 @@
package androidx.compose.ui
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkDrawPerf
+import androidx.compose.testutils.benchmark.benchmarkFirstCompose
+import androidx.compose.testutils.benchmark.benchmarkFirstDraw
+import androidx.compose.testutils.benchmark.benchmarkFirstLayout
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasure
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.ComposeBenchmarkRule
-import androidx.ui.benchmark.benchmarkDrawPerf
-import androidx.ui.benchmark.benchmarkFirstCompose
-import androidx.ui.benchmark.benchmarkFirstDraw
-import androidx.ui.benchmark.benchmarkFirstLayout
-import androidx.ui.benchmark.benchmarkFirstMeasure
import androidx.ui.integration.test.core.EmptyTestCase
import org.junit.Rule
import org.junit.Test
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/EmptyFirstFastBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/EmptyFirstFastBenchmark.kt
index 216ae78..f6ada0a 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/EmptyFirstFastBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/EmptyFirstFastBenchmark.kt
@@ -18,13 +18,13 @@
import androidx.compose.foundation.layout.Stack
import androidx.compose.runtime.Composable
+import androidx.compose.testutils.LayeredComposeTestCase
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkFirstComposeFast
+import androidx.compose.testutils.benchmark.benchmarkFirstDrawFast
+import androidx.compose.testutils.benchmark.benchmarkFirstLayoutFast
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasureFast
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.ComposeBenchmarkRule
-import androidx.ui.benchmark.benchmarkFirstComposeFast
-import androidx.ui.benchmark.benchmarkFirstDrawFast
-import androidx.ui.benchmark.benchmarkFirstLayoutFast
-import androidx.ui.benchmark.benchmarkFirstMeasureFast
-import androidx.ui.test.LayeredComposeTestCase
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/OnPositionedBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/OnPositionedBenchmark.kt
index dc8f396..549569c 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/OnPositionedBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/OnPositionedBenchmark.kt
@@ -24,13 +24,13 @@
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.testutils.ToggleableTestCase
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkLayout
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.ComposeBenchmarkRule
-import androidx.ui.benchmark.toggleStateBenchmarkLayout
-import androidx.ui.test.ToggleableTestCase
-import androidx.ui.test.ComposeTestCase
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/TextBasicBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/TextBasicBenchmark.kt
index 1b94abd..1d469ec 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/TextBasicBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/TextBasicBenchmark.kt
@@ -16,22 +16,22 @@
package androidx.compose.ui
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkDrawPerf
+import androidx.compose.testutils.benchmark.benchmarkFirstComposeFast
+import androidx.compose.testutils.benchmark.benchmarkFirstDrawFast
+import androidx.compose.testutils.benchmark.benchmarkFirstLayoutFast
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasureFast
+import androidx.compose.testutils.benchmark.benchmarkLayoutPerf
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkDraw
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkLayout
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkMeasure
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkRecompose
import androidx.compose.ui.text.AnnotatedString
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.ComposeBenchmarkRule
-import androidx.ui.benchmark.benchmarkDrawPerf
-import androidx.ui.benchmark.benchmarkLayoutPerf
-import androidx.ui.benchmark.toggleStateBenchmarkDraw
-import androidx.ui.benchmark.toggleStateBenchmarkLayout
-import androidx.ui.benchmark.toggleStateBenchmarkMeasure
-import androidx.ui.benchmark.toggleStateBenchmarkRecompose
import androidx.ui.integration.test.TextBenchmarkTestRule
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
-import androidx.ui.benchmark.benchmarkFirstComposeFast
-import androidx.ui.benchmark.benchmarkFirstDrawFast
-import androidx.ui.benchmark.benchmarkFirstLayoutFast
-import androidx.ui.benchmark.benchmarkFirstMeasureFast
import androidx.ui.integration.test.core.text.TextInColumnTestCase
import org.junit.Rule
import org.junit.Test
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/TextMultiStyleBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/TextMultiStyleBenchmark.kt
index dccc21a34..242d7e8 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/TextMultiStyleBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/TextMultiStyleBenchmark.kt
@@ -16,14 +16,14 @@
package androidx.compose.ui
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkDrawPerf
+import androidx.compose.testutils.benchmark.benchmarkFirstCompose
+import androidx.compose.testutils.benchmark.benchmarkFirstDraw
+import androidx.compose.testutils.benchmark.benchmarkFirstLayout
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasure
+import androidx.compose.testutils.benchmark.benchmarkLayoutPerf
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.ComposeBenchmarkRule
-import androidx.ui.benchmark.benchmarkDrawPerf
-import androidx.ui.benchmark.benchmarkFirstCompose
-import androidx.ui.benchmark.benchmarkFirstDraw
-import androidx.ui.benchmark.benchmarkFirstLayout
-import androidx.ui.benchmark.benchmarkFirstMeasure
-import androidx.ui.benchmark.benchmarkLayoutPerf
import androidx.ui.integration.test.TextBenchmarkTestRule
import androidx.ui.integration.test.cartesian
import androidx.compose.ui.unit.dp
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/TextToggleTextBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/TextToggleTextBenchmark.kt
index 6a1c24c..81cc556 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/TextToggleTextBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/TextToggleTextBenchmark.kt
@@ -16,12 +16,12 @@
package androidx.compose.ui
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkDraw
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkLayout
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkMeasure
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkRecompose
import androidx.test.filters.SmallTest
-import androidx.ui.benchmark.ComposeBenchmarkRule
-import androidx.ui.benchmark.toggleStateBenchmarkDraw
-import androidx.ui.benchmark.toggleStateBenchmarkLayout
-import androidx.ui.benchmark.toggleStateBenchmarkMeasure
-import androidx.ui.benchmark.toggleStateBenchmarkRecompose
import androidx.ui.integration.test.TextBenchmarkTestRule
import androidx.ui.integration.test.core.text.TextToggleTextTestCase
import androidx.compose.ui.unit.dp
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/WithConstraintsBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/WithConstraintsBenchmark.kt
index 00f724c..3beae93 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/WithConstraintsBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/WithConstraintsBenchmark.kt
@@ -26,16 +26,16 @@
import androidx.compose.runtime.State
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.testutils.ToggleableTestCase
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkComposeMeasureLayout
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkMeasureLayout
import androidx.compose.ui.unit.Constraints
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.ComposeBenchmarkRule
-import androidx.ui.benchmark.toggleStateBenchmarkComposeMeasureLayout
-import androidx.ui.benchmark.toggleStateBenchmarkMeasureLayout
-import androidx.ui.test.ToggleableTestCase
-import androidx.ui.test.ComposeTestCase
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/TextDelegateBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/TextDelegateBenchmark.kt
index cac5740..f948f8a 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/TextDelegateBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/compose/ui/text/TextDelegateBenchmark.kt
@@ -20,9 +20,9 @@
import android.util.TypedValue
import androidx.benchmark.junit4.BenchmarkRule
import androidx.benchmark.junit4.measureRepeated
+import androidx.compose.testutils.benchmark.measureRepeatedRecordingCanvas
import androidx.test.filters.LargeTest
import androidx.test.platform.app.InstrumentationRegistry
-import androidx.ui.benchmark.measureRepeatedRecordingCanvas
import androidx.compose.ui.unit.Constraints
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.graphics.Canvas
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/AnimationBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/AnimationBenchmark.kt
index 593dacf..352a23c 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/AnimationBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/AnimationBenchmark.kt
@@ -16,6 +16,8 @@
package androidx.ui.benchmark.test
+import androidx.benchmark.junit4.BenchmarkRule
+import androidx.benchmark.junit4.measureRepeated
import androidx.compose.animation.core.AnimationVector1D
import androidx.compose.animation.core.AnimationVector2D
import androidx.compose.animation.core.AnimationVector3D
@@ -29,8 +31,6 @@
import androidx.compose.animation.core.VectorizedSpringSpec
import androidx.compose.animation.core.VectorizedTweenSpec
import androidx.compose.animation.core.createAnimation
-import androidx.benchmark.junit4.BenchmarkRule
-import androidx.benchmark.junit4.measureRepeated
import androidx.test.filters.LargeTest
import org.junit.Rule
import org.junit.Test
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/AnimationClockBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/AnimationClockBenchmark.kt
index 60a44f1..dbb19e5 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/AnimationClockBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/AnimationClockBenchmark.kt
@@ -16,11 +16,11 @@
package androidx.ui.benchmark.test
+import androidx.benchmark.junit4.BenchmarkRule
+import androidx.benchmark.junit4.measureRepeated
import androidx.compose.animation.core.AnimationClockObservable
import androidx.compose.animation.core.AnimationClockObserver
import androidx.compose.animation.core.ManualAnimationClock
-import androidx.benchmark.junit4.BenchmarkRule
-import androidx.benchmark.junit4.measureRepeated
import androidx.test.filters.LargeTest
import org.junit.Rule
import org.junit.Test
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/CheckboxesInRowsBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/CheckboxesInRowsBenchmark.kt
index 0de64ce..379fa20 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/CheckboxesInRowsBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/CheckboxesInRowsBenchmark.kt
@@ -16,18 +16,18 @@
package androidx.ui.benchmark.test
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkDrawPerf
+import androidx.compose.testutils.benchmark.benchmarkFirstCompose
+import androidx.compose.testutils.benchmark.benchmarkFirstDraw
+import androidx.compose.testutils.benchmark.benchmarkFirstLayout
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasure
+import androidx.compose.testutils.benchmark.benchmarkLayoutPerf
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkDraw
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkLayout
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkMeasure
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkRecompose
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.ComposeBenchmarkRule
-import androidx.ui.benchmark.benchmarkDrawPerf
-import androidx.ui.benchmark.benchmarkFirstCompose
-import androidx.ui.benchmark.benchmarkFirstDraw
-import androidx.ui.benchmark.benchmarkFirstLayout
-import androidx.ui.benchmark.benchmarkFirstMeasure
-import androidx.ui.benchmark.benchmarkLayoutPerf
-import androidx.ui.benchmark.toggleStateBenchmarkDraw
-import androidx.ui.benchmark.toggleStateBenchmarkLayout
-import androidx.ui.benchmark.toggleStateBenchmarkMeasure
-import androidx.ui.benchmark.toggleStateBenchmarkRecompose
import androidx.ui.integration.test.material.CheckboxesInRowsTestCase
import org.junit.Rule
import org.junit.Test
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/LayoutNodeModifierBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/LayoutNodeModifierBenchmark.kt
index 71b65e5..ec1599150 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/LayoutNodeModifierBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/LayoutNodeModifierBenchmark.kt
@@ -20,25 +20,25 @@
import androidx.activity.ComponentActivity
import androidx.benchmark.junit4.BenchmarkRule
import androidx.benchmark.junit4.measureRepeated
-import androidx.test.filters.LargeTest
-import androidx.compose.ui.node.ExperimentalLayoutNodeApi
-import androidx.compose.ui.node.LayoutNode
+import androidx.compose.foundation.Box
+import androidx.compose.foundation.layout.padding
import androidx.compose.ui.Modifier
import androidx.compose.ui.drawBehind
+import androidx.compose.ui.drawLayer
import androidx.compose.ui.gesture.pressIndicatorGestureFilter
import androidx.compose.ui.input.key.ExperimentalKeyInput
import androidx.compose.ui.input.key.keyInputFilter
import androidx.compose.ui.layout.layoutId
+import androidx.compose.ui.node.ExperimentalLayoutNodeApi
+import androidx.compose.ui.node.LayoutNode
import androidx.compose.ui.onPositioned
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.platform.setContent
-import androidx.compose.foundation.Box
-import androidx.compose.foundation.layout.padding
-import androidx.compose.ui.drawLayer
import androidx.compose.ui.platform.AndroidOwner
-import androidx.ui.test.DisableTransitions
+import androidx.compose.ui.platform.setContent
+import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
+import androidx.test.filters.LargeTest
+import androidx.ui.test.DisableTransitions
import org.junit.Before
import org.junit.Rule
import org.junit.Test
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/NestedScrollerBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/NestedScrollerBenchmark.kt
index 675c3ce..a5e8a97 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/NestedScrollerBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/NestedScrollerBenchmark.kt
@@ -16,17 +16,17 @@
package androidx.ui.benchmark.test
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkDrawPerf
+import androidx.compose.testutils.benchmark.benchmarkFirstCompose
+import androidx.compose.testutils.benchmark.benchmarkFirstDraw
+import androidx.compose.testutils.benchmark.benchmarkFirstLayout
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasure
+import androidx.compose.testutils.benchmark.benchmarkLayoutPerf
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkDraw
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkLayout
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkMeasure
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.ComposeBenchmarkRule
-import androidx.ui.benchmark.benchmarkDrawPerf
-import androidx.ui.benchmark.benchmarkFirstCompose
-import androidx.ui.benchmark.benchmarkFirstDraw
-import androidx.ui.benchmark.benchmarkFirstLayout
-import androidx.ui.benchmark.benchmarkFirstMeasure
-import androidx.ui.benchmark.benchmarkLayoutPerf
-import androidx.ui.benchmark.toggleStateBenchmarkDraw
-import androidx.ui.benchmark.toggleStateBenchmarkLayout
-import androidx.ui.benchmark.toggleStateBenchmarkMeasure
import androidx.ui.integration.test.foundation.NestedScrollerTestCase
import org.junit.Rule
import org.junit.Test
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/RadioGroupBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/RadioGroupBenchmark.kt
index e3f82df..7323ce9 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/RadioGroupBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/RadioGroupBenchmark.kt
@@ -16,29 +16,29 @@
package androidx.ui.benchmark.test
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateOf
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.ComposeBenchmarkRule
-import androidx.ui.benchmark.benchmarkFirstCompose
-import androidx.ui.benchmark.benchmarkFirstDraw
-import androidx.ui.benchmark.benchmarkFirstLayout
-import androidx.ui.benchmark.benchmarkFirstMeasure
-import androidx.ui.benchmark.toggleStateBenchmarkDraw
-import androidx.ui.benchmark.toggleStateBenchmarkLayout
-import androidx.ui.benchmark.toggleStateBenchmarkMeasure
-import androidx.ui.benchmark.toggleStateBenchmarkRecompose
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
import androidx.compose.foundation.Text
-import androidx.compose.foundation.selection.selectable
-import androidx.ui.test.ToggleableTestCase
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.selection.selectable
import androidx.compose.material.MaterialTheme
import androidx.compose.material.RadioButton
-import androidx.ui.test.ComposeTestCase
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.testutils.ToggleableTestCase
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkFirstCompose
+import androidx.compose.testutils.benchmark.benchmarkFirstDraw
+import androidx.compose.testutils.benchmark.benchmarkFirstLayout
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasure
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkDraw
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkLayout
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkMeasure
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkRecompose
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/RectsInColumnBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/RectsInColumnBenchmark.kt
index fc82db8..8e3643b 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/RectsInColumnBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/RectsInColumnBenchmark.kt
@@ -16,18 +16,18 @@
package androidx.ui.benchmark.test
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkDrawPerf
+import androidx.compose.testutils.benchmark.benchmarkFirstCompose
+import androidx.compose.testutils.benchmark.benchmarkFirstDraw
+import androidx.compose.testutils.benchmark.benchmarkFirstLayout
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasure
+import androidx.compose.testutils.benchmark.benchmarkLayoutPerf
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkDraw
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkLayout
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkMeasure
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkRecompose
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.ComposeBenchmarkRule
-import androidx.ui.benchmark.benchmarkDrawPerf
-import androidx.ui.benchmark.benchmarkFirstCompose
-import androidx.ui.benchmark.benchmarkFirstDraw
-import androidx.ui.benchmark.benchmarkFirstLayout
-import androidx.ui.benchmark.benchmarkFirstMeasure
-import androidx.ui.benchmark.benchmarkLayoutPerf
-import androidx.ui.benchmark.toggleStateBenchmarkDraw
-import androidx.ui.benchmark.toggleStateBenchmarkLayout
-import androidx.ui.benchmark.toggleStateBenchmarkMeasure
-import androidx.ui.benchmark.toggleStateBenchmarkRecompose
import androidx.ui.integration.test.foundation.RectsInColumnTestCase
import org.junit.Rule
import org.junit.Test
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/RectsInColumnSharedModelBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/RectsInColumnSharedModelBenchmark.kt
index 651d6e4..bcec0e9 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/RectsInColumnSharedModelBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/RectsInColumnSharedModelBenchmark.kt
@@ -16,18 +16,18 @@
package androidx.ui.benchmark.test
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkDrawPerf
+import androidx.compose.testutils.benchmark.benchmarkFirstCompose
+import androidx.compose.testutils.benchmark.benchmarkFirstDraw
+import androidx.compose.testutils.benchmark.benchmarkFirstLayout
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasure
+import androidx.compose.testutils.benchmark.benchmarkLayoutPerf
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkDraw
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkLayout
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkMeasure
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkRecompose
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.ComposeBenchmarkRule
-import androidx.ui.benchmark.benchmarkDrawPerf
-import androidx.ui.benchmark.benchmarkFirstCompose
-import androidx.ui.benchmark.benchmarkFirstDraw
-import androidx.ui.benchmark.benchmarkFirstLayout
-import androidx.ui.benchmark.benchmarkFirstMeasure
-import androidx.ui.benchmark.benchmarkLayoutPerf
-import androidx.ui.benchmark.toggleStateBenchmarkDraw
-import androidx.ui.benchmark.toggleStateBenchmarkLayout
-import androidx.ui.benchmark.toggleStateBenchmarkMeasure
-import androidx.ui.benchmark.toggleStateBenchmarkRecompose
import androidx.ui.integration.test.foundation.RectsInColumnSharedModelTestCase
import org.junit.Rule
import org.junit.Test
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/ScrollerBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/ScrollerBenchmark.kt
index 032e468a..03aca7e 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/ScrollerBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/ScrollerBenchmark.kt
@@ -16,17 +16,17 @@
package androidx.ui.benchmark.test
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkDrawPerf
+import androidx.compose.testutils.benchmark.benchmarkFirstCompose
+import androidx.compose.testutils.benchmark.benchmarkFirstDraw
+import androidx.compose.testutils.benchmark.benchmarkFirstLayout
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasure
+import androidx.compose.testutils.benchmark.benchmarkLayoutPerf
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkDraw
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkLayout
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkMeasure
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.ComposeBenchmarkRule
-import androidx.ui.benchmark.benchmarkDrawPerf
-import androidx.ui.benchmark.benchmarkFirstCompose
-import androidx.ui.benchmark.benchmarkFirstDraw
-import androidx.ui.benchmark.benchmarkFirstLayout
-import androidx.ui.benchmark.benchmarkFirstMeasure
-import androidx.ui.benchmark.benchmarkLayoutPerf
-import androidx.ui.benchmark.toggleStateBenchmarkDraw
-import androidx.ui.benchmark.toggleStateBenchmarkLayout
-import androidx.ui.benchmark.toggleStateBenchmarkMeasure
import androidx.ui.integration.test.foundation.ScrollerTestCase
import org.junit.Rule
import org.junit.Test
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SimpleRadioButtonBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SimpleRadioButtonBenchmark.kt
index 7ec5666..9254f2c 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SimpleRadioButtonBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SimpleRadioButtonBenchmark.kt
@@ -16,18 +16,18 @@
package androidx.ui.benchmark.test
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkDrawPerf
+import androidx.compose.testutils.benchmark.benchmarkFirstCompose
+import androidx.compose.testutils.benchmark.benchmarkFirstDraw
+import androidx.compose.testutils.benchmark.benchmarkFirstLayout
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasure
+import androidx.compose.testutils.benchmark.benchmarkLayoutPerf
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkDraw
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkLayout
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkMeasure
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkRecompose
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.ComposeBenchmarkRule
-import androidx.ui.benchmark.benchmarkDrawPerf
-import androidx.ui.benchmark.benchmarkFirstCompose
-import androidx.ui.benchmark.benchmarkFirstDraw
-import androidx.ui.benchmark.benchmarkFirstLayout
-import androidx.ui.benchmark.benchmarkFirstMeasure
-import androidx.ui.benchmark.benchmarkLayoutPerf
-import androidx.ui.benchmark.toggleStateBenchmarkDraw
-import androidx.ui.benchmark.toggleStateBenchmarkLayout
-import androidx.ui.benchmark.toggleStateBenchmarkMeasure
-import androidx.ui.benchmark.toggleStateBenchmarkRecompose
import androidx.ui.integration.test.core.SimpleRadioButton1TestCase
import androidx.ui.integration.test.core.SimpleRadioButton2TestCase
import androidx.ui.integration.test.core.SimpleRadioButton3TestCase
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SpacingBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SpacingBenchmark.kt
index 9d6da9d..e553a6d 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SpacingBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SpacingBenchmark.kt
@@ -22,25 +22,25 @@
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.testutils.ToggleableTestCase
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkDrawPerf
+import androidx.compose.testutils.benchmark.benchmarkFirstCompose
+import androidx.compose.testutils.benchmark.benchmarkFirstDraw
+import androidx.compose.testutils.benchmark.benchmarkFirstLayout
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasure
+import androidx.compose.testutils.benchmark.benchmarkLayoutPerf
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkDraw
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkLayout
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkMeasure
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkRecompose
import androidx.compose.ui.Layout
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.offset
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.ComposeBenchmarkRule
-import androidx.ui.benchmark.benchmarkDrawPerf
-import androidx.ui.benchmark.benchmarkFirstCompose
-import androidx.ui.benchmark.benchmarkFirstDraw
-import androidx.ui.benchmark.benchmarkFirstLayout
-import androidx.ui.benchmark.benchmarkFirstMeasure
-import androidx.ui.benchmark.benchmarkLayoutPerf
-import androidx.ui.benchmark.toggleStateBenchmarkDraw
-import androidx.ui.benchmark.toggleStateBenchmarkLayout
-import androidx.ui.benchmark.toggleStateBenchmarkMeasure
-import androidx.ui.benchmark.toggleStateBenchmarkRecompose
-import androidx.ui.test.ToggleableTestCase
-import androidx.ui.test.ComposeTestCase
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SpringEstimationBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SpringEstimationBenchmark.kt
index 4c487ae..fcd20d4 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SpringEstimationBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/SpringEstimationBenchmark.kt
@@ -16,9 +16,9 @@
package androidx.ui.benchmark.test
-import androidx.compose.animation.core.estimateAnimationDurationMillis
import androidx.benchmark.junit4.BenchmarkRule
import androidx.benchmark.junit4.measureRepeated
+import androidx.compose.animation.core.estimateAnimationDurationMillis
import androidx.test.filters.LargeTest
import org.junit.Rule
import org.junit.Test
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/TextInColumnBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/TextInColumnBenchmark.kt
index 25ce2fd..1537c5c 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/TextInColumnBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/TextInColumnBenchmark.kt
@@ -16,18 +16,18 @@
package androidx.ui.benchmark.test
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkDrawPerf
+import androidx.compose.testutils.benchmark.benchmarkFirstCompose
+import androidx.compose.testutils.benchmark.benchmarkFirstDraw
+import androidx.compose.testutils.benchmark.benchmarkFirstLayout
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasure
+import androidx.compose.testutils.benchmark.benchmarkLayoutPerf
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkDraw
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkLayout
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkMeasure
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkRecompose
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.ComposeBenchmarkRule
-import androidx.ui.benchmark.benchmarkDrawPerf
-import androidx.ui.benchmark.benchmarkFirstCompose
-import androidx.ui.benchmark.benchmarkFirstDraw
-import androidx.ui.benchmark.benchmarkFirstLayout
-import androidx.ui.benchmark.benchmarkFirstMeasure
-import androidx.ui.benchmark.benchmarkLayoutPerf
-import androidx.ui.benchmark.toggleStateBenchmarkDraw
-import androidx.ui.benchmark.toggleStateBenchmarkLayout
-import androidx.ui.benchmark.toggleStateBenchmarkMeasure
-import androidx.ui.benchmark.toggleStateBenchmarkRecompose
import androidx.ui.integration.test.foundation.RectsInColumnTestCase
import androidx.ui.integration.test.foundation.TextInColumnTestCase
import org.junit.Rule
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/TrailingLambdaBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/TrailingLambdaBenchmark.kt
index dd53d3b..272fa0b 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/TrailingLambdaBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/TrailingLambdaBenchmark.kt
@@ -23,14 +23,14 @@
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.testutils.ToggleableTestCase
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkFirstCompose
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkRecompose
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.ComposeBenchmarkRule
-import androidx.ui.benchmark.benchmarkFirstCompose
-import androidx.ui.benchmark.toggleStateBenchmarkRecompose
-import androidx.ui.test.ToggleableTestCase
-import androidx.ui.test.ComposeTestCase
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@@ -63,7 +63,7 @@
}
}
-private sealed class TrailingLambdaTestCase() : ComposeTestCase, ToggleableTestCase {
+private sealed class TrailingLambdaTestCase : ComposeTestCase, ToggleableTestCase {
var numberState: MutableState<Int>? = null
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/VectorBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/VectorBenchmark.kt
index bcc2830..866dd9d 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/VectorBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/VectorBenchmark.kt
@@ -16,12 +16,12 @@
package androidx.ui.benchmark.test
+import androidx.compose.testutils.benchmark.ComposeBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkFirstCompose
+import androidx.compose.testutils.benchmark.benchmarkFirstDraw
+import androidx.compose.testutils.benchmark.benchmarkFirstLayout
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasure
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.ComposeBenchmarkRule
-import androidx.ui.benchmark.benchmarkFirstCompose
-import androidx.ui.benchmark.benchmarkFirstDraw
-import androidx.ui.benchmark.benchmarkFirstLayout
-import androidx.ui.benchmark.benchmarkFirstMeasure
import androidx.ui.integration.test.framework.ProgrammaticVectorTestCase
import androidx.ui.integration.test.framework.XmlVectorTestCase
import org.junit.Rule
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/autofill/AndroidAutofillBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/autofill/AndroidAutofillBenchmark.kt
index b23c2cd..354be02 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/autofill/AndroidAutofillBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/autofill/AndroidAutofillBenchmark.kt
@@ -21,15 +21,15 @@
import android.view.autofill.AutofillValue
import androidx.benchmark.junit4.BenchmarkRule
import androidx.benchmark.junit4.measureRepeated
-import androidx.test.annotation.UiThreadTest
-import androidx.test.filters.LargeTest
-import androidx.test.filters.SdkSuppress
import androidx.compose.ui.autofill.AutofillNode
import androidx.compose.ui.autofill.AutofillTree
import androidx.compose.ui.autofill.AutofillType
-import androidx.compose.ui.platform.ViewAmbient
import androidx.compose.ui.geometry.Rect
import androidx.compose.ui.platform.AutofillTreeAmbient
+import androidx.compose.ui.platform.ViewAmbient
+import androidx.test.annotation.UiThreadTest
+import androidx.test.filters.LargeTest
+import androidx.test.filters.SdkSuppress
import androidx.ui.test.createComposeRule
import org.junit.Before
import org.junit.Rule
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidCheckboxesInLinearLayoutBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidCheckboxesInLinearLayoutBenchmark.kt
index aa596ce..75aa9d3 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidCheckboxesInLinearLayoutBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidCheckboxesInLinearLayoutBenchmark.kt
@@ -16,14 +16,14 @@
package androidx.ui.benchmark.test.view
+import androidx.compose.testutils.benchmark.AndroidBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkDrawPerf
+import androidx.compose.testutils.benchmark.benchmarkFirstDraw
+import androidx.compose.testutils.benchmark.benchmarkFirstLayout
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasure
+import androidx.compose.testutils.benchmark.benchmarkFirstSetContent
+import androidx.compose.testutils.benchmark.benchmarkLayoutPerf
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.AndroidBenchmarkRule
-import androidx.ui.benchmark.benchmarkDrawPerf
-import androidx.ui.benchmark.benchmarkFirstDraw
-import androidx.ui.benchmark.benchmarkFirstLayout
-import androidx.ui.benchmark.benchmarkFirstMeasure
-import androidx.ui.benchmark.benchmarkFirstSetContent
-import androidx.ui.benchmark.benchmarkLayoutPerf
import androidx.ui.integration.test.view.AndroidCheckboxesInLinearLayoutTestCase
import org.junit.Rule
import org.junit.Test
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidNestedScrollViewBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidNestedScrollViewBenchmark.kt
index ce6677a..b57fcd7 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidNestedScrollViewBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidNestedScrollViewBenchmark.kt
@@ -16,17 +16,17 @@
package androidx.ui.benchmark.test.view
+import androidx.compose.testutils.benchmark.AndroidBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkDrawPerf
+import androidx.compose.testutils.benchmark.benchmarkFirstDraw
+import androidx.compose.testutils.benchmark.benchmarkFirstLayout
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasure
+import androidx.compose.testutils.benchmark.benchmarkFirstSetContent
+import androidx.compose.testutils.benchmark.benchmarkLayoutPerf
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkDraw
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkLayout
+import androidx.compose.testutils.benchmark.toggleStateBenchmarkMeasure
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.AndroidBenchmarkRule
-import androidx.ui.benchmark.benchmarkDrawPerf
-import androidx.ui.benchmark.benchmarkFirstDraw
-import androidx.ui.benchmark.benchmarkFirstLayout
-import androidx.ui.benchmark.benchmarkFirstMeasure
-import androidx.ui.benchmark.benchmarkFirstSetContent
-import androidx.ui.benchmark.benchmarkLayoutPerf
-import androidx.ui.benchmark.toggleStateBenchmarkDraw
-import androidx.ui.benchmark.toggleStateBenchmarkLayout
-import androidx.ui.benchmark.toggleStateBenchmarkMeasure
import androidx.ui.integration.test.view.AndroidNestedScrollViewTestCase
import org.junit.Rule
import org.junit.Test
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidRectsInLinearLayoutBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidRectsInLinearLayoutBenchmark.kt
index de8bcff..46426e6 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidRectsInLinearLayoutBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidRectsInLinearLayoutBenchmark.kt
@@ -16,14 +16,14 @@
package androidx.ui.benchmark.test.view
+import androidx.compose.testutils.benchmark.AndroidBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkDrawPerf
+import androidx.compose.testutils.benchmark.benchmarkFirstDraw
+import androidx.compose.testutils.benchmark.benchmarkFirstLayout
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasure
+import androidx.compose.testutils.benchmark.benchmarkFirstSetContent
+import androidx.compose.testutils.benchmark.benchmarkLayoutPerf
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.AndroidBenchmarkRule
-import androidx.ui.benchmark.benchmarkDrawPerf
-import androidx.ui.benchmark.benchmarkFirstDraw
-import androidx.ui.benchmark.benchmarkFirstLayout
-import androidx.ui.benchmark.benchmarkFirstMeasure
-import androidx.ui.benchmark.benchmarkFirstSetContent
-import androidx.ui.benchmark.benchmarkLayoutPerf
import androidx.ui.integration.test.view.AndroidCheckboxesInLinearLayoutTestCase
import androidx.ui.integration.test.view.AndroidRectsInLinearLayoutTestCase
import org.junit.Rule
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidTextViewBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidTextViewBenchmark.kt
index d82f070..b926fe3 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidTextViewBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidTextViewBenchmark.kt
@@ -16,16 +16,16 @@
package androidx.ui.benchmark.test.view
-import androidx.ui.integration.test.view.AndroidTextViewTestCase
+import androidx.compose.testutils.benchmark.AndroidBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkDrawPerf
+import androidx.compose.testutils.benchmark.benchmarkFirstDraw
+import androidx.compose.testutils.benchmark.benchmarkFirstLayout
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasure
+import androidx.compose.testutils.benchmark.benchmarkFirstSetContent
+import androidx.compose.testutils.benchmark.benchmarkLayoutPerf
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.AndroidBenchmarkRule
-import androidx.ui.benchmark.benchmarkDrawPerf
-import androidx.ui.benchmark.benchmarkFirstDraw
-import androidx.ui.benchmark.benchmarkFirstLayout
-import androidx.ui.benchmark.benchmarkFirstMeasure
-import androidx.ui.benchmark.benchmarkFirstSetContent
-import androidx.ui.benchmark.benchmarkLayoutPerf
import androidx.ui.integration.test.TextBenchmarkTestRule
+import androidx.ui.integration.test.view.AndroidTextViewTestCase
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidTextViewsInLinearLayoutBenchmark.kt b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidTextViewsInLinearLayoutBenchmark.kt
index c85a7fa..0bfe54e 100644
--- a/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidTextViewsInLinearLayoutBenchmark.kt
+++ b/compose/integration-tests/benchmark/src/androidTest/java/androidx/ui/benchmark/test/view/AndroidTextViewsInLinearLayoutBenchmark.kt
@@ -16,14 +16,14 @@
package androidx.ui.benchmark.test.view
+import androidx.compose.testutils.benchmark.AndroidBenchmarkRule
+import androidx.compose.testutils.benchmark.benchmarkDrawPerf
+import androidx.compose.testutils.benchmark.benchmarkFirstDraw
+import androidx.compose.testutils.benchmark.benchmarkFirstLayout
+import androidx.compose.testutils.benchmark.benchmarkFirstMeasure
+import androidx.compose.testutils.benchmark.benchmarkFirstSetContent
+import androidx.compose.testutils.benchmark.benchmarkLayoutPerf
import androidx.test.filters.LargeTest
-import androidx.ui.benchmark.AndroidBenchmarkRule
-import androidx.ui.benchmark.benchmarkDrawPerf
-import androidx.ui.benchmark.benchmarkFirstDraw
-import androidx.ui.benchmark.benchmarkFirstLayout
-import androidx.ui.benchmark.benchmarkFirstMeasure
-import androidx.ui.benchmark.benchmarkFirstSetContent
-import androidx.ui.benchmark.benchmarkLayoutPerf
import androidx.ui.integration.test.view.AndroidCheckboxesInLinearLayoutTestCase
import androidx.ui.integration.test.view.AndroidTextViewsInLinearLayoutTestCase
import org.junit.Rule
diff --git a/compose/integration-tests/src/androidTest/java/androidx/ui/integration/test/CheckboxesInRowsTest.kt b/compose/integration-tests/src/androidTest/java/androidx/ui/integration/test/CheckboxesInRowsTest.kt
index f7fa98109..45098d6 100644
--- a/compose/integration-tests/src/androidTest/java/androidx/ui/integration/test/CheckboxesInRowsTest.kt
+++ b/compose/integration-tests/src/androidTest/java/androidx/ui/integration/test/CheckboxesInRowsTest.kt
@@ -17,13 +17,13 @@
package androidx.ui.integration.test
import androidx.activity.ComponentActivity
+import androidx.compose.testutils.assertMeasureSizeIsPositive
+import androidx.compose.testutils.assertNoPendingChanges
+import androidx.compose.testutils.forGivenTestCase
import androidx.test.filters.MediumTest
-import androidx.ui.test.assertMeasureSizeIsPositive
-import androidx.ui.test.assertNoPendingChanges
import androidx.ui.integration.test.material.CheckboxesInRowsTestCase
import androidx.ui.test.ExperimentalTesting
import androidx.ui.test.android.createAndroidComposeRule
-import androidx.ui.test.forGivenTestCase
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/compose/integration-tests/src/androidTest/java/androidx/ui/integration/test/ObservableThemeTest.kt b/compose/integration-tests/src/androidTest/java/androidx/ui/integration/test/ObservableThemeTest.kt
index 18045a5..c39735ad 100644
--- a/compose/integration-tests/src/androidTest/java/androidx/ui/integration/test/ObservableThemeTest.kt
+++ b/compose/integration-tests/src/androidTest/java/androidx/ui/integration/test/ObservableThemeTest.kt
@@ -27,15 +27,15 @@
import androidx.compose.runtime.setValue
import androidx.compose.runtime.staticAmbientOf
import androidx.compose.runtime.structuralEqualityPolicy
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.testutils.ToggleableTestCase
+import androidx.compose.testutils.assertNoPendingChanges
+import androidx.compose.testutils.doFramesUntilNoChangesPending
+import androidx.compose.testutils.forGivenTestCase
import androidx.compose.ui.graphics.Color
import androidx.test.filters.MediumTest
-import androidx.ui.test.ComposeTestCase
-import androidx.ui.test.ToggleableTestCase
import androidx.ui.test.ExperimentalTesting
import androidx.ui.test.android.createAndroidComposeRule
-import androidx.ui.test.assertNoPendingChanges
-import androidx.ui.test.doFramesUntilNoChangesPending
-import androidx.ui.test.forGivenTestCase
import org.junit.Assert.assertEquals
import org.junit.Rule
import org.junit.Test
diff --git a/compose/integration-tests/src/androidTest/java/androidx/ui/integration/test/RectsInColumnSharedModelTest.kt b/compose/integration-tests/src/androidTest/java/androidx/ui/integration/test/RectsInColumnSharedModelTest.kt
index 4e8700a..3b107f6 100644
--- a/compose/integration-tests/src/androidTest/java/androidx/ui/integration/test/RectsInColumnSharedModelTest.kt
+++ b/compose/integration-tests/src/androidTest/java/androidx/ui/integration/test/RectsInColumnSharedModelTest.kt
@@ -17,13 +17,13 @@
package androidx.ui.integration.test
import androidx.activity.ComponentActivity
+import androidx.compose.testutils.assertMeasureSizeIsPositive
+import androidx.compose.testutils.assertNoPendingChanges
+import androidx.compose.testutils.forGivenTestCase
import androidx.test.filters.MediumTest
-import androidx.ui.test.assertMeasureSizeIsPositive
-import androidx.ui.test.assertNoPendingChanges
import androidx.ui.integration.test.foundation.RectsInColumnSharedModelTestCase
import androidx.ui.test.ExperimentalTesting
import androidx.ui.test.android.createAndroidComposeRule
-import androidx.ui.test.forGivenTestCase
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/compose/integration-tests/src/androidTest/java/androidx/ui/integration/test/RectsInColumnTest.kt b/compose/integration-tests/src/androidTest/java/androidx/ui/integration/test/RectsInColumnTest.kt
index e2a4c8b..54558f0 100644
--- a/compose/integration-tests/src/androidTest/java/androidx/ui/integration/test/RectsInColumnTest.kt
+++ b/compose/integration-tests/src/androidTest/java/androidx/ui/integration/test/RectsInColumnTest.kt
@@ -17,13 +17,13 @@
package androidx.ui.integration.test
import androidx.activity.ComponentActivity
+import androidx.compose.testutils.assertMeasureSizeIsPositive
+import androidx.compose.testutils.assertNoPendingChanges
+import androidx.compose.testutils.forGivenTestCase
import androidx.test.filters.MediumTest
-import androidx.ui.test.assertMeasureSizeIsPositive
-import androidx.ui.test.assertNoPendingChanges
import androidx.ui.integration.test.foundation.RectsInColumnTestCase
import androidx.ui.test.ExperimentalTesting
import androidx.ui.test.android.createAndroidComposeRule
-import androidx.ui.test.forGivenTestCase
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/compose/integration-tests/src/main/java/androidx/ui/integration/test/core/BaseSimpleRadioButtonTestCase.kt b/compose/integration-tests/src/main/java/androidx/ui/integration/test/core/BaseSimpleRadioButtonTestCase.kt
index 1ac2fb8..13192f5 100644
--- a/compose/integration-tests/src/main/java/androidx/ui/integration/test/core/BaseSimpleRadioButtonTestCase.kt
+++ b/compose/integration-tests/src/main/java/androidx/ui/integration/test/core/BaseSimpleRadioButtonTestCase.kt
@@ -20,10 +20,10 @@
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.testutils.ToggleableTestCase
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
-import androidx.ui.test.ToggleableTestCase
-import androidx.ui.test.ComposeTestCase
abstract class BaseSimpleRadioButtonTestCase : ComposeTestCase, ToggleableTestCase {
diff --git a/compose/integration-tests/src/main/java/androidx/ui/integration/test/core/EmptyTestCase.kt b/compose/integration-tests/src/main/java/androidx/ui/integration/test/core/EmptyTestCase.kt
index 7329ff0..be9f3a0 100644
--- a/compose/integration-tests/src/main/java/androidx/ui/integration/test/core/EmptyTestCase.kt
+++ b/compose/integration-tests/src/main/java/androidx/ui/integration/test/core/EmptyTestCase.kt
@@ -17,7 +17,7 @@
package androidx.ui.integration.test.core
import androidx.compose.runtime.Composable
-import androidx.ui.test.ComposeTestCase
+import androidx.compose.testutils.ComposeTestCase
class EmptyTestCase : ComposeTestCase {
@Composable
diff --git a/compose/integration-tests/src/main/java/androidx/ui/integration/test/core/text/TextInColumnTestCase.kt b/compose/integration-tests/src/main/java/androidx/ui/integration/test/core/text/TextInColumnTestCase.kt
index a4f4579..b2bbe698 100644
--- a/compose/integration-tests/src/main/java/androidx/ui/integration/test/core/text/TextInColumnTestCase.kt
+++ b/compose/integration-tests/src/main/java/androidx/ui/integration/test/core/text/TextInColumnTestCase.kt
@@ -23,13 +23,13 @@
import androidx.compose.foundation.Text
import androidx.compose.foundation.layout.Column
import androidx.compose.ui.graphics.Color
-import androidx.ui.test.ToggleableTestCase
import androidx.compose.foundation.layout.preferredWidth
import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.testutils.LayeredComposeTestCase
+import androidx.compose.testutils.ToggleableTestCase
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.TextUnit
-import androidx.ui.test.LayeredComposeTestCase
/**
* The benchmark test case for [Text], where the input is a plain string.
diff --git a/compose/integration-tests/src/main/java/androidx/ui/integration/test/core/text/TextToggleTextTestCase.kt b/compose/integration-tests/src/main/java/androidx/ui/integration/test/core/text/TextToggleTextTestCase.kt
index 891ac21..ef4d126 100644
--- a/compose/integration-tests/src/main/java/androidx/ui/integration/test/core/text/TextToggleTextTestCase.kt
+++ b/compose/integration-tests/src/main/java/androidx/ui/integration/test/core/text/TextToggleTextTestCase.kt
@@ -22,12 +22,12 @@
import androidx.compose.foundation.layout.preferredWidth
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.runtime.mutableStateOf
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.testutils.ToggleableTestCase
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.ui.integration.test.RandomTextGenerator
-import androidx.ui.test.ToggleableTestCase
-import androidx.ui.test.ComposeTestCase
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.TextUnit
diff --git a/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/NestedScrollerTestCase.kt b/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/NestedScrollerTestCase.kt
index 5a8d61c..079d29c 100644
--- a/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/NestedScrollerTestCase.kt
+++ b/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/NestedScrollerTestCase.kt
@@ -30,7 +30,6 @@
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.background
import androidx.compose.ui.graphics.Color
-import androidx.ui.test.ToggleableTestCase
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope
@@ -39,7 +38,8 @@
import androidx.compose.foundation.layout.preferredSize
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Surface
-import androidx.ui.test.ComposeTestCase
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.testutils.ToggleableTestCase
import kotlin.random.Random
/**
diff --git a/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/RectsInColumnSharedModelTestCase.kt b/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/RectsInColumnSharedModelTestCase.kt
index d30b826..7a0d0ce 100644
--- a/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/RectsInColumnSharedModelTestCase.kt
+++ b/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/RectsInColumnSharedModelTestCase.kt
@@ -25,9 +25,9 @@
import androidx.compose.ui.graphics.Color
import androidx.compose.foundation.layout.Column
import androidx.compose.material.MaterialTheme
-import androidx.ui.test.ComposeTestCase
-import androidx.ui.test.ToggleableTestCase
import androidx.compose.foundation.layout.preferredSize
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.testutils.ToggleableTestCase
/**
* Test case that puts the given amount of rectangles into a column layout and makes changes by
diff --git a/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/RectsInColumnTestCase.kt b/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/RectsInColumnTestCase.kt
index 645f8c1..bf129a3 100644
--- a/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/RectsInColumnTestCase.kt
+++ b/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/RectsInColumnTestCase.kt
@@ -26,11 +26,11 @@
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.testutils.ToggleableTestCase
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
-import androidx.ui.test.ToggleableTestCase
-import androidx.ui.test.ComposeTestCase
/**
* Test case that puts the given amount of rectangles into a column layout and makes changes by
diff --git a/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/ScrollerTestCase.kt b/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/ScrollerTestCase.kt
index d0a030b..d759749 100644
--- a/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/ScrollerTestCase.kt
+++ b/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/ScrollerTestCase.kt
@@ -23,17 +23,17 @@
import androidx.compose.foundation.ScrollableColumn
import androidx.compose.foundation.rememberScrollState
import androidx.compose.ui.graphics.Color
-import androidx.ui.test.ToggleableTestCase
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.preferredSize
-import androidx.ui.test.ComposeTestCase
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.testutils.ToggleableTestCase
import androidx.compose.ui.unit.dp
/**
* Test case that puts a large number of boxes in a column in a vertical scroller to force scrolling.
*/
-class ScrollerTestCase() : ComposeTestCase, ToggleableTestCase {
+class ScrollerTestCase : ComposeTestCase, ToggleableTestCase {
private lateinit var scrollState: ScrollState
@Composable
diff --git a/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/TextInColumnTestCase.kt b/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/TextInColumnTestCase.kt
index 6a56f5f..9f8dcba 100644
--- a/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/TextInColumnTestCase.kt
+++ b/compose/integration-tests/src/main/java/androidx/ui/integration/test/foundation/TextInColumnTestCase.kt
@@ -19,11 +19,11 @@
import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateOf
import androidx.compose.foundation.Text
-import androidx.ui.test.ToggleableTestCase
import androidx.compose.foundation.layout.Column
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Surface
-import androidx.ui.test.ComposeTestCase
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.testutils.ToggleableTestCase
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.unit.sp
diff --git a/compose/integration-tests/src/main/java/androidx/ui/integration/test/framework/VectorAssetTestCase.kt b/compose/integration-tests/src/main/java/androidx/ui/integration/test/framework/VectorAssetTestCase.kt
index 8b4e920..8f1e01e 100644
--- a/compose/integration-tests/src/main/java/androidx/ui/integration/test/framework/VectorAssetTestCase.kt
+++ b/compose/integration-tests/src/main/java/androidx/ui/integration/test/framework/VectorAssetTestCase.kt
@@ -30,8 +30,8 @@
import androidx.compose.ui.graphics.vector.VectorAssetBuilder
import androidx.compose.ui.graphics.vector.VectorPainter
import androidx.compose.foundation.layout.preferredSize
+import androidx.compose.testutils.ComposeTestCase
import androidx.compose.ui.res.vectorResource
-import androidx.ui.test.ComposeTestCase
import androidx.compose.ui.unit.dp
/**
diff --git a/compose/integration-tests/src/main/java/androidx/ui/integration/test/material/CheckboxesInRowsTestCase.kt b/compose/integration-tests/src/main/java/androidx/ui/integration/test/material/CheckboxesInRowsTestCase.kt
index f0fa98b..1f15840 100644
--- a/compose/integration-tests/src/main/java/androidx/ui/integration/test/material/CheckboxesInRowsTestCase.kt
+++ b/compose/integration-tests/src/main/java/androidx/ui/integration/test/material/CheckboxesInRowsTestCase.kt
@@ -27,10 +27,10 @@
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.testutils.ToggleableTestCase
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
-import androidx.ui.test.ToggleableTestCase
-import androidx.ui.test.ComposeTestCase
/**
* Test case that puts the given amount of checkboxes into a column of rows and makes changes by
diff --git a/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidCheckboxesInLinearLayoutTestCase.kt b/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidCheckboxesInLinearLayoutTestCase.kt
index 545f4b3..0f9673b 100644
--- a/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidCheckboxesInLinearLayoutTestCase.kt
+++ b/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidCheckboxesInLinearLayoutTestCase.kt
@@ -22,7 +22,7 @@
import android.widget.CheckBox
import android.widget.LinearLayout
import android.widget.TextView
-import androidx.ui.benchmark.android.AndroidTestCase
+import androidx.compose.testutils.benchmark.android.AndroidTestCase
import androidx.ui.integration.test.material.CheckboxesInRowsTestCase
/**
diff --git a/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidNestedScrollViewTestCase.kt b/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidNestedScrollViewTestCase.kt
index 279da91..de31189 100644
--- a/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidNestedScrollViewTestCase.kt
+++ b/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidNestedScrollViewTestCase.kt
@@ -20,10 +20,10 @@
import android.view.View
import android.view.ViewGroup
import android.widget.HorizontalScrollView
+import androidx.compose.testutils.ToggleableTestCase
+import androidx.compose.testutils.benchmark.android.AndroidTestCase
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb
-import androidx.ui.test.ToggleableTestCase
-import androidx.ui.benchmark.android.AndroidTestCase
import androidx.ui.integration.test.foundation.NestedScrollerTestCase
import kotlin.random.Random
diff --git a/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidRectsInLinearLayoutTestCase.kt b/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidRectsInLinearLayoutTestCase.kt
index 0ee50d8..999e374 100644
--- a/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidRectsInLinearLayoutTestCase.kt
+++ b/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidRectsInLinearLayoutTestCase.kt
@@ -21,7 +21,7 @@
import android.view.View
import android.view.ViewGroup
import android.widget.LinearLayout
-import androidx.ui.benchmark.android.AndroidTestCase
+import androidx.compose.testutils.benchmark.android.AndroidTestCase
import androidx.ui.integration.test.material.CheckboxesInRowsTestCase
/**
diff --git a/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidTextViewTestCase.kt b/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidTextViewTestCase.kt
index 0db1c47..b3acef7 100644
--- a/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidTextViewTestCase.kt
+++ b/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidTextViewTestCase.kt
@@ -21,7 +21,7 @@
import android.view.ViewGroup
import android.widget.LinearLayout
import android.widget.TextView
-import androidx.ui.benchmark.android.AndroidTestCase
+import androidx.compose.testutils.benchmark.android.AndroidTestCase
import kotlin.math.roundToInt
/**
diff --git a/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidTextViewsInLinearLayoutTestCase.kt b/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidTextViewsInLinearLayoutTestCase.kt
index 8d4769d..1d0d6b4 100644
--- a/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidTextViewsInLinearLayoutTestCase.kt
+++ b/compose/integration-tests/src/main/java/androidx/ui/integration/test/view/AndroidTextViewsInLinearLayoutTestCase.kt
@@ -20,7 +20,7 @@
import android.view.ViewGroup
import android.widget.LinearLayout
import android.widget.TextView
-import androidx.ui.benchmark.android.AndroidTestCase
+import androidx.compose.testutils.benchmark.android.AndroidTestCase
import androidx.ui.integration.test.material.CheckboxesInRowsTestCase
/**
diff --git a/compose/test-utils/src/androidAndroidTest/AndroidManifest.xml b/compose/test-utils/src/androidAndroidTest/AndroidManifest.xml
index a19fa88..9b4eef6 100644
--- a/compose/test-utils/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/test-utils/src/androidAndroidTest/AndroidManifest.xml
@@ -15,4 +15,4 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.ui.test"/>
\ No newline at end of file
+ package="androidx.compose.testutils"/>
\ No newline at end of file
diff --git a/compose/test-utils/src/androidAndroidTest/kotlin/androidx/ui/test/AndroidComposeTestCaseRunnerTest.kt b/compose/test-utils/src/androidAndroidTest/kotlin/androidx/compose/testutils/AndroidComposeTestCaseRunnerTest.kt
similarity index 99%
rename from compose/test-utils/src/androidAndroidTest/kotlin/androidx/ui/test/AndroidComposeTestCaseRunnerTest.kt
rename to compose/test-utils/src/androidAndroidTest/kotlin/androidx/compose/testutils/AndroidComposeTestCaseRunnerTest.kt
index 70c47ab..ce794b8 100644
--- a/compose/test-utils/src/androidAndroidTest/kotlin/androidx/ui/test/AndroidComposeTestCaseRunnerTest.kt
+++ b/compose/test-utils/src/androidAndroidTest/kotlin/androidx/compose/testutils/AndroidComposeTestCaseRunnerTest.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.test
+package androidx.compose.testutils
import androidx.activity.ComponentActivity
import androidx.compose.foundation.Box
diff --git a/compose/test-utils/src/androidMain/AndroidManifest.xml b/compose/test-utils/src/androidMain/AndroidManifest.xml
index 33e66ad..5e81de1 100644
--- a/compose/test-utils/src/androidMain/AndroidManifest.xml
+++ b/compose/test-utils/src/androidMain/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.ui.test"/>
+ package="androidx.compose.testutils"/>
diff --git a/compose/test-utils/src/androidMain/kotlin/androidx/ui/test/AndroidComposeTestCaseRunner.kt b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/AndroidComposeTestCaseRunner.kt
similarity index 99%
rename from compose/test-utils/src/androidMain/kotlin/androidx/ui/test/AndroidComposeTestCaseRunner.kt
rename to compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/AndroidComposeTestCaseRunner.kt
index 1cfef71..7f89364 100644
--- a/compose/test-utils/src/androidMain/kotlin/androidx/ui/test/AndroidComposeTestCaseRunner.kt
+++ b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/AndroidComposeTestCaseRunner.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.test
+package androidx.compose.testutils
import android.annotation.TargetApi
import android.app.Activity
diff --git a/compose/test-utils/src/androidMain/kotlin/androidx/ui/test/AndroidComposeTestCaseSetup.kt b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/AndroidComposeTestCaseSetup.kt
similarity index 94%
rename from compose/test-utils/src/androidMain/kotlin/androidx/ui/test/AndroidComposeTestCaseSetup.kt
rename to compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/AndroidComposeTestCaseSetup.kt
index ede1071..2b7a349 100644
--- a/compose/test-utils/src/androidMain/kotlin/androidx/ui/test/AndroidComposeTestCaseSetup.kt
+++ b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/AndroidComposeTestCaseSetup.kt
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-package androidx.ui.test
+package androidx.compose.testutils
import androidx.activity.ComponentActivity
+import androidx.ui.test.runOnUiThread
class AndroidComposeTestCaseSetup(
private val testCase: ComposeTestCase,
diff --git a/compose/test-utils/src/androidMain/kotlin/androidx/ui/test/TestRuleExtensions.kt b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/TestRuleExtensions.kt
similarity index 97%
rename from compose/test-utils/src/androidMain/kotlin/androidx/ui/test/TestRuleExtensions.kt
rename to compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/TestRuleExtensions.kt
index dea4f06..81d7ced 100644
--- a/compose/test-utils/src/androidMain/kotlin/androidx/ui/test/TestRuleExtensions.kt
+++ b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/TestRuleExtensions.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.test
+package androidx.compose.testutils
import androidx.activity.ComponentActivity
import androidx.ui.test.android.AndroidComposeTestRule
diff --git a/compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/AndroidBenchmarkRule.kt b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/AndroidBenchmarkRule.kt
similarity index 88%
rename from compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/AndroidBenchmarkRule.kt
rename to compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/AndroidBenchmarkRule.kt
index 296ca22..27f331b1 100644
--- a/compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/AndroidBenchmarkRule.kt
+++ b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/AndroidBenchmarkRule.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2019 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package androidx.ui.benchmark
+package androidx.compose.testutils.benchmark
import androidx.activity.ComponentActivity
import androidx.benchmark.junit4.BenchmarkRule
import androidx.benchmark.junit4.measureRepeated
-import androidx.ui.test.ComposeTestCase
-import androidx.ui.benchmark.android.AndroidTestCase
-import androidx.ui.benchmark.android.AndroidTestCaseRunner
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.testutils.benchmark.android.AndroidTestCase
+import androidx.compose.testutils.benchmark.android.AndroidTestCaseRunner
import org.junit.rules.TestRule
import org.junit.runner.Description
import org.junit.runners.model.Statement
diff --git a/compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/BenchmarkFirstExtensions.kt b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/BenchmarkFirstExtensions.kt
similarity index 93%
rename from compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/BenchmarkFirstExtensions.kt
rename to compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/BenchmarkFirstExtensions.kt
index 7e77455..01a6cb8 100644
--- a/compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/BenchmarkFirstExtensions.kt
+++ b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/BenchmarkFirstExtensions.kt
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package androidx.ui.benchmark
+package androidx.compose.testutils.benchmark
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
-import androidx.ui.test.ComposeExecutionControl
-import androidx.ui.test.ComposeTestCase
-import androidx.ui.test.LayeredComposeTestCase
-import androidx.ui.test.assertNoPendingChanges
-import androidx.ui.test.doFramesUntilNoChangesPending
+import androidx.compose.testutils.ComposeExecutionControl
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.testutils.LayeredComposeTestCase
+import androidx.compose.testutils.assertNoPendingChanges
+import androidx.compose.testutils.doFramesUntilNoChangesPending
import org.junit.Assert.assertTrue
/**
diff --git a/compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/BenchmarkHelpers.kt b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/BenchmarkHelpers.kt
similarity index 97%
rename from compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/BenchmarkHelpers.kt
rename to compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/BenchmarkHelpers.kt
index 25084e6..b0e52249 100644
--- a/compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/BenchmarkHelpers.kt
+++ b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/BenchmarkHelpers.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.benchmark
+package androidx.compose.testutils.benchmark
import android.annotation.TargetApi
import android.graphics.Picture
diff --git a/compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/BenchmarksExtensions.kt b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/BenchmarksExtensions.kt
similarity index 96%
rename from compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/BenchmarksExtensions.kt
rename to compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/BenchmarksExtensions.kt
index 6c1bf22..f32860a 100644
--- a/compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/BenchmarksExtensions.kt
+++ b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/BenchmarksExtensions.kt
@@ -14,19 +14,19 @@
* limitations under the License.
*/
-package androidx.ui.benchmark
+package androidx.compose.testutils.benchmark
import android.view.View
import androidx.benchmark.junit4.BenchmarkRule
import androidx.benchmark.junit4.measureRepeated
-import androidx.ui.test.ComposeTestCase
-import androidx.ui.benchmark.android.AndroidTestCase
+import androidx.compose.testutils.ComposeTestCase
import androidx.compose.ui.graphics.Canvas
-import androidx.ui.test.ToggleableTestCase
-import androidx.ui.test.assertNoPendingChanges
-import androidx.ui.test.doFramesUntilNoChangesPending
-import androidx.ui.test.recomposeAssertHadChanges
-import androidx.ui.test.setupContent
+import androidx.compose.testutils.ToggleableTestCase
+import androidx.compose.testutils.assertNoPendingChanges
+import androidx.compose.testutils.benchmark.android.AndroidTestCase
+import androidx.compose.testutils.doFramesUntilNoChangesPending
+import androidx.compose.testutils.recomposeAssertHadChanges
+import androidx.compose.testutils.setupContent
/**
* Measures measure and layout performance of the given test case by toggling measure constraints.
diff --git a/compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/ComposeBenchmarkRule.kt b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/ComposeBenchmarkRule.kt
similarity index 89%
rename from compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/ComposeBenchmarkRule.kt
rename to compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/ComposeBenchmarkRule.kt
index e8179aa..a32652d 100644
--- a/compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/ComposeBenchmarkRule.kt
+++ b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/ComposeBenchmarkRule.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2019 The Android Open Source Project
+ * Copyright 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package androidx.ui.benchmark
+package androidx.compose.testutils.benchmark
import androidx.activity.ComponentActivity
import androidx.benchmark.junit4.BenchmarkRule
import androidx.benchmark.junit4.measureRepeated
-import androidx.ui.benchmark.android.AndroidTestCase
-import androidx.ui.test.ComposeBenchmarkScope
-import androidx.ui.test.ComposeTestCase
+import androidx.compose.testutils.benchmark.android.AndroidTestCase
+import androidx.compose.testutils.ComposeBenchmarkScope
+import androidx.compose.testutils.ComposeTestCase
+import androidx.compose.testutils.createAndroidComposeBenchmarkRunner
import androidx.ui.test.DisableTransitions
-import androidx.ui.test.createAndroidComposeBenchmarkRunner
import org.junit.rules.TestRule
import org.junit.runner.Description
import org.junit.runners.model.Statement
diff --git a/compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/android/AndroidTestCase.kt b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/android/AndroidTestCase.kt
similarity index 93%
rename from compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/android/AndroidTestCase.kt
rename to compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/android/AndroidTestCase.kt
index 75dbc73..d3e4fb6 100644
--- a/compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/android/AndroidTestCase.kt
+++ b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/android/AndroidTestCase.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.benchmark.android
+package androidx.compose.testutils.benchmark.android
import android.app.Activity
import android.view.ViewGroup
diff --git a/compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/android/AndroidTestCaseRunner.kt b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/android/AndroidTestCaseRunner.kt
similarity index 98%
rename from compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/android/AndroidTestCaseRunner.kt
rename to compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/android/AndroidTestCaseRunner.kt
index cf4e992..da23f9e 100644
--- a/compose/test-utils/src/androidMain/kotlin/androidx/ui/benchmark/android/AndroidTestCaseRunner.kt
+++ b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/benchmark/android/AndroidTestCaseRunner.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.benchmark.android
+package androidx.compose.testutils.benchmark.android
import android.R
import android.annotation.TargetApi
diff --git a/compose/test-utils/src/androidMain/kotlin/androidx/ui/test/fake/FakeViewStructure.kt b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/fake/FakeViewStructure.kt
similarity index 99%
rename from compose/test-utils/src/androidMain/kotlin/androidx/ui/test/fake/FakeViewStructure.kt
rename to compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/fake/FakeViewStructure.kt
index 6b3d36a..85fc23b 100644
--- a/compose/test-utils/src/androidMain/kotlin/androidx/ui/test/fake/FakeViewStructure.kt
+++ b/compose/test-utils/src/androidMain/kotlin/androidx/compose/testutils/fake/FakeViewStructure.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.test.fake
+package androidx.compose.testutils.fake
import android.graphics.Matrix
import android.graphics.Rect
diff --git a/compose/test-utils/src/commonMain/kotlin/androidx/ui/test/ComposeBenchmarkScope.kt b/compose/test-utils/src/commonMain/kotlin/androidx/compose/testutils/ComposeBenchmarkScope.kt
similarity index 98%
rename from compose/test-utils/src/commonMain/kotlin/androidx/ui/test/ComposeBenchmarkScope.kt
rename to compose/test-utils/src/commonMain/kotlin/androidx/compose/testutils/ComposeBenchmarkScope.kt
index e8ee640..2c9c358 100644
--- a/compose/test-utils/src/commonMain/kotlin/androidx/ui/test/ComposeBenchmarkScope.kt
+++ b/compose/test-utils/src/commonMain/kotlin/androidx/compose/testutils/ComposeBenchmarkScope.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.test
+package androidx.compose.testutils
/**
* Test scope accessible from benchmarks. Provides extended set of hooks for compose benchmarking.
diff --git a/compose/test-utils/src/commonMain/kotlin/androidx/ui/test/ComposeExecutionControl.kt b/compose/test-utils/src/commonMain/kotlin/androidx/compose/testutils/ComposeExecutionControl.kt
similarity index 97%
rename from compose/test-utils/src/commonMain/kotlin/androidx/ui/test/ComposeExecutionControl.kt
rename to compose/test-utils/src/commonMain/kotlin/androidx/compose/testutils/ComposeExecutionControl.kt
index e72ff88..6fc2b6c 100644
--- a/compose/test-utils/src/commonMain/kotlin/androidx/ui/test/ComposeExecutionControl.kt
+++ b/compose/test-utils/src/commonMain/kotlin/androidx/compose/testutils/ComposeExecutionControl.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.test
+package androidx.compose.testutils
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
@@ -114,7 +114,7 @@
* so the frames can be controlled manually. See [ComposeExecutionControl] for available
* methods.
*/
- fun performTestWithEventsControl(block: androidx.ui.test.ComposeExecutionControl.() -> Unit)
+ fun performTestWithEventsControl(block: ComposeExecutionControl.() -> Unit)
}
// Assertions
diff --git a/compose/test-utils/src/commonMain/kotlin/androidx/ui/test/ComposeTestCase.kt b/compose/test-utils/src/commonMain/kotlin/androidx/compose/testutils/ComposeTestCase.kt
similarity index 98%
rename from compose/test-utils/src/commonMain/kotlin/androidx/ui/test/ComposeTestCase.kt
rename to compose/test-utils/src/commonMain/kotlin/androidx/compose/testutils/ComposeTestCase.kt
index 0735f43..dd69af9 100644
--- a/compose/test-utils/src/commonMain/kotlin/androidx/ui/test/ComposeTestCase.kt
+++ b/compose/test-utils/src/commonMain/kotlin/androidx/compose/testutils/ComposeTestCase.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.test
+package androidx.compose.testutils
import androidx.compose.runtime.Composable
diff --git a/compose/test-utils/src/commonMain/kotlin/androidx/ui/test/ToggleableTestCase.kt b/compose/test-utils/src/commonMain/kotlin/androidx/compose/testutils/ToggleableTestCase.kt
similarity index 95%
rename from compose/test-utils/src/commonMain/kotlin/androidx/ui/test/ToggleableTestCase.kt
rename to compose/test-utils/src/commonMain/kotlin/androidx/compose/testutils/ToggleableTestCase.kt
index 24abf2a..9e5dc7d 100644
--- a/compose/test-utils/src/commonMain/kotlin/androidx/ui/test/ToggleableTestCase.kt
+++ b/compose/test-utils/src/commonMain/kotlin/androidx/compose/testutils/ToggleableTestCase.kt
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package androidx.ui.test
+package androidx.compose.testutils
/**
* Test case that allows to trigger a change of state. This is run multiple times by the benchmarks.
diff --git a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/autofill/AndroidAutoFillTest.kt b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/autofill/AndroidAutoFillTest.kt
index 7faa2fa..6081ea95 100644
--- a/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/autofill/AndroidAutoFillTest.kt
+++ b/compose/ui/ui/src/androidAndroidTest/kotlin/androidx/compose/ui/autofill/AndroidAutoFillTest.kt
@@ -21,6 +21,7 @@
import android.view.ViewStructure
import android.view.autofill.AutofillValue
import androidx.autofill.HintConstants.AUTOFILL_HINT_PERSON_NAME
+import androidx.compose.testutils.fake.FakeViewStructure
import androidx.compose.ui.geometry.Rect
import androidx.compose.ui.platform.AutofillAmbient
import androidx.compose.ui.platform.AutofillTreeAmbient
@@ -28,7 +29,6 @@
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
import androidx.ui.test.createComposeRule
-import androidx.ui.test.fake.FakeViewStructure
import com.google.common.truth.Truth.assertThat
import org.junit.Before
import org.junit.Rule
diff --git a/compose/ui/ui/src/test/kotlin/androidx/compose/ui/autofill/AndroidPopulateViewStructureTest.kt b/compose/ui/ui/src/test/kotlin/androidx/compose/ui/autofill/AndroidPopulateViewStructureTest.kt
index 5f5c8525..0f654cd 100644
--- a/compose/ui/ui/src/test/kotlin/androidx/compose/ui/autofill/AndroidPopulateViewStructureTest.kt
+++ b/compose/ui/ui/src/test/kotlin/androidx/compose/ui/autofill/AndroidPopulateViewStructureTest.kt
@@ -20,10 +20,10 @@
import android.view.View
import android.view.ViewStructure
import androidx.autofill.HintConstants.AUTOFILL_HINT_PERSON_NAME
+import androidx.compose.testutils.fake.FakeViewStructure
import androidx.compose.ui.geometry.Rect
import androidx.compose.ui.test.ComposeUiRobolectricTestRunner
import androidx.test.filters.SmallTest
-import androidx.ui.test.fake.FakeViewStructure
import com.google.common.truth.Truth.assertThat
import org.junit.Before
import org.junit.Test
