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

Commit 0a3a5b74 authored by Fangqiu Su's avatar Fangqiu Su Committed by Gerrit Code Review
Browse files

Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester"

parents 145caf7d 38cf6857

tests/anomaly-tester/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ android_test { 
    static_libs: [

        "androidx.test.rules",

        "mockito-target",

        "ub-uiautomator",

        "androidx.test.uiautomator_uiautomator",

        "truth-prebuilt",

    ],

tests/anomaly-tester/src/com/android/settings/anomaly/tests/BluetoothAnomalyTest.java

+3 −3
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ import static com.google.common.truth.Truth.assertWithMessage; 
import android.app.Instrumentation;

import android.content.Context;

import android.content.Intent;

import android.support.test.uiautomator.By;

import android.support.test.uiautomator.UiDevice;

import android.support.test.uiautomator.Until;

import android.text.format.DateUtils;



import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.uiautomator.By;

import androidx.test.uiautomator.UiDevice;

import androidx.test.uiautomator.Until;



import org.junit.After;

import org.junit.Before;

tests/anomaly-tester/src/com/android/settings/anomaly/tests/TestUtils.java

+5 −4
Original line number Diff line number Diff line
@@ -20,10 +20,11 @@ import android.app.Instrumentation; 
import android.app.UiAutomation;

import android.content.Context;

import android.content.Intent;

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 androidx.test.uiautomator.By;

import androidx.test.uiautomator.UiDevice;

import androidx.test.uiautomator.UiObject2;

import androidx.test.uiautomator.Until;



public class TestUtils {

    private static final String PACKAGE_NAME = "com.android.settings.anomaly.tester";

tests/anomaly-tester/src/com/android/settings/anomaly/tests/WakelockAnomalyTest.java

+3 −3
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ import static com.google.common.truth.Truth.assertWithMessage; 
import android.app.Instrumentation;

import android.content.Context;

import android.content.Intent;

import android.support.test.uiautomator.By;

import android.support.test.uiautomator.UiDevice;

import android.support.test.uiautomator.Until;

import android.text.format.DateUtils;



import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.uiautomator.By;

import androidx.test.uiautomator.UiDevice;

import androidx.test.uiautomator.Until;



import org.junit.After;

import org.junit.Before;