Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 643e908e authored by Fangqiu Su's avatar Fangqiu Su
Browse files

Update uiautomator references in packages/apps/Settings/tests/uitests 

* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
  "androidx.test.uiautomator_uiautomator" (v2.3.0).

Bug: 235842600
Test: mmma .
Change-Id: I216758dc3898875c41f865f5aa25d20bf0386aed
parent b1aabec0

tests/uitests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ android_test { 


    static_libs: [

        "androidx.test.rules",

        "androidx.test.uiautomator_uiautomator",

        "app-helpers-core",

        "launcher-helper-lib",

        "metrics-helper-lib",
@@ -43,7 +44,6 @@ android_test { 
        "sysui-helper",

        "timeresult-helper-lib",

        "truth-prebuilt",

        "ub-uiautomator",

    ],



    //sdk_version: "current",

tests/uitests/src/com/android/settings/ui/AboutPhoneSettingsTests.java

+5 −5
Original line number Diff line number Diff line
@@ -24,16 +24,16 @@ import android.app.Instrumentation; 
import android.content.Intent;

import android.os.RemoteException;

import android.provider.Settings;

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.text.TextUtils;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;

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 org.junit.After;

import org.junit.Before;

tests/uitests/src/com/android/settings/ui/AppsSettingsRetainFilterTests.java

+4 −4
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ import static com.google.common.truth.Truth.assertThat; 
import android.content.Intent;

import android.os.RemoteException;

import android.provider.Settings;

import android.support.test.uiautomator.By;

import android.support.test.uiautomator.UiDevice;

import android.support.test.uiautomator.UiObject2;

import android.support.test.uiautomator.Until;

import android.system.helpers.ActivityHelper;



import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.uiautomator.By;

import androidx.test.uiautomator.UiDevice;

import androidx.test.uiautomator.UiObject2;

import androidx.test.uiautomator.Until;



import org.junit.Before;

import org.junit.Test;

tests/uitests/src/com/android/settings/ui/AppsSettingsTests.java

+6 −5
Original line number Diff line number Diff line
@@ -19,16 +19,17 @@ package com.android.settings.ui; 
import android.content.Intent;

import android.os.RemoteException;

import android.provider.Settings;

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.system.helpers.ActivityHelper;

import android.test.InstrumentationTestCase;

import android.test.suitebuilder.annotation.MediumTest;

import android.util.Log;



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;



/** Verifies basic functionality of the About Phone screen */

public class AppsSettingsTests extends InstrumentationTestCase {

    private static final boolean LOCAL_LOGV = false;

tests/uitests/src/com/android/settings/ui/BatterySettingsUITest.java

+1 −1
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ package com.android.settings.ui; 


import android.content.Intent;

import android.os.RemoteException;

import android.support.test.uiautomator.UiDevice;

import android.system.helpers.SettingsHelper;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.MediumTest;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.uiautomator.UiDevice;



import com.android.settings.ui.testutils.SettingsTestUtils;