Update Robolectric to 3.2.2

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.superviseduser;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 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;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 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;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.chrome.browser.DisableHistogramsRule;
 import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
 import org.chromium.chrome.browser.superviseduser.SupervisedUserContentProvider.SupervisedUserQueryReply;
 import org.chromium.components.signin.AccountManagerDelegate;
 import org.chromium.components.signin.AccountManagerHelper;
 import org.chromium.components.signin.ChromeSigninController;
 import org.chromium.components.webrestrictions.browser.WebRestrictionsContentProvider.WebRestrictionsResult;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
 
 /**
  * Tests of SupervisedUserContentProvider. This is tested as a simple class, not as a content
  * provider. The content provider aspects are tested with WebRestrictionsContentProviderTest.
  */
 @RunWith(LocalRobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public class SupervisedUserContentProviderUnitTest {
     @Rule
     public DisableHistogramsRule mDisableHistogramsRule = new DisableHistogramsRule();
 
     private SupervisedUserContentProvider mSupervisedUserContentProvider;
 
     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();
 
         // Spy on the content provider so that we can watch its calls. Override methods that wrap
         // things that can't be mocked (including native calls).
         mSupervisedUserContentProvider = Mockito.spy(new SupervisedUserContentProvider() {
             @Override
             void startForcedSigninProcessor(Context context, Runnable onComplete) {
                 ChromeSigninController.get(RuntimeEnvironment.application)
                         .setSignedInAccountName("Dummy");
@@ skipping 106 matching lines @@
                 .nativeRequestInsert(anyLong(),
                         any(SupervisedUserContentProvider.SupervisedUserInsertReply.class),
                         anyString());
         assertThat(mSupervisedUserContentProvider.requestInsert("url"), is(false));
         verify(mSupervisedUserContentProvider)
                 .nativeRequestInsert(eq(1234L),
                         any(SupervisedUserContentProvider.SupervisedUserInsertReply.class),
                         eq("url"));
     }
 
+    @Config(shadows = MyShadowContentProvider.class)
     @Test
     public void testShouldProceed_withStartupSignedIn() throws ProcessInitException {
         // Set up a signed in user
         ChromeSigninController.get(RuntimeEnvironment.application).setSignedInAccountName("Dummy");
         // Mock things called during startup
         ChromeBrowserInitializer mockBrowserInitializer = mock(ChromeBrowserInitializer.class);
         ChromeBrowserInitializer.setForTesting(mockBrowserInitializer);
 
         WebRestrictionsResult result =
                 mSupervisedUserContentProvider.shouldProceed(DEFAULT_CALLING_PACKAGE, "url");
 
         assertThat(result.shouldProceed(), is(true));
         verify(mockBrowserInitializer).handleSynchronousStartup();
         verify(mSupervisedUserContentProvider)
                 .nativeShouldProceed(eq(5678L),
                         any(SupervisedUserContentProvider.SupervisedUserQueryReply.class),
                         eq("url"));
     }
 
+    @Config(shadows = MyShadowContentProvider.class)
     @SuppressWarnings("unchecked")
     @Test
     public void testShouldProceed_notSignedIn() throws ProcessInitException {
         // Mock things called during startup
         ChromeBrowserInitializer mockBrowserInitializer = mock(ChromeBrowserInitializer.class);
         ChromeBrowserInitializer.setForTesting(mockBrowserInitializer);
         AccountManagerDelegate mockDelegate = mock(AccountManagerDelegate.class);
         AccountManagerHelper.overrideAccountManagerHelperForTests(
                 RuntimeEnvironment.application, mockDelegate);
         Account account = new Account("Google", "Dummy");
         when(mockDelegate.getAccountsByType("Google")).thenReturn(new Account[] {account});
 
         WebRestrictionsResult result =
                 mSupervisedUserContentProvider.shouldProceed(DEFAULT_CALLING_PACKAGE, "url");
 
         assertThat(result.shouldProceed(), is(true));
         verify(mockBrowserInitializer).handleSynchronousStartup();
         verify(mSupervisedUserContentProvider)
                 .startForcedSigninProcessor(any(Context.class), any(Runnable.class));
         verify(mSupervisedUserContentProvider)
                 .listenForChildAccountStatusChange(any(Callback.class));
         verify(mSupervisedUserContentProvider)
                 .nativeShouldProceed(eq(5678L),
                         any(SupervisedUserContentProvider.SupervisedUserQueryReply.class),
                         eq("url"));
     }
 
+    @Config(shadows = MyShadowContentProvider.class)
     @Test
     public void testShouldProceed_cannotSignIn() {
         // Mock things called during startup
         ChromeBrowserInitializer mockBrowserInitializer = mock(ChromeBrowserInitializer.class);
         ChromeBrowserInitializer.setForTesting(mockBrowserInitializer);
         AccountManagerDelegate mockDelegate = mock(AccountManagerDelegate.class);
         AccountManagerHelper.overrideAccountManagerHelperForTests(
                 RuntimeEnvironment.application, mockDelegate);
         Account account = new Account("Google", "Dummy");
         when(mockDelegate.getAccountsByType("Google")).thenReturn(new Account[] {account});
@@ skipping 45 matching lines @@
 
         WebRestrictionsResult wrongCallingPackage = mSupervisedUserContentProvider.shouldProceed(
                 DEFAULT_CALLING_PACKAGE, "https://accounts.google.com/reauth");
         assertThat(wrongCallingPackage.shouldProceed(), is(false));
 
         WebRestrictionsResult nullCallingPackage = mSupervisedUserContentProvider.shouldProceed(
                 null, "https://accounts.google.com/reauth");
         assertThat(nullCallingPackage.shouldProceed(), is(false));
     }
 }