Fix broken test

Change-Id: Idb54fa4936e6c8af5db8f21e9d1c2ae0d9996729

Author: samtstern

auth/src/main/java/com/firebase/ui/auth/provider/GoogleProvider.java

@@ -62,8 +62,8 @@ public GoogleProvider(FragmentActivity activity, IDPProviderParcel parcel, @Null
                 .requestIdToken(mClientId);
 
         // Add additional scopes
-        String[] scopeStrings = activity.getResources().getStringArray(R.array.google_permissions);
-        for (String scopeString : scopeStrings) {
+        String[] extraScopes = getExtraScopes();
+        for (String scopeString : extraScopes) {
             builder.requestScopes(new Scope(scopeString));
         }
 
@@ -154,5 +154,9 @@ public void onClick(View view) {
     public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
         Log.w(TAG, "onConnectionFailed:" + connectionResult);
     }
+
+    private String[] getExtraScopes() {
+        return mActivity.getResources().getStringArray(R.array.google_permissions);
+    }
 }
 

auth/src/test/java/com/firebase/ui/auth/test_helpers/GoogleProviderShadow.java

@@ -14,12 +14,8 @@
 
 package com.firebase.ui.auth.test_helpers;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 import android.app.Activity;
 import android.os.Bundle;
-import android.util.Log;
 
 import com.firebase.ui.auth.provider.GoogleProvider;
 import com.firebase.ui.auth.provider.IDPProvider;
@@ -30,6 +26,9 @@
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 
 @Implements(GoogleProvider.class)
 public class GoogleProviderShadow {
@@ -54,7 +53,7 @@ public GoogleProviderShadow() {
     public void __constructor__(Activity activity, IDPProviderParcel parcel, String email) {}
 
 
-        @Implementation
+    @Implementation
     public void setAuthenticationCallback(IDPProvider.IDPCallback idpCallback) {
         mCallback = idpCallback;
     }
@@ -63,4 +62,9 @@ public void setAuthenticationCallback(IDPProvider.IDPCallback idpCallback) {
     public void startLogin(Activity activity) {
         mCallback.onSuccess(mMockIdpResponse);
     }
+
+    @Implementation
+    public String[] getExtraScopes() {
+        return new String[]{};
+    }
 }

auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java

@@ -81,6 +81,7 @@ public void testAllProvidersArePopulated() {
 
         AuthMethodPickerActivity authMethodPickerActivity =
                 createActivity(providers);
+
         assertEquals(providers.size(),
                 ((LinearLayout) authMethodPickerActivity.findViewById(R.id.btn_holder))
                         .getChildCount());