commit 9189c4c2f05bc3f044f8a9c78339d0bfedb3dd8b
author Akos Ludanyi <ludanyi@google.com> Thu Sep 04 14:08:49 2014 +0200
committer Akos Ludanyi <ludanyi@google.com> Fri Sep 05 10:17:53 2014 +0200
tree 5740386ed30380e62f8672c49aba9d9cb624a338
parent ae62d71d36022a7a62e00abc447c680f6d3ee83f

Fix ProviderTestCase2 broken by ag/519661:

Problem:
1. ProviderTestCase2 passes a null as a ProviderInfo to the ContentProvider
2. mAuthority and mAuthorities will be null during the test
3. ContentProvider.matchesOurAuthorities will throw an NPE.

Fix:
Supply a ProviderInfo with authority.

Example bug:
b/17379295

Change-Id: Ia533313c0994727ef81f337a4e31a57ae7ec3c15

test-runner/src/android/test/ProviderTestCase.java

diff --git a/test-runner/src/android/test/ProviderTestCase.java b/test-runner/src/android/test/ProviderTestCase.java
index 1b323cf..4108f34 100644
--- a/test-runner/src/android/test/ProviderTestCase.java
+++ b/test-runner/src/android/test/ProviderTestCase.java
@@ -67,9 +67,8 @@
                 filenamePrefix);
         mProviderContext = new IsolatedContext(mResolver, targetContextWrapper);
 
-        mProvider = mProviderClass.newInstance();
-        mProvider.attachInfoForTesting(mProviderContext, null);
-        assertNotNull(mProvider);
+        mProvider = ProviderTestCase2.createProviderForTest(
+                mProviderContext, mProviderClass, mProviderAuthority);
         mResolver.addProvider(mProviderAuthority, getProvider());
     }
 
@@ -107,8 +106,7 @@
                 resolver, targetContextWrapper);
         DatabaseUtils.createDbFromSqlStatements(context, databaseName, databaseVersion, sql);
 
-        T provider = providerClass.newInstance();
-        provider.attachInfoForTesting(context, null);
+        T provider = ProviderTestCase2.createProviderForTest(context, providerClass, authority);
         resolver.addProvider(authority, provider);
 
         return resolver;