PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" am: 0a3a5b74a1 am: 942671e18a am: 1cc65c8dce

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558310

Change-Id: I0d81ddfa513a5e523c9268384156dab62bae1e97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Fangqiu Su
2023-05-11 21:47:41 +00:00
committed by Automerger Merge Worker
parent 37dc9f703c 1cc65c8dce
commit 3c36f4c88e
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/anomaly-tester/Android.bp
View File

@@ -17,7 +17,7 @@ android_test {
static_libs: [
"androidx.test.rules",
"mockito-target",
"ub-uiautomator",
"androidx.test.uiautomator_uiautomator",
"truth-prebuilt",
],

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

@@ -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;

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

@@ -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";

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

@@ -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;