firebase · samtstern · May 24, 2018 · May 23, 2018 · May 23, 2018 · May 23, 2018
diff --git a/auth/build.gradle b/auth/build.gradle
@@ -55,7 +55,7 @@ dependencies {
 
     testImplementation 'junit:junit:4.12'
     //noinspection GradleDynamicVersion
-    testImplementation 'org.mockito:mockito-core:2.15.+'
+    testImplementation 'org.mockito:mockito-core:2.18.3'
     testImplementation 'org.robolectric:robolectric:3.7'
     testImplementation 'com.facebook.android:facebook-login:4.32.0'
     testImplementation("com.twitter.sdk.android:twitter-core:3.1.1@aar") { transitive = true }

diff --git a/auth/src/main/java/com/firebase/ui/auth/AuthUI.java b/auth/src/main/java/com/firebase/ui/auth/AuthUI.java
@@ -26,6 +26,7 @@
 import android.support.annotation.RestrictTo;
 import android.support.annotation.StringDef;
 import android.support.annotation.StyleRes;
+import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -90,6 +91,9 @@
  */
 public final class AuthUI {
 
+    @VisibleForTesting
+    protected static FirebaseAuth sDefaultAuth;
+
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     public static final String TAG = "AuthUI";
 
@@ -142,7 +146,13 @@ public final class AuthUI {
 
     private AuthUI(FirebaseApp app) {
         mApp = app;
-        mAuth = FirebaseAuth.getInstance(mApp);
+
+        // TODO: This is a bad testing hack
+        if (sDefaultAuth != null) {
+            mAuth = sDefaultAuth;
+        } else {
+            mAuth = FirebaseAuth.getInstance(mApp);
+        }
 
         try {
             mAuth.setFirebaseUIVersion(BuildConfig.VERSION_NAME);

diff --git a/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java b/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java
@@ -22,6 +22,7 @@
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.auth.EmailAuthProvider;
+import com.google.firebase.auth.FirebaseAuth;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -31,12 +32,14 @@
 import java.util.Arrays;
 
 import static junit.framework.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
 
 @RunWith(RobolectricTestRunner.class)
 public class AuthUITest {
     @Before
     public void setUp() {
         TestHelper.initialize();
+        AuthUI.sDefaultAuth = mock(FirebaseAuth.class);
     }
 
     @Test

diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java
@@ -30,12 +30,10 @@
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.data.ProviderUtils;
 import com.google.android.gms.auth.api.credentials.Credential;
-import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.auth.EmailAuthProvider;
 import com.google.firebase.auth.FacebookAuthProvider;
-import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.GoogleAuthProvider;
 import com.google.firebase.auth.PhoneAuthProvider;
@@ -46,16 +44,11 @@
 import org.robolectric.Shadows;
 import org.robolectric.shadows.ShadowActivity;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 
 import static junit.framework.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
@@ -67,8 +60,7 @@ public class TestHelper {
     public static void initialize() {
         spyContextAndResources();
         AuthUI.setApplicationContext(RuntimeEnvironment.application);
-        FirebaseApp app = initializeApp(RuntimeEnvironment.application);
-        injectMockFirebaseAuth(app);
+        initializeApp(RuntimeEnvironment.application);
         initializeProviders();
     }
 
@@ -94,47 +86,6 @@ private static FirebaseApp initializeApp(Context context) {
         }
     }
 
-    /**
-     * This method finds the map of FirebaseAuth instances and injects of a mock instance associated
-     * with the given FirebaseApp for testing purposes.
-     */
-    private static void injectMockFirebaseAuth(FirebaseApp app) {
-        for (Field field : FirebaseAuth.class.getDeclaredFields()) {
-            field.setAccessible(true);
-
-            Object o;
-            try {
-                o = field.get(null);
-            } catch (IllegalAccessException e) {
-                throw new IllegalStateException(e);
-            } catch (NullPointerException e) {
-                continue;
-            }
-
-            Type genericType = field.getGenericType();
-            if (o instanceof Map && genericType instanceof ParameterizedType) {
-                Type[] parameterTypes = ((ParameterizedType) genericType).getActualTypeArguments();
-                if (parameterTypes.length != 2 || parameterTypes[0] != String.class
-                        || parameterTypes[1] != FirebaseAuth.class) {
-                    continue;
-                }
-
-                //noinspection unchecked
-                Map<String, FirebaseAuth> instances = (Map<String, FirebaseAuth>) o;
-
-                FirebaseAuth.getInstance(app);
-                for (String id : instances.keySet()) {
-                    instances.put(id, mock(FirebaseAuth.class));
-                }
-
-                break;
-            }
-        }
-
-        when(FirebaseAuth.getInstance(app).setFirebaseUIVersion(anyString()))
-                .thenReturn(Tasks.<Void>forResult(null));
-    }
-
     private static void initializeProviders() {
         Context context = RuntimeEnvironment.application;
         when(context.getString(R.string.default_web_client_id)).thenReturn("abc");

diff --git a/constants.gradle b/constants.gradle
@@ -8,12 +8,12 @@ project.ext {
     targetSdk = 27
     minSdk = 14
 
-    coreVersion = '15.0.2'          // firebase-core
-    authVersion = '15.1.0'          // firebase-auth
+    coreVersion = '16.0.0'          // firebase-core
+    authVersion = '16.0.1'          // firebase-auth
     playAuthVersion = '15.0.1'      // play-services-auth
-    rtdbVersion = '15.0.1'          // firebase-database
-    firestoreVersion = '16.0.0'     // firebase-firestore
-    storageVersion = '15.0.2'       // firebase-storage
+    rtdbVersion = '16.0.1'          // firebase-database
+    firestoreVersion = '17.0.1'     // firebase-firestore
+    storageVersion = '16.0.1'       // firebase-storage
 
     supportLibraryVersion = '27.1.1'
     architectureVersion = '1.1.1'