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

Commit f28dac6e authored by Yichun Li's avatar Yichun Li Committed by Gerrit Code Review
Browse files

Merge "Update uiautomator references in packages/apps/Contacts/tests"

parents bcc9a046 c943f4de

tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ android_test { 
        "androidx.test.ext.junit",

        "hamcrest-library",

        "mockito-target-minus-junit4",

        "ub-uiautomator",

        "androidx.test.uiautomator_uiautomator",

    ],



    libs: [

tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java

+4 −4
Original line number Diff line number Diff line
@@ -8,15 +8,15 @@ import android.Manifest; 
import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

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.InstrumentationRegistry;

import androidx.test.filters.MediumTest;

import androidx.test.filters.Suppress;

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/src/com/android/contacts/activities/SimImportActivityTest.java

+3 −3
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ import android.provider.ContactsContract.CommonDataKinds.Phone; 
import android.provider.ContactsContract.Data;

import android.provider.SimPhonebookContract;

import android.provider.SimPhonebookContract.SimRecords;

import android.support.test.uiautomator.By;

import android.support.test.uiautomator.UiDevice;

import android.support.test.uiautomator.Until;

import android.telephony.TelephonyManager;

import android.test.mock.MockContentResolver;
@@ -53,6 +50,9 @@ import androidx.test.InstrumentationRegistry; 
import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.LargeTest;

import androidx.test.filters.SdkSuppress;

import androidx.test.uiautomator.By;

import androidx.test.uiautomator.UiDevice;

import androidx.test.uiautomator.Until;



import com.android.contacts.SimImportService;

import com.android.contacts.database.SimContactDao;