commit 8c5185a249858ff5fc24d24e129512557b1a4a2a
author Yichun Li <yichunli@google.com> Mon Jan 08 16:36:42 2024 +0000
committer Yichun Li <yichunli@google.com> Wed Jan 10 21:22:51 2024 +0000
tree 22e7f06c504e2660a2dba41bcb24c6534817dd87
parent 1a621ebff19ac4c459f96fafa9af37cae155a9f1

Migrate uiautomator library

Test: presubmit
Bug: 235842600
Change-Id: I830468b459915f3ab417b3f7addc854c7547ea4b

tests/functional/calculator/Android.bp

diff --git a/tests/functional/calculator/Android.bp b/tests/functional/calculator/Android.bp
index ead815b..f0324bf 100644
--- a/tests/functional/calculator/Android.bp
+++ b/tests/functional/calculator/Android.bp
@@ -23,7 +23,7 @@
         "androidx.test.rules",
         "launcher-helper-lib",
         "metrics-helper-lib",
-        "ub-uiautomator",
+        "androidx.test.uiautomator_uiautomator",
     ],
 
     libs: ["android.test.base"],

tests/functional/calculator/src/com/android/calculator/functional/CalculatorHelper.java

diff --git a/tests/functional/calculator/src/com/android/calculator/functional/CalculatorHelper.java b/tests/functional/calculator/src/com/android/calculator/functional/CalculatorHelper.java
index 4b45193..ca081b0 100644
--- a/tests/functional/calculator/src/com/android/calculator/functional/CalculatorHelper.java
+++ b/tests/functional/calculator/src/com/android/calculator/functional/CalculatorHelper.java
@@ -17,18 +17,15 @@
 package com.android.calculator.functional;
 
 import android.content.Context;
-import android.content.Intent;
-import android.support.test.launcherhelper.ILauncherStrategy;
-import android.support.test.launcherhelper.LauncherStrategyFactory;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.Direction;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.Until;
-import android.support.test.uiautomator.UiSelector;
-import android.test.InstrumentationTestCase;
-import android.util.Log;
+import android.support.test.launcherhelper2.ILauncherStrategy;
+import android.support.test.launcherhelper2.LauncherStrategyFactory;
+
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.Direction;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.Until;
+
 import junit.framework.Assert;
 
 public class CalculatorHelper {

tests/functional/calculator/src/com/android/calculator/functional/CalculatorTests.java

diff --git a/tests/functional/calculator/src/com/android/calculator/functional/CalculatorTests.java b/tests/functional/calculator/src/com/android/calculator/functional/CalculatorTests.java
index 183c07a..74082bf 100644
--- a/tests/functional/calculator/src/com/android/calculator/functional/CalculatorTests.java
+++ b/tests/functional/calculator/src/com/android/calculator/functional/CalculatorTests.java
@@ -17,17 +17,14 @@
 package com.android.calculator.functional;
 
 import android.content.Context;
-import android.content.Intent;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.Direction;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.Until;
 import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.MediumTest;
-import android.view.inputmethod.InputMethodManager;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiObject2;
+import androidx.test.uiautomator.Until;
 
 public class CalculatorTests extends InstrumentationTestCase {
     private CalculatorHelper mCalculatorHelper = null;