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

Commit 2ca3479a authored by Yichun Li's avatar Yichun Li Committed by Android (Google) Code Review
Browse files

Merge "Update uiautomator references in frameworks/base/core/tests/coretests"

parents 4628f027 86f2369f

core/tests/coretests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ android_test { 
        "junit-params",

        "kotlin-test",

        "mockito-target-minus-junit4",

        "ub-uiautomator",

        "androidx.test.uiautomator_uiautomator",

        "platform-test-annotations",

        "platform-compat-test-rules",

        "truth-prebuilt",

core/tests/coretests/src/android/app/DownloadManagerBaseTest.java

+2 −1
Original line number Diff line number Diff line
@@ -33,10 +33,11 @@ import android.os.ParcelFileDescriptor.AutoCloseInputStream; 
import android.os.SystemClock;

import android.os.UserHandle;

import android.provider.Settings;

import android.support.test.uiautomator.UiDevice;

import android.test.InstrumentationTestCase;

import android.util.Log;



import androidx.test.uiautomator.UiDevice;



import com.google.mockwebserver.MockResponse;

import com.google.mockwebserver.MockWebServer;

core/tests/coretests/src/android/app/usage/UsageStatsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -36,11 +36,11 @@ import static org.junit.Assert.fail; 
import android.app.usage.UsageEvents.Event;

import android.os.Parcel;

import android.os.UserHandle;

import android.support.test.uiautomator.UiDevice;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.uiautomator.UiDevice;



import org.junit.Before;

import org.junit.Test;

core/tests/coretests/src/android/database/DatabaseGeneralTest.java

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.database.sqlite.SQLiteDatabase; 
import android.database.sqlite.SQLiteDebug;

import android.database.sqlite.SQLiteException;

import android.os.Parcel;

import android.support.test.uiautomator.UiDevice;

import android.test.AndroidTestCase;

import android.test.PerformanceTestCase;

import android.util.Log;
@@ -35,6 +34,7 @@ import androidx.test.InstrumentationRegistry; 
import androidx.test.filters.LargeTest;

import androidx.test.filters.MediumTest;

import androidx.test.filters.SmallTest;

import androidx.test.uiautomator.UiDevice;



import junit.framework.Assert;

core/tests/coretests/src/android/os/BinderProxyCountingTest.java

+1 −1
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ import android.content.ComponentName; 
import android.content.Context;

import android.content.Intent;

import android.content.ServiceConnection;

import android.support.test.uiautomator.UiDevice;

import android.util.Log;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.uiautomator.UiDevice;



import com.android.frameworks.coretests.aidl.IBpcCallbackObserver;

import com.android.frameworks.coretests.aidl.IBpcTestAppCmdService;