Move testutils to androidx.testutils package.
Test: ./gradlew assembleDebug
Change-Id: Ib6347167e152e043c47ffb91194d666000a1677a
diff --git a/compat/build.gradle b/compat/build.gradle
index f52c5ff..d7ef792 100644
--- a/compat/build.gradle
+++ b/compat/build.gradle
@@ -15,7 +15,7 @@
androidTestImplementation(ESPRESSO_CORE)
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(':support-testutils'), {
+ androidTestImplementation project(':internal-testutils'), {
exclude group: 'com.android.support', module: 'support-compat'
}
}
diff --git a/compat/src/androidTest/java/android/support/v4/widget/ContentLoadingProgressBarTest.java b/compat/src/androidTest/java/android/support/v4/widget/ContentLoadingProgressBarTest.java
index c8bc229..9375aad 100644
--- a/compat/src/androidTest/java/android/support/v4/widget/ContentLoadingProgressBarTest.java
+++ b/compat/src/androidTest/java/android/support/v4/widget/ContentLoadingProgressBarTest.java
@@ -22,7 +22,6 @@
import android.support.test.filters.LargeTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
-import android.support.testutils.PollingCheck;
import android.view.View;
import org.junit.Before;
@@ -30,6 +29,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;
+import androidx.testutils.PollingCheck;
+
/**
* Tests for {@link ContentLoadingProgressBar}
*/
diff --git a/coordinatorlayout/build.gradle b/coordinatorlayout/build.gradle
index c6ce55b..09f4a2a 100644
--- a/coordinatorlayout/build.gradle
+++ b/coordinatorlayout/build.gradle
@@ -15,7 +15,7 @@
androidTestImplementation(ESPRESSO_CORE)
androidTestImplementation(ESPRESSO_CONTRIB, libs.exclude_support)
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
- androidTestImplementation project(':support-testutils'), {
+ androidTestImplementation project(':internal-testutils'), {
exclude group: 'com.android.support', module: 'support-core-ui'
}
}
diff --git a/coordinatorlayout/src/androidTest/java/android/support/design/widget/BaseTestActivity.java b/coordinatorlayout/src/androidTest/java/android/support/design/widget/BaseTestActivity.java
index 0dd56e4..4272f56 100755
--- a/coordinatorlayout/src/androidTest/java/android/support/design/widget/BaseTestActivity.java
+++ b/coordinatorlayout/src/androidTest/java/android/support/design/widget/BaseTestActivity.java
@@ -18,9 +18,10 @@
import android.os.Bundle;
import android.support.annotation.LayoutRes;
-import android.support.testutils.RecreatedActivity;
import android.view.WindowManager;
+import androidx.testutils.RecreatedActivity;
+
abstract class BaseTestActivity extends RecreatedActivity {
private boolean mDestroyed;
diff --git a/core-ui/build.gradle b/core-ui/build.gradle
index 12f5525..fcf52e4 100644
--- a/core-ui/build.gradle
+++ b/core-ui/build.gradle
@@ -24,7 +24,7 @@
androidTestImplementation(ESPRESSO_CORE)
androidTestImplementation(ESPRESSO_CONTRIB, libs.exclude_support)
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
- androidTestImplementation project(':support-testutils'), {
+ androidTestImplementation project(':internal-testutils'), {
exclude group: 'com.android.support', module: 'support-core-ui'
}
diff --git a/customtabs/build.gradle b/customtabs/build.gradle
index ced95b8..a1664fc 100644
--- a/customtabs/build.gradle
+++ b/customtabs/build.gradle
@@ -14,7 +14,7 @@
androidTestImplementation(TEST_RUNNER)
androidTestImplementation(ESPRESSO_CORE)
- androidTestImplementation(project(":support-testutils"))
+ androidTestImplementation(project(":internal-testutils"))
}
supportLibrary {
diff --git a/customtabs/src/androidTest/java/android/support/customtabs/PostMessageServiceConnectionTest.java b/customtabs/src/androidTest/java/android/support/customtabs/PostMessageServiceConnectionTest.java
index 07d21a8..381afae 100644
--- a/customtabs/src/androidTest/java/android/support/customtabs/PostMessageServiceConnectionTest.java
+++ b/customtabs/src/androidTest/java/android/support/customtabs/PostMessageServiceConnectionTest.java
@@ -26,7 +26,6 @@
import android.support.test.rule.ActivityTestRule;
import android.support.test.rule.ServiceTestRule;
import android.support.test.runner.AndroidJUnit4;
-import android.support.testutils.PollingCheck;
import org.junit.Before;
import org.junit.Rule;
@@ -35,6 +34,8 @@
import java.util.concurrent.TimeoutException;
+import androidx.testutils.PollingCheck;
+
/**
* Tests for {@link PostMessageServiceConnection} with no {@link CustomTabsService} component.
*/
diff --git a/customtabs/src/androidTest/java/android/support/customtabs/PostMessageTest.java b/customtabs/src/androidTest/java/android/support/customtabs/PostMessageTest.java
index 7e342b4..6e96b45 100644
--- a/customtabs/src/androidTest/java/android/support/customtabs/PostMessageTest.java
+++ b/customtabs/src/androidTest/java/android/support/customtabs/PostMessageTest.java
@@ -29,7 +29,6 @@
import android.support.test.rule.ActivityTestRule;
import android.support.test.rule.ServiceTestRule;
import android.support.test.runner.AndroidJUnit4;
-import android.support.testutils.PollingCheck;
import org.junit.Before;
import org.junit.Rule;
@@ -38,6 +37,8 @@
import java.util.concurrent.atomic.AtomicBoolean;
+import androidx.testutils.PollingCheck;
+
/**
* Tests for a complete loop between a browser side {@link CustomTabsService}
diff --git a/emoji/core/build.gradle b/emoji/core/build.gradle
index 449ebb1..c7e999a 100644
--- a/emoji/core/build.gradle
+++ b/emoji/core/build.gradle
@@ -28,7 +28,7 @@
androidTestImplementation(ESPRESSO_CORE)
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(':support-testutils')
+ androidTestImplementation project(':internal-testutils')
}
android {
diff --git a/emoji/core/src/androidTest/java/android/support/text/emoji/EmojiKeyboardTest.java b/emoji/core/src/androidTest/java/android/support/text/emoji/EmojiKeyboardTest.java
index 1c647ce..aafa0d1 100644
--- a/emoji/core/src/androidTest/java/android/support/text/emoji/EmojiKeyboardTest.java
+++ b/emoji/core/src/androidTest/java/android/support/text/emoji/EmojiKeyboardTest.java
@@ -30,7 +30,6 @@
import android.support.test.filters.Suppress;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
-import android.support.testutils.PollingCheck;
import android.support.text.emoji.test.R;
import android.support.text.emoji.util.KeyboardUtil;
import android.support.text.emoji.util.TestString;
@@ -44,6 +43,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;
+import androidx.testutils.PollingCheck;
+
@LargeTest
@RunWith(AndroidJUnit4.class)
@Suppress
diff --git a/fragment/build.gradle b/fragment/build.gradle
index 4a3c1d1..dd1f2d9 100644
--- a/fragment/build.gradle
+++ b/fragment/build.gradle
@@ -18,7 +18,7 @@
androidTestImplementation(ESPRESSO_CORE)
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(':support-testutils'), {
+ androidTestImplementation project(':internal-testutils'), {
exclude group: 'com.android.support', module: 'support-fragment'
}
}
diff --git a/fragment/src/androidTest/java/android/support/v4/app/FragmentManagerNonConfigTest.java b/fragment/src/androidTest/java/android/support/v4/app/FragmentManagerNonConfigTest.java
index dc62c01..c3bea05 100644
--- a/fragment/src/androidTest/java/android/support/v4/app/FragmentManagerNonConfigTest.java
+++ b/fragment/src/androidTest/java/android/support/v4/app/FragmentManagerNonConfigTest.java
@@ -21,13 +21,14 @@
import android.support.test.filters.MediumTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
-import android.support.testutils.FragmentActivityUtils;
import android.support.v4.app.test.NonConfigOnStopActivity;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
+import androidx.testutils.FragmentActivityUtils;
+
@MediumTest
@RunWith(AndroidJUnit4.class)
public class FragmentManagerNonConfigTest {
diff --git a/fragment/src/androidTest/java/android/support/v4/app/HangingFragmentTest.java b/fragment/src/androidTest/java/android/support/v4/app/HangingFragmentTest.java
index bf8726f..bb8d1db 100644
--- a/fragment/src/androidTest/java/android/support/v4/app/HangingFragmentTest.java
+++ b/fragment/src/androidTest/java/android/support/v4/app/HangingFragmentTest.java
@@ -19,7 +19,6 @@
import android.support.test.filters.SmallTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
-import android.support.testutils.FragmentActivityUtils;
import android.support.v4.app.test.HangingFragmentActivity;
import org.junit.Assert;
@@ -27,6 +26,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
+import androidx.testutils.FragmentActivityUtils;
@RunWith(AndroidJUnit4.class)
@SmallTest
diff --git a/fragment/src/androidTest/java/android/support/v4/app/LoaderTest.java b/fragment/src/androidTest/java/android/support/v4/app/LoaderTest.java
index 1d89e27..4a1837f 100644
--- a/fragment/src/androidTest/java/android/support/v4/app/LoaderTest.java
+++ b/fragment/src/androidTest/java/android/support/v4/app/LoaderTest.java
@@ -32,8 +32,6 @@
import android.support.test.filters.MediumTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
-import android.support.testutils.FragmentActivityUtils;
-import android.support.testutils.RecreatedActivity;
import android.support.v4.app.test.LoaderActivity;
import android.support.v4.content.AsyncTaskLoader;
import android.support.v4.content.Loader;
@@ -46,6 +44,9 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import androidx.testutils.FragmentActivityUtils;
+import androidx.testutils.RecreatedActivity;
+
@RunWith(AndroidJUnit4.class)
@MediumTest
public class LoaderTest {
diff --git a/fragment/src/androidTest/java/android/support/v4/app/test/HangingFragmentActivity.java b/fragment/src/androidTest/java/android/support/v4/app/test/HangingFragmentActivity.java
index 80b9aa5..bdf29cb 100644
--- a/fragment/src/androidTest/java/android/support/v4/app/test/HangingFragmentActivity.java
+++ b/fragment/src/androidTest/java/android/support/v4/app/test/HangingFragmentActivity.java
@@ -19,7 +19,8 @@
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.fragment.test.R;
-import android.support.testutils.RecreatedActivity;
+
+import androidx.testutils.RecreatedActivity;
public class HangingFragmentActivity extends RecreatedActivity {
diff --git a/fragment/src/androidTest/java/android/support/v4/app/test/LoaderActivity.java b/fragment/src/androidTest/java/android/support/v4/app/test/LoaderActivity.java
index f6ddf9c..1c88dbe 100644
--- a/fragment/src/androidTest/java/android/support/v4/app/test/LoaderActivity.java
+++ b/fragment/src/androidTest/java/android/support/v4/app/test/LoaderActivity.java
@@ -21,7 +21,6 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.fragment.test.R;
-import android.support.testutils.RecreatedActivity;
import android.support.v4.app.Fragment;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.AsyncTaskLoader;
@@ -31,6 +30,8 @@
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.testutils.RecreatedActivity;
+
public class LoaderActivity extends RecreatedActivity
implements LoaderManager.LoaderCallbacks<String> {
private static final int TEXT_LOADER_ID = 14;
diff --git a/fragment/src/androidTest/java/android/support/v4/app/test/NonConfigOnStopActivity.java b/fragment/src/androidTest/java/android/support/v4/app/test/NonConfigOnStopActivity.java
index 9d71388..f52ddbd 100644
--- a/fragment/src/androidTest/java/android/support/v4/app/test/NonConfigOnStopActivity.java
+++ b/fragment/src/androidTest/java/android/support/v4/app/test/NonConfigOnStopActivity.java
@@ -16,9 +16,10 @@
package android.support.v4.app.test;
-import android.support.testutils.RecreatedActivity;
import android.support.v4.app.Fragment;
+import androidx.testutils.RecreatedActivity;
+
public class NonConfigOnStopActivity extends RecreatedActivity {
@Override
protected void onStop() {
diff --git a/media-compat/build.gradle b/media-compat/build.gradle
index 29c91b7..f3372a1 100644
--- a/media-compat/build.gradle
+++ b/media-compat/build.gradle
@@ -14,7 +14,7 @@
androidTestImplementation(ESPRESSO_CORE)
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(':support-testutils')
+ androidTestImplementation project(':internal-testutils')
}
android {
diff --git a/settings.gradle b/settings.gradle
index 06b1c32..5e1b188 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -127,7 +127,7 @@
//
/////////////////////////////
-includeProject(":support-testutils", "testutils")
+includeProject(":internal-testutils", "testutils")
/////////////////////////////
//
diff --git a/swiperefreshlayout/build.gradle b/swiperefreshlayout/build.gradle
index 0479bbe..e25a82c 100644
--- a/swiperefreshlayout/build.gradle
+++ b/swiperefreshlayout/build.gradle
@@ -18,7 +18,7 @@
androidTestImplementation(ESPRESSO_CONTRIB, libs.exclude_support)
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(':support-testutils'), {
+ androidTestImplementation project(':internal-testutils'), {
exclude group: 'com.android.support', module: 'swiperefreshlayout'
}
}
diff --git a/swiperefreshlayout/src/androidTest/java/android/support/v4/widget/SwipeRefreshLayoutTest.java b/swiperefreshlayout/src/androidTest/java/android/support/v4/widget/SwipeRefreshLayoutTest.java
index fe53293..96c2dac 100644
--- a/swiperefreshlayout/src/androidTest/java/android/support/v4/widget/SwipeRefreshLayoutTest.java
+++ b/swiperefreshlayout/src/androidTest/java/android/support/v4/widget/SwipeRefreshLayoutTest.java
@@ -39,7 +39,6 @@
import android.support.test.filters.SmallTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
-import android.support.testutils.PollingCheck;
import android.view.View;
import org.junit.Before;
@@ -50,6 +49,8 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import androidx.testutils.PollingCheck;
+
/**
* Tests SwipeRefreshLayout widget.
*/
diff --git a/testutils/src/main/AndroidManifest.xml b/testutils/src/main/AndroidManifest.xml
index 4d2fd19..2feb440 100644
--- a/testutils/src/main/AndroidManifest.xml
+++ b/testutils/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="android.support.testutils"/>
+<manifest package="androidx.testutils"/>
diff --git a/testutils/src/main/java/android/support/testutils/AppCompatActivityUtils.java b/testutils/src/main/java/androidx/testutils/AppCompatActivityUtils.java
similarity index 98%
rename from testutils/src/main/java/android/support/testutils/AppCompatActivityUtils.java
rename to testutils/src/main/java/androidx/testutils/AppCompatActivityUtils.java
index 49ccc1b..e36a2ec 100644
--- a/testutils/src/main/java/android/support/testutils/AppCompatActivityUtils.java
+++ b/testutils/src/main/java/androidx/testutils/AppCompatActivityUtils.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package android.support.testutils;
+package androidx.testutils;
import static org.junit.Assert.assertTrue;
diff --git a/testutils/src/main/java/android/support/testutils/FragmentActivityUtils.java b/testutils/src/main/java/androidx/testutils/FragmentActivityUtils.java
similarity index 98%
rename from testutils/src/main/java/android/support/testutils/FragmentActivityUtils.java
rename to testutils/src/main/java/androidx/testutils/FragmentActivityUtils.java
index 7d12deb..a4b67e7 100644
--- a/testutils/src/main/java/android/support/testutils/FragmentActivityUtils.java
+++ b/testutils/src/main/java/androidx/testutils/FragmentActivityUtils.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package android.support.testutils;
+package androidx.testutils;
import static org.junit.Assert.assertTrue;
diff --git a/testutils/src/main/java/android/support/testutils/PollingCheck.java b/testutils/src/main/java/androidx/testutils/PollingCheck.java
similarity index 98%
rename from testutils/src/main/java/android/support/testutils/PollingCheck.java
rename to testutils/src/main/java/androidx/testutils/PollingCheck.java
index 8e85896..8fd4852 100644
--- a/testutils/src/main/java/android/support/testutils/PollingCheck.java
+++ b/testutils/src/main/java/androidx/testutils/PollingCheck.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.support.testutils;
+package androidx.testutils;
import org.junit.Assert;
diff --git a/testutils/src/main/java/android/support/testutils/RecreatedActivity.java b/testutils/src/main/java/androidx/testutils/RecreatedActivity.java
similarity index 97%
rename from testutils/src/main/java/android/support/testutils/RecreatedActivity.java
rename to testutils/src/main/java/androidx/testutils/RecreatedActivity.java
index aaea3a9..8430dca 100644
--- a/testutils/src/main/java/android/support/testutils/RecreatedActivity.java
+++ b/testutils/src/main/java/androidx/testutils/RecreatedActivity.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.support.testutils;
+package androidx.testutils;
import android.os.Bundle;
import android.support.annotation.Nullable;
diff --git a/testutils/src/main/java/android/support/testutils/RecreatedAppCompatActivity.java b/testutils/src/main/java/androidx/testutils/RecreatedAppCompatActivity.java
similarity index 97%
rename from testutils/src/main/java/android/support/testutils/RecreatedAppCompatActivity.java
rename to testutils/src/main/java/androidx/testutils/RecreatedAppCompatActivity.java
index d5645a3..1a48cf8 100644
--- a/testutils/src/main/java/android/support/testutils/RecreatedAppCompatActivity.java
+++ b/testutils/src/main/java/androidx/testutils/RecreatedAppCompatActivity.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.support.testutils;
+package androidx.testutils;
import android.os.Bundle;
import android.support.annotation.Nullable;
diff --git a/v7/appcompat/build.gradle b/v7/appcompat/build.gradle
index 799b7b3..03f2c0b 100644
--- a/v7/appcompat/build.gradle
+++ b/v7/appcompat/build.gradle
@@ -17,7 +17,7 @@
androidTestImplementation(ESPRESSO_CORE)
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(':support-testutils'), {
+ androidTestImplementation project(':internal-testutils'), {
exclude group: 'com.android.support', module: 'appcompat-v7'
}
}
diff --git a/v7/appcompat/src/androidTest/java/android/support/v7/app/NightModeTestCase.java b/v7/appcompat/src/androidTest/java/android/support/v7/app/NightModeTestCase.java
index d42174f..7f636bd 100644
--- a/v7/appcompat/src/androidTest/java/android/support/v7/app/NightModeTestCase.java
+++ b/v7/appcompat/src/androidTest/java/android/support/v7/app/NightModeTestCase.java
@@ -30,8 +30,6 @@
import android.support.test.filters.LargeTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
-import android.support.testutils.AppCompatActivityUtils;
-import android.support.testutils.RecreatedAppCompatActivity;
import android.support.v4.content.ContextCompat;
import android.support.v7.appcompat.test.R;
@@ -43,6 +41,9 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import androidx.testutils.AppCompatActivityUtils;
+import androidx.testutils.RecreatedAppCompatActivity;
+
@LargeTest
@RunWith(AndroidJUnit4.class)
public class NightModeTestCase {
diff --git a/v7/appcompat/src/androidTest/java/android/support/v7/testutils/BaseTestActivity.java b/v7/appcompat/src/androidTest/java/android/support/v7/testutils/BaseTestActivity.java
index e4dbf26..c880768 100644
--- a/v7/appcompat/src/androidTest/java/android/support/v7/testutils/BaseTestActivity.java
+++ b/v7/appcompat/src/androidTest/java/android/support/v7/testutils/BaseTestActivity.java
@@ -19,7 +19,6 @@
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import android.support.testutils.RecreatedAppCompatActivity;
import android.support.v7.app.AppCompatCallback;
import android.support.v7.appcompat.test.R;
import android.support.v7.view.ActionMode;
@@ -28,6 +27,8 @@
import android.view.MenuItem;
import android.view.WindowManager;
+import androidx.testutils.RecreatedAppCompatActivity;
+
public abstract class BaseTestActivity extends RecreatedAppCompatActivity {
private Menu mMenu;
diff --git a/v7/appcompat/src/androidTest/java/android/support/v7/widget/PopupMenuTest.java b/v7/appcompat/src/androidTest/java/android/support/v7/widget/PopupMenuTest.java
index cae216d..c1326ac 100644
--- a/v7/appcompat/src/androidTest/java/android/support/v7/widget/PopupMenuTest.java
+++ b/v7/appcompat/src/androidTest/java/android/support/v7/widget/PopupMenuTest.java
@@ -56,7 +56,6 @@
import android.support.test.filters.SdkSuppress;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
-import android.support.testutils.PollingCheck;
import android.support.v4.view.MenuItemCompat;
import android.support.v7.appcompat.test.R;
import android.text.TextUtils;
@@ -80,6 +79,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;
+import androidx.testutils.PollingCheck;
+
@RunWith(AndroidJUnit4.class)
public class PopupMenuTest {
@Rule
diff --git a/v7/appcompat/src/androidTest/java/android/support/v7/widget/SearchView_CursorTest.java b/v7/appcompat/src/androidTest/java/android/support/v7/widget/SearchView_CursorTest.java
index ea919e8..7d61d54 100644
--- a/v7/appcompat/src/androidTest/java/android/support/v7/widget/SearchView_CursorTest.java
+++ b/v7/appcompat/src/androidTest/java/android/support/v7/widget/SearchView_CursorTest.java
@@ -36,7 +36,6 @@
import android.support.test.filters.MediumTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
-import android.support.testutils.PollingCheck;
import android.support.v4.widget.CursorAdapter;
import android.support.v4.widget.SimpleCursorAdapter;
import android.support.v7.appcompat.test.R;
@@ -50,6 +49,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;
+import androidx.testutils.PollingCheck;
+
/**
* Test {@link SearchView} with {@link Cursor}-backed suggestions adapter.
*/
diff --git a/v7/recyclerview/build.gradle b/v7/recyclerview/build.gradle
index e58e5b1..fff961d 100644
--- a/v7/recyclerview/build.gradle
+++ b/v7/recyclerview/build.gradle
@@ -18,7 +18,7 @@
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(JUNIT)
androidTestImplementation(KOTLIN_STDLIB)
- androidTestImplementation(project(":support-testutils"))
+ androidTestImplementation(project(":internal-testutils"))
testImplementation(JUNIT)
testImplementation(MOCKITO_CORE)
diff --git a/v7/recyclerview/src/androidTest/java/android/support/v7/widget/BaseRecyclerViewInstrumentationTest.java b/v7/recyclerview/src/androidTest/java/android/support/v7/widget/BaseRecyclerViewInstrumentationTest.java
index e47a480..cf6e228 100644
--- a/v7/recyclerview/src/androidTest/java/android/support/v7/widget/BaseRecyclerViewInstrumentationTest.java
+++ b/v7/recyclerview/src/androidTest/java/android/support/v7/widget/BaseRecyclerViewInstrumentationTest.java
@@ -36,7 +36,6 @@
import android.support.annotation.Nullable;
import android.support.test.InstrumentationRegistry;
import android.support.test.rule.ActivityTestRule;
-import android.support.testutils.PollingCheck;
import android.support.v4.view.ViewCompat;
import android.support.v7.recyclerview.test.R;
import android.util.Log;
@@ -63,6 +62,8 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+import androidx.testutils.PollingCheck;
+
abstract public class BaseRecyclerViewInstrumentationTest {
private static final String TAG = "RecyclerViewTest";
@@ -80,7 +81,8 @@
Thread mInstrumentationThread;
@Rule
- public ActivityTestRule<TestActivity> mActivityRule = new ActivityTestRule(TestActivity.class);
+ public ActivityTestRule<TestActivity> mActivityRule =
+ new ActivityTestRule<>(TestActivity.class);
public BaseRecyclerViewInstrumentationTest() {
this(false);
diff --git a/v7/recyclerview/src/androidTest/java/android/support/v7/widget/helper/ItemTouchHelperTest.java b/v7/recyclerview/src/androidTest/java/android/support/v7/widget/helper/ItemTouchHelperTest.java
index 99d1066..6d73fbc 100644
--- a/v7/recyclerview/src/androidTest/java/android/support/v7/widget/helper/ItemTouchHelperTest.java
+++ b/v7/recyclerview/src/androidTest/java/android/support/v7/widget/helper/ItemTouchHelperTest.java
@@ -32,7 +32,6 @@
import android.support.test.filters.SdkSuppress;
import android.support.test.filters.Suppress;
import android.support.test.runner.AndroidJUnit4;
-import android.support.testutils.PollingCheck;
import android.support.v4.util.Pair;
import android.support.v7.util.TouchUtils;
import android.support.v7.widget.BaseRecyclerViewInstrumentationTest;
@@ -47,6 +46,8 @@
import java.util.ArrayList;
import java.util.List;
+import androidx.testutils.PollingCheck;
+
@LargeTest
@RunWith(AndroidJUnit4.class)
public class ItemTouchHelperTest extends BaseRecyclerViewInstrumentationTest {