diff --git a/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java b/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java index 719655fd2..6eb45f572 100644 --- a/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java +++ b/auth/src/test/java/com/firebase/ui/auth/AuthUITest.java @@ -25,13 +25,14 @@ import com.firebase.ui.auth.ui.FlowParameters; import com.google.firebase.FirebaseApp; -import java.util.Arrays; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import java.util.Arrays; + import static junit.framework.Assert.assertEquals; @RunWith(CustomRobolectricGradleTestRunner.class) @@ -89,9 +90,9 @@ public void testCreatingStartIntent() { FlowParameters flowParameters = startIntent.getParcelableExtra( ExtraConstants.EXTRA_FLOW_PARAMS); - assertEquals(flowParameters.providerInfo.size(), 2); - assertEquals(flowParameters.appName, mFirebaseApp.getName()); - assertEquals(flowParameters.termsOfServiceUrl, TestConstants.TOS_URL); - assertEquals(flowParameters.themeId, AuthUI.getDefaultTheme()); + assertEquals(2, flowParameters.providerInfo.size()); + assertEquals(mFirebaseApp.getName(), flowParameters.appName); + assertEquals(TestConstants.TOS_URL, flowParameters.termsOfServiceUrl); + assertEquals(AuthUI.getDefaultTheme(), flowParameters.themeId); } } diff --git a/auth/src/test/java/com/firebase/ui/auth/test_helpers/AutoCompleteTask.java b/auth/src/test/java/com/firebase/ui/auth/test_helpers/AutoCompleteTask.java index d5c17380c..87476a365 100644 --- a/auth/src/test/java/com/firebase/ui/auth/test_helpers/AutoCompleteTask.java +++ b/auth/src/test/java/com/firebase/ui/auth/test_helpers/AutoCompleteTask.java @@ -25,7 +25,7 @@ import java.util.concurrent.Executor; -public class AutoCompleteTask extends Task { +public class AutoCompleteTask extends Task { TResult mResult; boolean mComplete; boolean mSuccess; @@ -49,7 +49,7 @@ public boolean isSuccessful() { } @Override - public Object getResult() { + public TResult getResult() { return mResult; } diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java index cf8c3f17f..a5a622400 100644 --- a/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java +++ b/auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java @@ -32,6 +32,7 @@ import com.firebase.ui.auth.ui.ExtraConstants; import com.firebase.ui.auth.ui.account_link.SaveCredentialsActivity; import com.firebase.ui.auth.util.PlayServicesHelper; +import com.google.firebase.auth.AuthResult; import com.google.firebase.auth.FirebaseUser; import com.google.firebase.auth.UserProfileChangeRequest; @@ -85,18 +86,19 @@ public void testSignUpButton_validatesFields() { .findViewById(R.id.password_layout); assertEquals( - nameLayout.getError().toString(), - registerEmailActivity.getString(R.string.required_field)); + registerEmailActivity.getString(R.string.required_field), + nameLayout.getError().toString()); assertEquals( - passwordLayout.getError().toString(), - String.format(registerEmailActivity.getString(R.string.password_length), - registerEmailActivity.getResources().getInteger( - R.integer.min_password_length))); + String.format( + registerEmailActivity.getString(R.string.password_length), + registerEmailActivity.getResources().getInteger(R.integer.min_password_length) + ), + passwordLayout.getError().toString()); } @Test @Config(shadows = {ActivityHelperShadow.class, FirebaseAuthWrapperImplShadow.class}) - public void testSignupButton_successfulRegisterationShouldContinueToSaveCredentials() { + public void testSignUpButton_successfulRegistrationShouldContinueToSaveCredentials() { TestHelper.initializeApp(RuntimeEnvironment.application); RegisterEmailActivity registerEmailActivity = createActivity(TestConstants.EMAIL); @@ -116,7 +118,7 @@ public void testSignupButton_successfulRegisterationShouldContinueToSaveCredenti TestConstants.EMAIL, TestConstants.PASSWORD)) .thenReturn( - new AutoCompleteTask<>( + new AutoCompleteTask( new FakeAuthResult(mockFirebaseUser), true, null)); @@ -132,8 +134,8 @@ public void testSignupButton_successfulRegisterationShouldContinueToSaveCredenti assertNotNull(nextIntent); assertEquals( - nextIntent.intent.getComponent().getClassName(), - SaveCredentialsActivity.class.getName()); + SaveCredentialsActivity.class.getName(), + nextIntent.intent.getComponent().getClassName()); assertEquals( TestConstants.EMAIL, nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_EMAIL)); diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/SignInActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/SignInActivityTest.java index b1e92b6c3..bd3802cd4 100644 --- a/auth/src/test/java/com/firebase/ui/auth/ui/email/SignInActivityTest.java +++ b/auth/src/test/java/com/firebase/ui/auth/ui/email/SignInActivityTest.java @@ -31,6 +31,7 @@ import com.firebase.ui.auth.ui.ExtraConstants; import com.firebase.ui.auth.ui.account_link.SaveCredentialsActivity; import com.firebase.ui.auth.util.PlayServicesHelper; +import com.google.firebase.auth.AuthResult; import com.google.firebase.auth.FirebaseUser; import org.junit.Before; @@ -108,7 +109,7 @@ public void testSignInButton_signsInAndSavesCredentials() { when(ActivityHelperShadow.firebaseAuth.signInWithEmailAndPassword( TestConstants.EMAIL, TestConstants.PASSWORD)).thenReturn( - new AutoCompleteTask<>(new FakeAuthResult(mockFirebaseUser), true, null)); + new AutoCompleteTask(new FakeAuthResult(mockFirebaseUser), true, null)); when(mockFirebaseUser.getDisplayName()).thenReturn(TestConstants.NAME); when(mockFirebaseUser.getEmail()).thenReturn(TestConstants.EMAIL); diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/email/SignInNoPasswordActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/email/SignInNoPasswordActivityTest.java index e3fbd340c..7681dc0f3 100644 --- a/auth/src/test/java/com/firebase/ui/auth/ui/email/SignInNoPasswordActivityTest.java +++ b/auth/src/test/java/com/firebase/ui/auth/ui/email/SignInNoPasswordActivityTest.java @@ -76,8 +76,8 @@ public void testNextButton_withInvalidEmailAddress() { .findViewById(R.id.input_layout_email); assertEquals( - emailLayout.getError().toString(), - noPasswordActivity.getString(R.string.invalid_email_address)); + noPasswordActivity.getString(R.string.invalid_email_address), + emailLayout.getError().toString()); } private SignInNoPasswordActivity createActivity(String email) { @@ -136,8 +136,8 @@ public void testNextButton_withExistingPasswordAccount() { ShadowActivity.IntentForResult nextIntent = shadowActivity.getNextStartedActivityForResult(); assertEquals( - nextIntent.intent.getComponent().getClassName(), - SignInActivity.class.getName()); + SignInActivity.class.getName(), + nextIntent.intent.getComponent().getClassName()); assertEquals( TestConstants.EMAIL, nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_EMAIL)); diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java index 287572380..185e67106 100644 --- a/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java +++ b/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java @@ -214,23 +214,23 @@ private static void verifySaveCredentialIntent( SaveCredentialsActivity.class.getName(), nextIntent.intent.getComponent().getClassName()); assertEquals( - nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_EMAIL), - TestConstants.EMAIL); + TestConstants.EMAIL, + nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_EMAIL)); assertEquals( - nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_NAME), - TestConstants.NAME); + TestConstants.NAME, + nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_NAME)); assertEquals( - nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_PROFILE_PICTURE_URI), - TestConstants.PHOTO_URL); + TestConstants.PHOTO_URL, + nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_PROFILE_PICTURE_URI)); assertEquals( + provider, ((IdpResponse) nextIntent .intent .getExtras() - .getParcelable(ExtraConstants.EXTRA_IDP_RESPONSE)).getProviderType(), - provider); + .getParcelable(ExtraConstants.EXTRA_IDP_RESPONSE)).getProviderType()); assertEquals( - nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_PASSWORD), - null); + null, + nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_PASSWORD)); } private AuthMethodPickerActivity createActivity(List providers) {