Merge "Tweak test size annotations." into ub-contactsdialer-g-dev (b8db2184) · Commits · e / os / android_packages_apps_Contacts

tests/src/com/android/contacts/common/preference/ContactsPreferencesTest.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -19,9 +19,8 @@ package com.android.contacts.common.preference;
		import android.content.Context;
		import android.content.SharedPreferences;
		import android.content.res.Resources;
		import android.test.AndroidTestCase;
		import android.test.InstrumentationTestCase;
		import android.test.suitebuilder.annotation.MediumTest;
		import android.test.suitebuilder.annotation.SmallTest;

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

		@@ -31,7 +30,7 @@ import org.mockito.Mock;
		import org.mockito.Mockito;
		import org.mockito.MockitoAnnotations;

		@MediumTest
		@SmallTest
		public class ContactsPreferencesTest extends InstrumentationTestCase {

		private static final String ACCOUNT_KEY = "ACCOUNT_KEY";

tests/src/com/android/contacts/interactions/ContactDeletionInteractionTest.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -21,20 +21,20 @@ import android.net.Uri;
		import android.provider.ContactsContract.Contacts;
		import android.provider.ContactsContract.Contacts.Entity;
		import android.test.ActivityInstrumentationTestCase2;
		import android.test.suitebuilder.annotation.SmallTest;
		import android.test.suitebuilder.annotation.MediumTest;

		import com.android.contacts.ContactsApplication;
		import com.android.contacts.R;
		import com.android.contacts.common.model.AccountTypeManager;
		import com.android.contacts.common.model.account.AccountType;
		import com.android.contacts.common.model.account.BaseAccountType;
		import com.android.contacts.common.test.FragmentTestActivity;
		import com.android.contacts.common.test.IntegrationTestUtils;
		import com.android.contacts.common.test.mocks.ContactsMockContext;
		import com.android.contacts.common.test.mocks.MockAccountTypeManager;
		import com.android.contacts.common.test.mocks.MockContentProvider;
		import com.android.contacts.common.test.mocks.MockContentProvider.Query;
		import com.android.contacts.common.model.AccountTypeManager;
		import com.android.contacts.common.model.account.AccountType;
		import com.android.contacts.common.model.account.BaseAccountType;
		import com.android.contacts.common.testing.InjectedServices;
		import com.android.contacts.common.test.mocks.MockAccountTypeManager;

		/**
		* Tests for {@link ContactDeletionInteraction}.
		@@ -46,7 +46,7 @@ import com.android.contacts.common.test.mocks.MockAccountTypeManager;
		* adb shell am instrument \
		* -w com.android.contacts.tests/android.test.InstrumentationTestRunner
		*/
		@SmallTest
		@MediumTest
		public class ContactDeletionInteractionTest
		extends ActivityInstrumentationTestCase2<FragmentTestActivity> {
		private static final Uri CONTACT_URI = ContentUris.withAppendedId(Contacts.CONTENT_URI, 13);