Replace android.support.test for androidx.test
The flicker tests currently use a mix of both libraries. To make the code cleaner and avoid compatibility problems, this CL replaces all components from the android.support.test library for those from androidx.test
Test: atest FlickerTests
Change-Id: Id98c4e465fe5277a753851aef4ad9879efc40bc2
diff --git a/libraries/flicker/src/com/android/server/wm/flicker/helpers/AutomationUtils.java b/libraries/flicker/src/com/android/server/wm/flicker/helpers/AutomationUtils.java
index f185c14..7b9c018 100644
--- a/libraries/flicker/src/com/android/server/wm/flicker/helpers/AutomationUtils.java
+++ b/libraries/flicker/src/com/android/server/wm/flicker/helpers/AutomationUtils.java
@@ -29,12 +29,6 @@
import android.graphics.Point;
import android.graphics.Rect;
import android.os.RemoteException;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.BySelector;
-import android.support.test.uiautomator.Configurator;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.Until;
import android.util.Log;
import android.util.Rational;
import android.view.Surface;
@@ -42,6 +36,12 @@
import android.view.ViewConfiguration;
import androidx.test.InstrumentationRegistry;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.BySelector;
+import androidx.test.uiautomator.Configurator;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.Until;
import com.android.server.wm.flicker.WindowUtils;
diff --git a/libraries/flicker/test/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitorTest.java b/libraries/flicker/test/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitorTest.java
index 5123b87..3478d33 100644
--- a/libraries/flicker/test/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitorTest.java
+++ b/libraries/flicker/test/src/com/android/server/wm/flicker/monitor/WindowAnimationFrameStatsMonitorTest.java
@@ -16,12 +16,9 @@
package com.android.server.wm.flicker.monitor;
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
-
import static com.android.server.wm.flicker.helpers.AutomationUtils.wakeUpAndGoToHomeScreen;
import android.app.Instrumentation;
-import android.os.Bundle;
import android.platform.helpers.IAppHelper;
import androidx.test.InstrumentationRegistry;
@@ -47,8 +44,6 @@
@Before
public void setup() {
- android.support.test.InstrumentationRegistry.registerInstance(
- getInstrumentation(), new Bundle());
mInstrumentation = InstrumentationRegistry.getInstrumentation();
mWindowAnimationFrameStatsMonitor = new WindowAnimationFrameStatsMonitor(mInstrumentation);
wakeUpAndGoToHomeScreen();
