Merge "Account refactoring follow-up"
diff --git a/tests/src/com/android/providers/contacts/PhotoLoadingTestCase.java b/tests/src/com/android/providers/contacts/PhotoLoadingTestCase.java
index 285378c..459fec0 100644
--- a/tests/src/com/android/providers/contacts/PhotoLoadingTestCase.java
+++ b/tests/src/com/android/providers/contacts/PhotoLoadingTestCase.java
@@ -20,6 +20,7 @@
import android.content.res.Resources;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -29,6 +30,7 @@
/**
* Adds support for loading photo files easily from test resources.
*/
+@SmallTest
public class PhotoLoadingTestCase extends AndroidTestCase {
private Map<Integer, PhotoEntry> photoResourceCache = Maps.newHashMap();
diff --git a/tests/src/com/android/providers/contacts/PhotoStoreTest.java b/tests/src/com/android/providers/contacts/PhotoStoreTest.java
index 9b7c50d..601ccf5 100644
--- a/tests/src/com/android/providers/contacts/PhotoStoreTest.java
+++ b/tests/src/com/android/providers/contacts/PhotoStoreTest.java
@@ -23,7 +23,6 @@
import android.database.sqlite.SQLiteDatabase;
import android.provider.ContactsContract;
import android.provider.ContactsContract.PhotoFiles;
-import android.test.mock.MockContentResolver;
import android.test.suitebuilder.annotation.LargeTest;
import java.io.File;
diff --git a/tests/src/com/android/providers/contacts/VoicemailCleanupServiceTest.java b/tests/src/com/android/providers/contacts/VoicemailCleanupServiceTest.java
index a2f4617..f8d76ee 100644
--- a/tests/src/com/android/providers/contacts/VoicemailCleanupServiceTest.java
+++ b/tests/src/com/android/providers/contacts/VoicemailCleanupServiceTest.java
@@ -23,10 +23,12 @@
import android.provider.VoicemailContract;
import android.provider.VoicemailContract.Status;
import android.provider.VoicemailContract.Voicemails;
+import android.test.suitebuilder.annotation.SmallTest;
/**
* Unit tests for {@link VoicemailCleanupService}.
*/
+@SmallTest
public class VoicemailCleanupServiceTest extends BaseVoicemailProviderTest {
private static final String TEST_PACKAGE_1 = "package1";
private static final String TEST_PACKAGE_2 = "package2";
diff --git a/tests/src/com/android/providers/contacts/VoicemailProviderTest.java b/tests/src/com/android/providers/contacts/VoicemailProviderTest.java
index a1560dd..74195b5 100644
--- a/tests/src/com/android/providers/contacts/VoicemailProviderTest.java
+++ b/tests/src/com/android/providers/contacts/VoicemailProviderTest.java
@@ -28,6 +28,7 @@
import android.provider.VoicemailContract.Status;
import android.provider.VoicemailContract.Voicemails;
import android.test.MoreAsserts;
+import android.test.suitebuilder.annotation.SmallTest;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -45,6 +46,7 @@
* </code>
*/
// TODO: Test that calltype and voicemail_uri are auto populated by the provider.
+@SmallTest
public class VoicemailProviderTest extends BaseVoicemailProviderTest {
/** Fields specific to call_log provider that should not be exposed by voicemail provider. */
private static final String[] CALLLOG_PROVIDER_SPECIFIC_COLUMNS = {