Fixing ContactsProvider2 test breakage.
Fixing test breakage that manifests intermittently depending on the order
in which the tests are executed.
This does not affect the code that gets deployed on the device - only
tests are affected.
Bug: http://b/2191249
Change-Id: I63646eb599dae24704c343203007c548cd6bd38b
diff --git a/tests/src/com/android/providers/contacts/ContactAggregatorPerformanceTest.java b/tests/src/com/android/providers/contacts/ContactAggregatorPerformanceTest.java
index 81d73a2..e4dc629 100644
--- a/tests/src/com/android/providers/contacts/ContactAggregatorPerformanceTest.java
+++ b/tests/src/com/android/providers/contacts/ContactAggregatorPerformanceTest.java
@@ -46,6 +46,18 @@
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 41c8aef..bdfab7a 100644
--- a/tests/src/com/android/providers/contacts/LegacyContactImporterPerformanceTest.java
+++ b/tests/src/com/android/providers/contacts/LegacyContactImporterPerformanceTest.java
@@ -47,6 +47,18 @@
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 e12b504..af15b3d 100644
--- a/tests/src/com/android/providers/contacts/LegacyContactImporterTest.java
+++ b/tests/src/com/android/providers/contacts/LegacyContactImporterTest.java
@@ -87,6 +87,12 @@
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 =
