Merge "Add @SizeTest annotations to test classes that don't have them (1/2)" into ub-contactsdialer-g-dev
diff --git a/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java b/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java
index f6925ad..9b9b4fe 100644
--- a/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java
+++ b/tests/src/com/android/contacts/GroupsDaoIntegrationTests.java
@@ -30,6 +30,7 @@
import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
import android.provider.ContactsContract.Data;
import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
import com.android.contacts.common.model.account.AccountWithDataSet;
@@ -39,6 +40,7 @@
/**
* Tests of GroupsDaoImpl that perform DB operations directly against CP2
*/
+@MediumTest
public class GroupsDaoIntegrationTests extends InstrumentationTestCase {
private ContentResolver mResolver;
diff --git a/tests/src/com/android/contacts/common/compat/CompatUtilsTest.java b/tests/src/com/android/contacts/common/compat/CompatUtilsTest.java
index 3386a00..c1d6df9 100644
--- a/tests/src/com/android/contacts/common/compat/CompatUtilsTest.java
+++ b/tests/src/com/android/contacts/common/compat/CompatUtilsTest.java
@@ -17,7 +17,9 @@
package com.android.contacts.common.compat;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
+@SmallTest
public class CompatUtilsTest extends AndroidTestCase {
public void testIsClassAvailable_NullClassName() {
diff --git a/tests/src/com/android/contacts/common/database/NoNullCursorAsyncQueryHandlerTest.java b/tests/src/com/android/contacts/common/database/NoNullCursorAsyncQueryHandlerTest.java
index a2b635d..99a43a8 100644
--- a/tests/src/com/android/contacts/common/database/NoNullCursorAsyncQueryHandlerTest.java
+++ b/tests/src/com/android/contacts/common/database/NoNullCursorAsyncQueryHandlerTest.java
@@ -21,6 +21,7 @@
import android.test.InstrumentationTestCase;
import android.test.mock.MockContentProvider;
import android.test.mock.MockContentResolver;
+import android.test.suitebuilder.annotation.SmallTest;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -28,6 +29,7 @@
/**
* Unit test for {@link NoNullCursorAsyncQueryHandler}
*/
+@SmallTest
public class NoNullCursorAsyncQueryHandlerTest extends InstrumentationTestCase {
private MockContentResolver mMockContentResolver;
diff --git a/tests/src/com/android/contacts/common/format/SpannedTestUtils.java b/tests/src/com/android/contacts/common/format/SpannedTestUtils.java
index 463d7a8..bce7057 100644
--- a/tests/src/com/android/contacts/common/format/SpannedTestUtils.java
+++ b/tests/src/com/android/contacts/common/format/SpannedTestUtils.java
@@ -16,7 +16,6 @@
package com.android.contacts.common.format;
-import android.test.suitebuilder.annotation.SmallTest;
import android.text.Html;
import android.text.SpannableString;
import android.text.Spanned;
@@ -29,7 +28,6 @@
/**
* Utility class to check the value of spanned text in text views.
*/
-@SmallTest
public class SpannedTestUtils {
/**
* Checks that the text contained in the text view matches the given HTML text.
diff --git a/tests/src/com/android/contacts/common/model/RawContactTest.java b/tests/src/com/android/contacts/common/model/RawContactTest.java
index b8e03c3..496a20c 100644
--- a/tests/src/com/android/contacts/common/model/RawContactTest.java
+++ b/tests/src/com/android/contacts/common/model/RawContactTest.java
@@ -20,6 +20,7 @@
import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
+import android.test.suitebuilder.annotation.SmallTest;
import com.android.contacts.common.model.RawContact;
@@ -28,6 +29,7 @@
/**
* Unit test for {@link RawContact}.
*/
+@SmallTest
public class RawContactTest extends TestCase {
private RawContact buildRawContact() {
diff --git a/tests/src/com/android/contacts/common/model/dataitem/DataItemTests.java b/tests/src/com/android/contacts/common/model/dataitem/DataItemTests.java
index ec1a8da..3f83710 100644
--- a/tests/src/com/android/contacts/common/model/dataitem/DataItemTests.java
+++ b/tests/src/com/android/contacts/common/model/dataitem/DataItemTests.java
@@ -31,6 +31,7 @@
import android.provider.ContactsContract.Contacts.Data;
import android.provider.ContactsContract.Contacts.Entity;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
import com.android.contacts.common.Collapser;
import com.android.contacts.common.model.account.AccountType.EditType;
@@ -46,6 +47,7 @@
/**
* Test case for {@link DataItem}.
*/
+@SmallTest
public class DataItemTests extends AndroidTestCase {
private ContentValues mValues1;
diff --git a/tests/src/com/android/contacts/interactions/CallLogInteractionsLoaderTest.java b/tests/src/com/android/contacts/interactions/CallLogInteractionsLoaderTest.java
index 079411f..b51affd 100644
--- a/tests/src/com/android/contacts/interactions/CallLogInteractionsLoaderTest.java
+++ b/tests/src/com/android/contacts/interactions/CallLogInteractionsLoaderTest.java
@@ -3,6 +3,7 @@
import android.content.ContentValues;
import android.provider.CallLog.Calls;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
import java.util.ArrayList;
import java.util.List;
@@ -10,6 +11,7 @@
/**
* Tests {@link CallLogInteractionsLoader}
*/
+@SmallTest
public class CallLogInteractionsLoaderTest extends AndroidTestCase {
public void testCallLogInteractions_pruneDuplicates_containsDuplicates() {
diff --git a/tests/src/com/android/contacts/interactions/ContactInteractionUtilTest.java b/tests/src/com/android/contacts/interactions/ContactInteractionUtilTest.java
index 07ad722..5f95a1b 100644
--- a/tests/src/com/android/contacts/interactions/ContactInteractionUtilTest.java
+++ b/tests/src/com/android/contacts/interactions/ContactInteractionUtilTest.java
@@ -18,6 +18,7 @@
import android.content.res.Configuration;
import android.content.res.Resources;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
import java.util.Calendar;
import java.util.Locale;
@@ -25,6 +26,7 @@
/**
* Tests for utility functions in {@link ContactInteractionUtil}
*/
+@SmallTest
public class ContactInteractionUtilTest extends AndroidTestCase {
private Locale mOriginalLocale;
diff --git a/tests/src/com/android/contacts/widget/CompositeListAdapterTest.java b/tests/src/com/android/contacts/widget/CompositeListAdapterTest.java
index f7dc08e..a46a17c 100644
--- a/tests/src/com/android/contacts/widget/CompositeListAdapterTest.java
+++ b/tests/src/com/android/contacts/widget/CompositeListAdapterTest.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.database.DataSetObserver;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
@@ -32,6 +33,7 @@
/**
* Tests for {@link CompositeListAdapter}.
*/
+@SmallTest
public class CompositeListAdapterTest extends AndroidTestCase {
private final class MockAdapter extends ArrayAdapter<String> {