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

Commit 753dacef authored by Fangqiu Su's avatar Fangqiu Su Committed by Android (Google) Code Review
Browse files

Merge "Update the imports to androidx.test.filters.*" into main

parents 09d51005 b58ba0bd
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -22,9 +22,10 @@ import android.net.Uri;
import android.provider.ContactsContract.CommonDataKinds.Email;
import android.provider.ContactsContract.CommonDataKinds.Im;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest;
import android.util.Pair;

import androidx.test.filters.SmallTest;

import com.android.contacts.model.dataitem.DataItem;
import com.android.contacts.model.dataitem.EmailDataItem;
import com.android.contacts.model.dataitem.ImDataItem;
+1 −1
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ import android.provider.ContactsContract;
import android.provider.ContactsContract.Contacts;
import android.test.AndroidTestCase;
import android.test.mock.MockContentResolver;
import android.test.suitebuilder.annotation.SmallTest;

import androidx.test.filters.SdkSuppress;
import androidx.test.filters.SmallTest;

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

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
import android.provider.ContactsContract.Data;
import android.test.InstrumentationTestCase;
import android.test.suitebuilder.annotation.MediumTest;

import androidx.test.filters.MediumTest;

import com.android.contacts.model.account.AccountWithDataSet;

+2 −1
Original line number Diff line number Diff line
package com.android.contacts;

import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.test.suitebuilder.annotation.SmallTest;

import androidx.test.filters.SmallTest;

import junit.framework.TestCase;

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ import android.provider.ContactsContract.Directory;
import android.provider.ContactsContract.Groups;
import android.provider.ContactsContract.ProviderStatus;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.SmallTest;

import androidx.test.filters.SmallTest;

import com.android.contacts.ContactPhotoManager;
import com.android.contacts.ContactsApplication;
Loading