Fix tests

Author: Aaron Mandle

auth/src/main/java/com/firebase/ui/auth/AuthUI.java

@@ -26,6 +26,7 @@
 import android.support.annotation.VisibleForTesting;
 import com.facebook.FacebookSdk;
 import com.facebook.login.LoginManager;
+import com.firebase.ui.auth.provider.TwitterProvider;
 import com.firebase.ui.auth.ui.ChooseAccountActivity;
 import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.idp.AuthMethodPickerActivity;
@@ -42,8 +43,12 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
+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.TwitterAuthProvider;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -229,22 +234,22 @@ public class AuthUI {
      * Provider identifier for email and password credentials, for use with
      * {@link SignInIntentBuilder#setProviders}.
      */
-    public static final String EMAIL_PROVIDER = "email";
+    public static final String EMAIL_PROVIDER = EmailAuthProvider.PROVIDER_ID;
 
     /**
      * Provider identifier for Google, for use with {@link SignInIntentBuilder#setProviders}.
      */
-    public static final String GOOGLE_PROVIDER = "google";
+    public static final String GOOGLE_PROVIDER = GoogleAuthProvider.PROVIDER_ID;
 
     /**
      * Provider identifier for Facebook, for use with {@link SignInIntentBuilder#setProviders}.
      */
-    public static final String FACEBOOK_PROVIDER = "facebook";
+    public static final String FACEBOOK_PROVIDER = FacebookAuthProvider.PROVIDER_ID;
 
     /**
      * Provider identifier for Twitter, for use with {@link SignInIntentBuilder#setProviders}.
      */
-    public static final String TWITTER_PROVIDER = "twitter";
+    public static final String TWITTER_PROVIDER = TwitterAuthProvider.PROVIDER_ID;
 
     /**
      * Default value for logo resource, omits the logo from the
@@ -464,7 +469,7 @@ public void writeToParcel(Parcel parcel, int i) {
 
         public static class Builder {
             private String mProviderId;
-            private List<String> mScopes;
+            private List<String> mScopes = new ArrayList<>();
 
 
             /**
@@ -561,12 +566,14 @@ public SignInIntentBuilder setTosUrl(@Nullable String tosUrl) {
          * @see IdpConfig
          */
         public SignInIntentBuilder setProviders(@NonNull List<IdpConfig> idpConfigs) {
+            mProviders.clear();
             Set<String> configuredProviders = new HashSet<>();
             for (IdpConfig idpConfig : idpConfigs) {
                 if (configuredProviders.contains(idpConfig.getProviderId())) {
                     throw new IllegalArgumentException("Each provider can only be set once. "
                             + idpConfig.getProviderId() + " was set twice.");
                 }
+                configuredProviders.add(idpConfig.getProviderId());
                 mProviders.add(idpConfig);
             }
             return this;

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

@@ -52,7 +52,11 @@ public class GoogleProvider implements
     private Activity mActivity;
     private IDPCallback mIDPCallback;
 
-    public GoogleProvider(FragmentActivity activity, @Nullable String email, IdpConfig idpConfig) {
+    public GoogleProvider(FragmentActivity activity, IdpConfig idpConfig) {
+        this(activity, idpConfig, null);
+    }
+
+    public GoogleProvider(FragmentActivity activity, IdpConfig idpConfig, @Nullable String email) {
         mActivity = activity;
         String mClientId = activity.getString(R.string.default_web_client_id);
         GoogleSignInOptions googleSignInOptions;

auth/src/main/java/com/firebase/ui/auth/ui/account_link/WelcomeBackIDPPrompt.java

@@ -69,7 +69,7 @@ protected void onCreate(Bundle savedInstanceState) {
             if (mProviderId.equals(idpConfig.getProviderId())) {
                 switch (mProviderId) {
                     case GoogleAuthProvider.PROVIDER_ID:
-                        mIdpProvider = new GoogleProvider(this, getEmailFromIntent(), idpConfig);
+                        mIdpProvider = new GoogleProvider(this, idpConfig, getEmailFromIntent());
                         break;
                     case FacebookAuthProvider.PROVIDER_ID:
                         mIdpProvider = new FacebookProvider(this, idpConfig);

auth/src/main/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivity.java

@@ -91,7 +91,7 @@ private void populateIdpList(List<IdpConfig> providers) {
                     mIdpProviders.add(new FacebookProvider(this, idpConfig));
                     break;
                 case AuthUI.GOOGLE_PROVIDER:
-                    mIdpProviders.add(new GoogleProvider(this, null, idpConfig));
+                    mIdpProviders.add(new GoogleProvider(this, idpConfig));
                     break;
                 case AuthUI.EMAIL_PROVIDER:
                     findViewById(R.id.email_provider).setVisibility(View.VISIBLE);

auth/src/main/java/com/firebase/ui/auth/ui/idp/IDPSignInContainerActivity.java

@@ -62,7 +62,7 @@ protected void onCreate(Bundle savedInstanceState) {
         if (mProvider.equalsIgnoreCase(FacebookAuthProvider.PROVIDER_ID)) {
             mIDPProvider = new FacebookProvider(this, providerConfig);
         } else if (mProvider.equalsIgnoreCase(GoogleAuthProvider.PROVIDER_ID)) {
-            mIDPProvider = new GoogleProvider(this, mEmail, providerConfig);
+            mIDPProvider = new GoogleProvider(this, providerConfig, mEmail);
         }
         mIDPProvider.setAuthenticationCallback(this);
         mIDPProvider.startLogin(this);