diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-21 20:41:57 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-21 20:41:57 -0400 |
| commit | 9a75d6d827c7a9810e39d2abf9757862044a0714 (patch) | |
| tree | 805dd8c29b57f61307046378621e827ea7570339 | |
| parent | bf00093267bb0d455e736dd2f1dea7236649c7cd (diff) | |
| parent | 7a4be8b802d09a721ad817d8843ba0fabd137971 (diff) | |
| download | ContactsProvider-9a75d6d827c7a9810e39d2abf9757862044a0714.tar.gz | |
Merge change I63646eb5 into eclair
* changes:
Fixing ContactsProvider2 test breakage.
3 files changed, 30 insertions, 0 deletions
diff --git a/tests/src/com/android/providers/contacts/ContactAggregatorPerformanceTest.java b/tests/src/com/android/providers/contacts/ContactAggregatorPerformanceTest.java index 81d73a29..e4dc629b 100644 --- a/tests/src/com/android/providers/contacts/ContactAggregatorPerformanceTest.java +++ b/tests/src/com/android/providers/contacts/ContactAggregatorPerformanceTest.java @@ -46,6 +46,18 @@ public class ContactAggregatorPerformanceTest extends AndroidTestCase { private static final String TAG = "ContactAggregatorPerformanceTest"; private static final boolean TRACE = false; + @Override + protected void setUp() throws Exception { + super.setUp(); + SynchronousContactsProvider2.resetOpenHelper(); + } + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + SynchronousContactsProvider2.resetOpenHelper(); + } + public void testPerformance() { final Context targetContext = getContext(); MockContentResolver resolver = new MockContentResolver(); diff --git a/tests/src/com/android/providers/contacts/LegacyContactImporterPerformanceTest.java b/tests/src/com/android/providers/contacts/LegacyContactImporterPerformanceTest.java index 41c8aefa..bdfab7a5 100644 --- a/tests/src/com/android/providers/contacts/LegacyContactImporterPerformanceTest.java +++ b/tests/src/com/android/providers/contacts/LegacyContactImporterPerformanceTest.java @@ -47,6 +47,18 @@ public class LegacyContactImporterPerformanceTest extends AndroidTestCase { private static final boolean TRACE = false; + @Override + protected void setUp() throws Exception { + super.setUp(); + SynchronousContactsProvider2.resetOpenHelper(); + } + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + SynchronousContactsProvider2.resetOpenHelper(); + } + public void testPerformance() { final Context targetContext = getContext(); MockContentResolver resolver = new MockContentResolver(); diff --git a/tests/src/com/android/providers/contacts/LegacyContactImporterTest.java b/tests/src/com/android/providers/contacts/LegacyContactImporterTest.java index e12b504e..af15b3d2 100644 --- a/tests/src/com/android/providers/contacts/LegacyContactImporterTest.java +++ b/tests/src/com/android/providers/contacts/LegacyContactImporterTest.java @@ -87,6 +87,12 @@ public class LegacyContactImporterTest extends BaseContactsProvider2Test { addProvider(TestCallLogProvider.class, CallLog.AUTHORITY); } + @Override + protected void tearDown() throws Exception { + super.tearDown(); + SynchronousContactsProvider2.resetOpenHelper(); + } + public void testContactImport() throws Exception { ContactsProvider2 provider = (ContactsProvider2)getProvider(); LegacyContactImporter importer = |