Make unit tests not crash

Workaround for "Cursor window allocation of 2048 kb failed" during
ContactAggregatorTest.

This should be some kind of OOM because if I run only ContactAggregatorTest
it passes without a crash.

Couldn't figure out the root cause.  Instead of spending too much time on it,
decided to mark move all large tests except for ContactsProvider2Test to
medium.

Also did some cleanup for SynchronousContactsProvider2 and
SynchronousProfileProvider.

Bug 6249848

Change-Id: I51d80db1e4025ff20642bc3abf8074f882da47d8

7 files changed, 18 insertions, 27 deletions

diff --git a/tests/src/com/android/providers/contacts/ContactLookupKeyTest.java b/tests/src/com/android/providers/contacts/ContactLookupKeyTest.java
index 225b00c..739b2cb 100644
--- a/tests/src/com/android/providers/contacts/ContactLookupKeyTest.java
+++ b/tests/src/com/android/providers/contacts/ContactLookupKeyTest.java
@@ -23,7 +23,7 @@ import android.net.Uri;
 import android.provider.ContactsContract.AggregationExceptions;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.RawContacts;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.test.suitebuilder.annotation.MediumTest;
 
 import java.util.ArrayList;
 
@@ -36,7 +36,7 @@ import java.util.ArrayList;
  *         com.android.providers.contacts.tests/android.test.InstrumentationTestRunner
  * </code>
  */
-@LargeTest
+@MediumTest
 public class ContactLookupKeyTest extends BaseContactsProvider2Test {
 
     public void testLookupKeyUsingDisplayNameAndNoAccount() {
diff --git a/tests/src/com/android/providers/contacts/DirectoryTest.java b/tests/src/com/android/providers/contacts/DirectoryTest.java
index 373b3da..e9592c1 100644
--- a/tests/src/com/android/providers/contacts/DirectoryTest.java
+++ b/tests/src/com/android/providers/contacts/DirectoryTest.java
@@ -26,7 +26,7 @@ import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.Directory;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.test.suitebuilder.annotation.MediumTest;;
 
 
 /**
@@ -38,7 +38,7 @@ import android.test.suitebuilder.annotation.LargeTest;
  *         com.android.providers.contacts.tests/android.test.InstrumentationTestRunner
  * </code>
  */
-@LargeTest
+@MediumTest
 public class DirectoryTest extends BaseContactsProvider2Test {
 
     public void testDefaultDirectory() {
diff --git a/tests/src/com/android/providers/contacts/GlobalSearchSupportTest.java b/tests/src/com/android/providers/contacts/GlobalSearchSupportTest.java
index 9bfe9d6..3c95c11 100644
--- a/tests/src/com/android/providers/contacts/GlobalSearchSupportTest.java
+++ b/tests/src/com/android/providers/contacts/GlobalSearchSupportTest.java
@@ -27,7 +27,7 @@ import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.Intents;
 import android.provider.ContactsContract.StatusUpdates;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.test.suitebuilder.annotation.MediumTest;
 
 /**
  * Unit tests for {@link GlobalSearchSupport}.
@@ -39,7 +39,7 @@ import android.test.suitebuilder.annotation.LargeTest;
  *         com.android.providers.contacts.tests/android.test.InstrumentationTestRunner
  * </pre></code>
  */
-@LargeTest
+@MediumTest
 public class GlobalSearchSupportTest extends BaseContactsProvider2Test {
 
     public void testSearchSuggestionsNotInDefaultDirectory() throws Exception {
diff --git a/tests/src/com/android/providers/contacts/PhotoStoreTest.java b/tests/src/com/android/providers/contacts/PhotoStoreTest.java
index 02b3568..6946aae 100644
--- a/tests/src/com/android/providers/contacts/PhotoStoreTest.java
+++ b/tests/src/com/android/providers/contacts/PhotoStoreTest.java
@@ -24,7 +24,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.PhotoFiles;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.test.suitebuilder.annotation.MediumTest;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -39,7 +39,7 @@ import static com.android.providers.contacts.ContactsActor.PACKAGE_GREY;
 /**
  * Tests for {@link PhotoStore}.
  */
-@LargeTest
+@MediumTest
 public class PhotoStoreTest extends PhotoLoadingTestCase {
 
     private ContactsActor mActor;
diff --git a/tests/src/com/android/providers/contacts/SynchronousContactsProvider2.java b/tests/src/com/android/providers/contacts/SynchronousContactsProvider2.java
index 5dc5cdf..c85fded 100644
--- a/tests/src/com/android/providers/contacts/SynchronousContactsProvider2.java
+++ b/tests/src/com/android/providers/contacts/SynchronousContactsProvider2.java
@@ -30,7 +30,7 @@ public class SynchronousContactsProvider2 extends ContactsProvider2 {
     public static final String READ_ONLY_ACCOUNT_TYPE = "ro";
 
     private static Boolean sDataWiped = false;
-    private static ContactsDatabaseHelper mDbHelper;
+    private static ContactsDatabaseHelper sDbHelper;
     private boolean mDataWipeEnabled = true;
     private Account mAccount;
     private boolean mNetworkNotified;
@@ -39,10 +39,10 @@ public class SynchronousContactsProvider2 extends ContactsProvider2 {
 
     @Override
     protected ContactsDatabaseHelper getDatabaseHelper(final Context context) {
-        if (mDbHelper == null) {
-            mDbHelper = ContactsDatabaseHelper.getNewInstanceForTest(context);
+        if (sDbHelper == null) {
+            sDbHelper = ContactsDatabaseHelper.getNewInstanceForTest(context);
         }
-        return mDbHelper;
+        return sDbHelper;
     }
 
     @Override
@@ -50,11 +50,6 @@ public class SynchronousContactsProvider2 extends ContactsProvider2 {
         return new SynchronousProfileProvider(this);
     }
 
-    public static void resetOpenHelper() {
-        mDbHelper = null;
-        SynchronousProfileProvider.resetOpenHelper();
-    }
-
     public void setDataWipeEnabled(boolean flag) {
         mDataWipeEnabled = flag;
     }
diff --git a/tests/src/com/android/providers/contacts/SynchronousProfileProvider.java b/tests/src/com/android/providers/contacts/SynchronousProfileProvider.java
index bde6dc9..93ad70f 100644
--- a/tests/src/com/android/providers/contacts/SynchronousProfileProvider.java
+++ b/tests/src/com/android/providers/contacts/SynchronousProfileProvider.java
@@ -26,7 +26,7 @@ import java.util.Locale;
  */
 public class SynchronousProfileProvider extends ProfileProvider {
 
-    private static ProfileDatabaseHelper mDbHelper;
+    private static ProfileDatabaseHelper sDbHelper;
 
     public SynchronousProfileProvider(ContactsProvider2 delegate) {
         super(delegate);
@@ -34,14 +34,10 @@ public class SynchronousProfileProvider extends ProfileProvider {
 
     @Override
     protected ProfileDatabaseHelper getDatabaseHelper(final Context context) {
-        if (mDbHelper == null) {
-            mDbHelper = ProfileDatabaseHelper.getNewInstanceForTest(context);
+        if (sDbHelper == null) {
+            sDbHelper = ProfileDatabaseHelper.getNewInstanceForTest(context);
         }
-        return mDbHelper;
-    }
-
-    public static void resetOpenHelper() {
-        mDbHelper = null;
+        return sDbHelper;
     }
 
     @Override
diff --git a/tests/src/com/android/providers/contacts/aggregation/ContactAggregatorTest.java b/tests/src/com/android/providers/contacts/aggregation/ContactAggregatorTest.java
index d2f3a60..ac40bda 100644
--- a/tests/src/com/android/providers/contacts/aggregation/ContactAggregatorTest.java
+++ b/tests/src/com/android/providers/contacts/aggregation/ContactAggregatorTest.java
@@ -38,7 +38,7 @@ import android.provider.ContactsContract.Contacts.AggregationSuggestions;
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.RawContacts;
 import android.provider.ContactsContract.StatusUpdates;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.test.suitebuilder.annotation.MediumTest;
 
 /**
  * Unit tests for {@link ContactAggregator}.
@@ -49,7 +49,7 @@ import android.test.suitebuilder.annotation.LargeTest;
  *         com.android.providers.contacts.tests/android.test.InstrumentationTestRunner
  * </code>
  */
-@LargeTest
+@MediumTest
 public class ContactAggregatorTest extends BaseContactsProvider2Test {
 
     private static final Account ACCOUNT_1 = new Account("account_name_1", "account_type_1");