Update Robolectric to 3.2.2

chrome/android/junit/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProviderUnitTest.java

Index: chrome/android/junit/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProviderUnitTest.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProviderUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProviderUnitTest.java
index bab8d55ffe0f81b183533584d87a44ef668acc19..df30f67f2f08eabc26effa24826316cb3fb0b2fd 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProviderUnitTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProviderUnitTest.java
@@ -16,6 +16,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.accounts.Account;
+import android.content.ContentProvider;
 import android.content.Context;
 
 import org.junit.After;
@@ -28,6 +29,9 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.shadows.ShadowContentProvider;
 
 import org.chromium.base.Callback;
 import org.chromium.base.ContextUtils;
@@ -55,8 +59,21 @@ public class SupervisedUserContentProviderUnitTest {
 
     private static final String DEFAULT_CALLING_PACKAGE = "com.example.some.app";
 
+    /**
+     * Robolectric ShadowContentProvider that implements getContext.
+     */
+    @Implements(ContentProvider.class)
+    public static class MyShadowContentProvider extends ShadowContentProvider {

[nyquist, 2017/03/14 21:20:37]

It seems like we are calling getContext() a few places in
//chrome/android/java/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProvider.java
:

- getContext().getApplicationContext()
- getContext().getSystemService(...)
- getContext().getPackageName()
- getContext().registerReceiver(...);
 
Do you know which one of those do not work with the context that's usually
retrieved?

Unsure how much time you want to spend on that, but maybe you could create a
class that wraps the RuntimeEnvironment.application?
 You can use this class and pass in RuntimeEnvironment.application to the
constructor:
https://developer.android.com/reference/android/content/ContextWrapper.html

At that point you can override the methods you are interested in, and see
if/when the test doesn't work based on what you return?

[mikecase (-- gone --), 2017/03/14 22:07:07]

So for some info, in this commit they removed getContext() from the default
ShadowContentProvider...

https://github.com/robolectric/robolectric/commit/80d495d66e5207dd0c35bc06799...



Without the custom ShadowContentProvider, I think that getContext() just returns
null.
Here is the error using the default ShadowContentProvider...


java.lang.NullPointerException
	at
org.chromium.chrome.browser.superviseduser.SupervisedUserContentProvider.getSupervisedUserContentProvider(SupervisedUserContentProvider.java:72)
	at
org.chromium.chrome.browser.superviseduser.SupervisedUserContentProvider.shouldProceed(SupervisedUserContentProvider.java:177)
	at
org.chromium.chrome.browser.superviseduser.SupervisedUserContentProviderUnitTest.testShouldProceed_withStartupSignedIn(SupervisedUserContentProviderUnitTest.java:213)

[nyquist, 2017/03/14 22:17:30]

Right; but it seems like they are attaching the context through ProviderInfo
here:
https://github.com/robolectric/robolectric/commit/c3bbc6fc4176581fb1ac2ee28de...
(That commit was linked to from the other commit)

So could there be that there is something we need to do to ensure that content
providers are correctly set up using robolectric?

For example maybe we need to register our content provider?

ProviderInfo info = new ProviderInfo();
info.authority = "INSERT_OUR_MANIFEST_PACKAGE_HERE.SupervisedUserProvider";
Robolectric.buildContentProvider(SupervisedUserContentProvider.class).create(info);

+        @Implementation
+        public final Context getContext() {
+            return RuntimeEnvironment.application;
+        }
+    }
+
     @Before
     public void setUp() {
+        ContextUtils.initApplicationContextForTests(RuntimeEnvironment.application);
+
         // Ensure clean state (in particular not signed in).
         ContextUtils.getAppSharedPreferences().edit().clear().apply();
 
@@ -183,6 +200,7 @@ public class SupervisedUserContentProviderUnitTest {
                         eq("url"));
     }
 
+    @Config(shadows = MyShadowContentProvider.class)
     @Test
     public void testShouldProceed_withStartupSignedIn() throws ProcessInitException {
         // Set up a signed in user
@@ -202,6 +220,7 @@ public class SupervisedUserContentProviderUnitTest {
                         eq("url"));
     }
 
+    @Config(shadows = MyShadowContentProvider.class)
     @SuppressWarnings("unchecked")
     @Test
     public void testShouldProceed_notSignedIn() throws ProcessInitException {
@@ -229,6 +248,7 @@ public class SupervisedUserContentProviderUnitTest {
                         eq("url"));
     }
 
+    @Config(shadows = MyShadowContentProvider.class)
     @Test
     public void testShouldProceed_cannotSignIn() {
         // Mock things called during startup