Move testutils to new directory structure
Instead of having three top level directories in
testutils, testutils-ktx, and testutils-common,
move them all into the testutils folder.
The new structure is:
- testutils/testutils-common
- testutils/testutils-runtime (the old testutils)
- testutils/testutils-ktx
Test: ./gradlew bOS
Change-Id: Ic515d9b0e1edd051d3f36725fce8d876a04939df
diff --git a/activity/activity/build.gradle b/activity/activity/build.gradle
index 36959fc..016daa3 100644
--- a/activity/activity/build.gradle
+++ b/activity/activity/build.gradle
@@ -33,7 +33,7 @@
androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
- androidTestImplementation project(':internal-testutils'), {
+ androidTestImplementation project(':internal-testutils-runtime'), {
exclude group: 'androidx.activity', module: 'activity'
}
}
diff --git a/appcompat/build.gradle b/appcompat/build.gradle
index f9f3a5c..e29a1a8 100644
--- a/appcompat/build.gradle
+++ b/appcompat/build.gradle
@@ -28,7 +28,7 @@
androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
- androidTestImplementation project(':internal-testutils'), {
+ androidTestImplementation project(':internal-testutils-runtime'), {
exclude group: 'androidx.appcompat', module: 'appcompat'
exclude group: 'androidx.core', module: 'core'
}
diff --git a/appcompat/resources/build.gradle b/appcompat/resources/build.gradle
index 05c9add..de2a07f 100644
--- a/appcompat/resources/build.gradle
+++ b/appcompat/resources/build.gradle
@@ -39,7 +39,7 @@
androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
- androidTestImplementation project(':internal-testutils'), {
+ androidTestImplementation project(':internal-testutils-runtime'), {
exclude group: 'androidx.appcompat', module: 'appcompat-resources'
}
}
diff --git a/browser/build.gradle b/browser/build.gradle
index 5dd3789..f656120 100644
--- a/browser/build.gradle
+++ b/browser/build.gradle
@@ -39,7 +39,7 @@
androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
- androidTestImplementation(project(":internal-testutils"))
+ androidTestImplementation(project(":internal-testutils-runtime"))
}
androidx {
diff --git a/coordinatorlayout/build.gradle b/coordinatorlayout/build.gradle
index 67dfc84..b6d161a 100644
--- a/coordinatorlayout/build.gradle
+++ b/coordinatorlayout/build.gradle
@@ -22,7 +22,7 @@
androidTestImplementation(ESPRESSO_CONTRIB, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy)
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
- androidTestImplementation project(':internal-testutils'), {
+ androidTestImplementation project(':internal-testutils-runtime'), {
exclude group: 'androidx.coordinatorlayout', module: 'coordinatorlayout'
}
}
diff --git a/core/core/build.gradle b/core/core/build.gradle
index 910d27b..6000ece 100644
--- a/core/core/build.gradle
+++ b/core/core/build.gradle
@@ -24,7 +24,7 @@
androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
- androidTestImplementation project(':internal-testutils'), {
+ androidTestImplementation project(':internal-testutils-runtime'), {
exclude group: 'androidx.core', module: 'core'
}
annotationProcessor(project(":versionedparcelable-annotation"))
diff --git a/emoji/core/build.gradle b/emoji/core/build.gradle
index 4e13514..e10a67c 100644
--- a/emoji/core/build.gradle
+++ b/emoji/core/build.gradle
@@ -32,7 +32,7 @@
androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
- androidTestImplementation project(':internal-testutils')
+ androidTestImplementation project(':internal-testutils-runtime')
}
android {
diff --git a/fragment/fragment/build.gradle b/fragment/fragment/build.gradle
index 777cb59..1637434 100644
--- a/fragment/fragment/build.gradle
+++ b/fragment/fragment/build.gradle
@@ -36,7 +36,7 @@
androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
- androidTestImplementation project(':internal-testutils'), {
+ androidTestImplementation project(':internal-testutils-runtime'), {
exclude group: 'androidx.fragment', module: 'fragment'
}
}
diff --git a/lifecycle/lifecycle-extensions/build.gradle b/lifecycle/lifecycle-extensions/build.gradle
index 69ee6fa..6c31068 100644
--- a/lifecycle/lifecycle-extensions/build.gradle
+++ b/lifecycle/lifecycle-extensions/build.gradle
@@ -49,7 +49,7 @@
androidTestImplementation(ANDROIDX_TEST_RULES)
androidTestImplementation(ESPRESSO_CORE)
androidTestImplementation(SUPPORT_APPCOMPAT)
- androidTestImplementation(project(":internal-testutils"))
+ androidTestImplementation(project(":internal-testutils-runtime"))
}
androidx {
diff --git a/media/build.gradle b/media/build.gradle
index facba79..f9dd53d 100644
--- a/media/build.gradle
+++ b/media/build.gradle
@@ -16,7 +16,7 @@
androidTestImplementation(ANDROIDX_TEST_CORE)
androidTestImplementation(ANDROIDX_TEST_RUNNER)
androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
- androidTestImplementation project(':internal-testutils')
+ androidTestImplementation project(':internal-testutils-runtime')
annotationProcessor(project(":versionedparcelable-annotation"))
}
diff --git a/media2/common/build.gradle b/media2/common/build.gradle
index 437208b..f108223 100644
--- a/media2/common/build.gradle
+++ b/media2/common/build.gradle
@@ -19,7 +19,7 @@
androidTestImplementation(ANDROIDX_TEST_CORE)
androidTestImplementation(ANDROIDX_TEST_RUNNER)
androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
- androidTestImplementation project(':internal-testutils')
+ androidTestImplementation project(':internal-testutils-runtime')
annotationProcessor(project(":versionedparcelable-annotation"))
}
diff --git a/media2/player/build.gradle b/media2/player/build.gradle
index 234c2b1..4c750e6 100644
--- a/media2/player/build.gradle
+++ b/media2/player/build.gradle
@@ -24,7 +24,7 @@
androidTestImplementation(ANDROIDX_TEST_RUNNER)
androidTestImplementation(ANDROIDX_TEST_RULES)
androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
- androidTestImplementation project(':internal-testutils')
+ androidTestImplementation project(':internal-testutils-runtime')
annotationProcessor(project(":versionedparcelable-annotation"))
}
diff --git a/media2/session/build.gradle b/media2/session/build.gradle
index bd23181..ab2d31c 100644
--- a/media2/session/build.gradle
+++ b/media2/session/build.gradle
@@ -22,7 +22,7 @@
androidTestImplementation(ANDROIDX_TEST_RUNNER)
androidTestImplementation(ANDROIDX_TEST_RULES)
androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
- androidTestImplementation project(':internal-testutils')
+ androidTestImplementation project(':internal-testutils-runtime')
annotationProcessor(project(":versionedparcelable-annotation"))
}
diff --git a/media2/widget/build.gradle b/media2/widget/build.gradle
index 45725fc..9a92d4c 100644
--- a/media2/widget/build.gradle
+++ b/media2/widget/build.gradle
@@ -38,7 +38,7 @@
androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
- androidTestImplementation project(':internal-testutils')
+ androidTestImplementation project(':internal-testutils-runtime')
androidTestImplementation project(':media2:media2-player')
}
diff --git a/navigation/navigation-fragment-ktx/build.gradle b/navigation/navigation-fragment-ktx/build.gradle
index dd016f5..2119732 100644
--- a/navigation/navigation-fragment-ktx/build.gradle
+++ b/navigation/navigation-fragment-ktx/build.gradle
@@ -51,7 +51,7 @@
androidTestImplementation(TRUTH)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy)
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy)
- androidTestImplementation project(':internal-testutils')
+ androidTestImplementation project(':internal-testutils-runtime')
}
androidx {
diff --git a/navigation/navigation-fragment/build.gradle b/navigation/navigation-fragment/build.gradle
index 74c67a4..8f92abb 100644
--- a/navigation/navigation-fragment/build.gradle
+++ b/navigation/navigation-fragment/build.gradle
@@ -38,7 +38,7 @@
androidTestImplementation(ANDROIDX_TEST_RULES)
androidTestImplementation(TRUTH)
androidTestImplementation(KOTLIN_STDLIB)
- androidTestImplementation project(':internal-testutils'), {
+ androidTestImplementation project(':internal-testutils-runtime'), {
exclude group: 'androidx.fragment', module: 'fragment'
}
}
diff --git a/recyclerview/recyclerview/build.gradle b/recyclerview/recyclerview/build.gradle
index 4ec3faf..cb299c0 100644
--- a/recyclerview/recyclerview/build.gradle
+++ b/recyclerview/recyclerview/build.gradle
@@ -24,7 +24,7 @@
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(JUNIT)
androidTestImplementation(KOTLIN_STDLIB)
- androidTestImplementation(project(":internal-testutils"))
+ androidTestImplementation(project(":internal-testutils-runtime"))
androidTestImplementation(project(":internal-testutils-common"))
testImplementation(JUNIT)
diff --git a/settings.gradle b/settings.gradle
index 8d46e66..98363ce 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -277,9 +277,9 @@
//
/////////////////////////////
-includeProject(":internal-testutils", "testutils")
-includeProject(":internal-testutils-common", "testutils-common")
-includeProject(":internal-testutils-ktx", "testutils-ktx")
+includeProject(":internal-testutils-common", "testutils/testutils-common")
+includeProject(":internal-testutils-runtime", "testutils/testutils-runtime")
+includeProject(":internal-testutils-ktx", "testutils/testutils-ktx")
/////////////////////////////
//
diff --git a/swiperefreshlayout/build.gradle b/swiperefreshlayout/build.gradle
index 46c3da4..98b314b 100644
--- a/swiperefreshlayout/build.gradle
+++ b/swiperefreshlayout/build.gradle
@@ -22,7 +22,7 @@
androidTestImplementation(ESPRESSO_CONTRIB, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
- androidTestImplementation project(':internal-testutils'), {
+ androidTestImplementation project(':internal-testutils-runtime'), {
exclude group: 'androidx.swiperefreshlayout', module: 'swiperefreshlayout'
}
androidTestImplementation(ANDROIDX_RECYCLERVIEW) {
diff --git a/testutils-common/build.gradle b/testutils/testutils-common/build.gradle
similarity index 100%
rename from testutils-common/build.gradle
rename to testutils/testutils-common/build.gradle
diff --git a/testutils-common/src/main/java/androidx/testutils/TestExecutor.kt b/testutils/testutils-common/src/main/java/androidx/testutils/TestExecutor.kt
similarity index 100%
rename from testutils-common/src/main/java/androidx/testutils/TestExecutor.kt
rename to testutils/testutils-common/src/main/java/androidx/testutils/TestExecutor.kt
diff --git a/testutils-ktx/OWNERS b/testutils/testutils-ktx/OWNERS
similarity index 100%
rename from testutils-ktx/OWNERS
rename to testutils/testutils-ktx/OWNERS
diff --git a/testutils-ktx/build.gradle b/testutils/testutils-ktx/build.gradle
similarity index 100%
rename from testutils-ktx/build.gradle
rename to testutils/testutils-ktx/build.gradle
diff --git a/testutils-ktx/src/main/java/androidx/testutils/TestDispatcher.kt b/testutils/testutils-ktx/src/main/java/androidx/testutils/TestDispatcher.kt
similarity index 100%
rename from testutils-ktx/src/main/java/androidx/testutils/TestDispatcher.kt
rename to testutils/testutils-ktx/src/main/java/androidx/testutils/TestDispatcher.kt
diff --git a/testutils-ktx/src/main/java/androidx/testutils/assertions.kt b/testutils/testutils-ktx/src/main/java/androidx/testutils/assertions.kt
similarity index 100%
rename from testutils-ktx/src/main/java/androidx/testutils/assertions.kt
rename to testutils/testutils-ktx/src/main/java/androidx/testutils/assertions.kt
diff --git a/testutils/build.gradle b/testutils/testutils-runtime/build.gradle
similarity index 100%
rename from testutils/build.gradle
rename to testutils/testutils-runtime/build.gradle
diff --git a/testutils/lint-baseline.xml b/testutils/testutils-runtime/lint-baseline.xml
similarity index 100%
rename from testutils/lint-baseline.xml
rename to testutils/testutils-runtime/lint-baseline.xml
diff --git a/testutils/src/androidTest/java/androidx/testutils/LocaleTestUtilsTest.kt b/testutils/testutils-runtime/src/androidTest/java/androidx/testutils/LocaleTestUtilsTest.kt
similarity index 100%
rename from testutils/src/androidTest/java/androidx/testutils/LocaleTestUtilsTest.kt
rename to testutils/testutils-runtime/src/androidTest/java/androidx/testutils/LocaleTestUtilsTest.kt
diff --git a/testutils/src/main/AndroidManifest.xml b/testutils/testutils-runtime/src/main/AndroidManifest.xml
similarity index 100%
rename from testutils/src/main/AndroidManifest.xml
rename to testutils/testutils-runtime/src/main/AndroidManifest.xml
diff --git a/testutils/src/main/java/androidx/testutils/ActivityScenario.kt b/testutils/testutils-runtime/src/main/java/androidx/testutils/ActivityScenario.kt
similarity index 100%
rename from testutils/src/main/java/androidx/testutils/ActivityScenario.kt
rename to testutils/testutils-runtime/src/main/java/androidx/testutils/ActivityScenario.kt
diff --git a/testutils/src/main/java/androidx/testutils/ActivityTestRule.kt b/testutils/testutils-runtime/src/main/java/androidx/testutils/ActivityTestRule.kt
similarity index 100%
rename from testutils/src/main/java/androidx/testutils/ActivityTestRule.kt
rename to testutils/testutils-runtime/src/main/java/androidx/testutils/ActivityTestRule.kt
diff --git a/testutils/src/main/java/androidx/testutils/LifecycleOwnerUtils.java b/testutils/testutils-runtime/src/main/java/androidx/testutils/LifecycleOwnerUtils.java
similarity index 100%
rename from testutils/src/main/java/androidx/testutils/LifecycleOwnerUtils.java
rename to testutils/testutils-runtime/src/main/java/androidx/testutils/LifecycleOwnerUtils.java
diff --git a/testutils/src/main/java/androidx/testutils/LocaleTestUtils.kt b/testutils/testutils-runtime/src/main/java/androidx/testutils/LocaleTestUtils.kt
similarity index 100%
rename from testutils/src/main/java/androidx/testutils/LocaleTestUtils.kt
rename to testutils/testutils-runtime/src/main/java/androidx/testutils/LocaleTestUtils.kt
diff --git a/testutils/src/main/java/androidx/testutils/OrientationChangeAction.java b/testutils/testutils-runtime/src/main/java/androidx/testutils/OrientationChangeAction.java
similarity index 100%
rename from testutils/src/main/java/androidx/testutils/OrientationChangeAction.java
rename to testutils/testutils-runtime/src/main/java/androidx/testutils/OrientationChangeAction.java
diff --git a/testutils/src/main/java/androidx/testutils/PollingCheck.java b/testutils/testutils-runtime/src/main/java/androidx/testutils/PollingCheck.java
similarity index 100%
rename from testutils/src/main/java/androidx/testutils/PollingCheck.java
rename to testutils/testutils-runtime/src/main/java/androidx/testutils/PollingCheck.java
diff --git a/testutils/src/main/java/androidx/testutils/RecreatedActivity.kt b/testutils/testutils-runtime/src/main/java/androidx/testutils/RecreatedActivity.kt
similarity index 100%
rename from testutils/src/main/java/androidx/testutils/RecreatedActivity.kt
rename to testutils/testutils-runtime/src/main/java/androidx/testutils/RecreatedActivity.kt
diff --git a/testutils/src/main/java/androidx/testutils/RecreatedAppCompatActivity.kt b/testutils/testutils-runtime/src/main/java/androidx/testutils/RecreatedAppCompatActivity.kt
similarity index 100%
rename from testutils/src/main/java/androidx/testutils/RecreatedAppCompatActivity.kt
rename to testutils/testutils-runtime/src/main/java/androidx/testutils/RecreatedAppCompatActivity.kt
diff --git a/testutils/src/main/java/androidx/testutils/SimpleGestureGenerator.kt b/testutils/testutils-runtime/src/main/java/androidx/testutils/SimpleGestureGenerator.kt
similarity index 100%
rename from testutils/src/main/java/androidx/testutils/SimpleGestureGenerator.kt
rename to testutils/testutils-runtime/src/main/java/androidx/testutils/SimpleGestureGenerator.kt
diff --git a/testutils/src/main/java/androidx/testutils/SwipeInjector.java b/testutils/testutils-runtime/src/main/java/androidx/testutils/SwipeInjector.java
similarity index 100%
rename from testutils/src/main/java/androidx/testutils/SwipeInjector.java
rename to testutils/testutils-runtime/src/main/java/androidx/testutils/SwipeInjector.java
diff --git a/testutils/src/main/java/androidx/testutils/SwipeToLocation.java b/testutils/testutils-runtime/src/main/java/androidx/testutils/SwipeToLocation.java
similarity index 100%
rename from testutils/src/main/java/androidx/testutils/SwipeToLocation.java
rename to testutils/testutils-runtime/src/main/java/androidx/testutils/SwipeToLocation.java
diff --git a/testutils/src/main/java/androidx/testutils/TranslatedCoordinatesProvider.java b/testutils/testutils-runtime/src/main/java/androidx/testutils/TranslatedCoordinatesProvider.java
similarity index 100%
rename from testutils/src/main/java/androidx/testutils/TranslatedCoordinatesProvider.java
rename to testutils/testutils-runtime/src/main/java/androidx/testutils/TranslatedCoordinatesProvider.java
diff --git a/viewpager2/build.gradle b/viewpager2/build.gradle
index 6cda3c8..0aeca2c 100644
--- a/viewpager2/build.gradle
+++ b/viewpager2/build.gradle
@@ -39,7 +39,7 @@
androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
- androidTestImplementation project(':internal-testutils'), {
+ androidTestImplementation project(':internal-testutils-runtime'), {
exclude group: 'androidx.viewpager2', module: 'viewpager2'
}
androidTestImplementation(KOTLIN_STDLIB)
