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

Commit b6439897 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Migrate packages/apps/Contacts to androidx.test"

parents 4ea39e5e bebf2dd3

tests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ LOCAL_SDK_VERSION := current 
LOCAL_MIN_SDK_VERSION := 21



LOCAL_STATIC_JAVA_LIBRARIES += \

    android-support-test \

    androidx.test.rules \

    hamcrest-library \

    mockito-target-minus-junit4 \

    ub-uiautomator

tests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ 
        <service android:name=".PhoneNumberTestService" />

    </application>



    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"

    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

        android:targetPackage="com.android.contacts"

        android:label="Contacts app tests">

    </instrumentation>

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

+10 −9
Original line number Diff line number Diff line
@@ -15,6 +15,14 @@ 
 */

package com.android.contacts;



import static org.hamcrest.MatcherAssert.assertThat;

import static org.hamcrest.Matchers.equalTo;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.annotation.TargetApi;

import android.app.job.JobScheduler;

import android.content.ContentProvider;
@@ -28,11 +36,12 @@ import android.net.Uri; 
import android.os.Build;

import android.provider.ContactsContract;

import android.provider.ContactsContract.Contacts;

import android.support.test.filters.SdkSuppress;

import android.test.AndroidTestCase;

import android.test.mock.MockContentResolver;

import android.test.suitebuilder.annotation.SmallTest;



import androidx.test.filters.SdkSuppress;



import com.android.contacts.test.mocks.MockContentProvider;



import org.hamcrest.BaseMatcher;
@@ -46,14 +55,6 @@ import java.util.Arrays; 
import java.util.Collections;

import java.util.List;



import static org.hamcrest.MatcherAssert.assertThat;

import static org.hamcrest.Matchers.equalTo;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



@TargetApi(Build.VERSION_CODES.N_MR1)

@SdkSuppress(minSdkVersion = Build.VERSION_CODES.N_MR1)

@SmallTest

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

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

import android.content.Intent;

import android.content.pm.PackageManager;

import android.support.test.InstrumentationRegistry;

import android.support.test.filters.MediumTest;

import android.support.test.filters.Suppress;

import android.support.test.runner.AndroidJUnit4;

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

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -34,7 +35,7 @@ import org.junit.runner.RunWith; 
 * $ adb shell pm revoke com.android.contacts android.permission.READ_CALL_LOG

 * $ adb shell pm revoke com.android.contacts android.permission.CALL_PHONE

 * $ adb shell am instrument -w \

 *     com.google.android.contacts.tests/android.support.test.runner.AndroidJUnitRunner \

 *     com.google.android.contacts.tests/androidx.test.runner.AndroidJUnitRunner \

 *     -e class com.android.contacts.NoPermissionsLaunchSmokeTest

 */

@MediumTest

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

+2 −1
Original line number Diff line number Diff line
@@ -20,9 +20,10 @@ import android.app.Instrumentation; 
import android.content.Context;

import android.os.Bundle;

import android.os.Debug;

import android.support.test.InstrumentationRegistry;

import android.util.Log;



import androidx.test.InstrumentationRegistry;



import java.lang.reflect.InvocationTargetException;

import java.lang.reflect.Method;