Skip to content

Commit 94ec596

Browse files
committed
Flip incorrect assertEquals statements
1 parent 068899c commit 94ec596

File tree

4 files changed

+29
-27
lines changed

4 files changed

+29
-27
lines changed

auth/src/test/java/com/firebase/ui/auth/AuthUITest.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@
2525
import com.firebase.ui.auth.ui.FlowParameters;
2626
import com.google.firebase.FirebaseApp;
2727

28-
import java.util.Arrays;
2928
import org.junit.Before;
3029
import org.junit.Test;
3130
import org.junit.runner.RunWith;
3231
import org.robolectric.RuntimeEnvironment;
3332
import org.robolectric.annotation.Config;
3433

34+
import java.util.Arrays;
35+
3536
import static junit.framework.Assert.assertEquals;
3637

3738
@RunWith(CustomRobolectricGradleTestRunner.class)
@@ -89,9 +90,9 @@ public void testCreatingStartIntent() {
8990
FlowParameters flowParameters = startIntent.getParcelableExtra(
9091
ExtraConstants.EXTRA_FLOW_PARAMS);
9192

92-
assertEquals(flowParameters.providerInfo.size(), 2);
93-
assertEquals(flowParameters.appName, mFirebaseApp.getName());
94-
assertEquals(flowParameters.termsOfServiceUrl, TestConstants.TOS_URL);
95-
assertEquals(flowParameters.themeId, AuthUI.getDefaultTheme());
93+
assertEquals(2, flowParameters.providerInfo.size());
94+
assertEquals(mFirebaseApp.getName(), flowParameters.appName);
95+
assertEquals(TestConstants.TOS_URL, flowParameters.termsOfServiceUrl);
96+
assertEquals(AuthUI.getDefaultTheme(), flowParameters.themeId);
9697
}
9798
}

auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,14 @@ public void testSignUpButton_validatesFields() {
8585
.findViewById(R.id.password_layout);
8686

8787
assertEquals(
88-
nameLayout.getError().toString(),
89-
registerEmailActivity.getString(R.string.required_field));
88+
registerEmailActivity.getString(R.string.required_field),
89+
nameLayout.getError().toString());
9090
assertEquals(
91-
passwordLayout.getError().toString(),
92-
String.format(registerEmailActivity.getString(R.string.password_length),
93-
registerEmailActivity.getResources().getInteger(
94-
R.integer.min_password_length)));
91+
String.format(
92+
registerEmailActivity.getString(R.string.password_length),
93+
registerEmailActivity.getResources().getInteger(R.integer.min_password_length)
94+
),
95+
passwordLayout.getError().toString());
9596
}
9697

9798
@Test
@@ -132,8 +133,8 @@ public void testSignupButton_successfulRegisterationShouldContinueToSaveCredenti
132133

133134
assertNotNull(nextIntent);
134135
assertEquals(
135-
nextIntent.intent.getComponent().getClassName(),
136-
SaveCredentialsActivity.class.getName());
136+
SaveCredentialsActivity.class.getName(),
137+
nextIntent.intent.getComponent().getClassName());
137138
assertEquals(
138139
TestConstants.EMAIL,
139140
nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_EMAIL));

auth/src/test/java/com/firebase/ui/auth/ui/email/SignInNoPasswordActivityTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ public void testNextButton_withInvalidEmailAddress() {
7676
.findViewById(R.id.input_layout_email);
7777

7878
assertEquals(
79-
emailLayout.getError().toString(),
80-
noPasswordActivity.getString(R.string.invalid_email_address));
79+
noPasswordActivity.getString(R.string.invalid_email_address),
80+
emailLayout.getError().toString());
8181
}
8282

8383
private SignInNoPasswordActivity createActivity(String email) {
@@ -136,8 +136,8 @@ public void testNextButton_withExistingPasswordAccount() {
136136
ShadowActivity.IntentForResult nextIntent =
137137
shadowActivity.getNextStartedActivityForResult();
138138
assertEquals(
139-
nextIntent.intent.getComponent().getClassName(),
140-
SignInActivity.class.getName());
139+
SignInActivity.class.getName(),
140+
nextIntent.intent.getComponent().getClassName());
141141
assertEquals(
142142
TestConstants.EMAIL,
143143
nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_EMAIL));

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -214,23 +214,23 @@ private static void verifySaveCredentialIntent(
214214
SaveCredentialsActivity.class.getName(),
215215
nextIntent.intent.getComponent().getClassName());
216216
assertEquals(
217-
nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_EMAIL),
218-
TestConstants.EMAIL);
217+
TestConstants.EMAIL,
218+
nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_EMAIL));
219219
assertEquals(
220-
nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_NAME),
221-
TestConstants.NAME);
220+
TestConstants.NAME,
221+
nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_NAME));
222222
assertEquals(
223-
nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_PROFILE_PICTURE_URI),
224-
TestConstants.PHOTO_URL);
223+
TestConstants.PHOTO_URL,
224+
nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_PROFILE_PICTURE_URI));
225225
assertEquals(
226+
provider,
226227
((IdpResponse) nextIntent
227228
.intent
228229
.getExtras()
229-
.getParcelable(ExtraConstants.EXTRA_IDP_RESPONSE)).getProviderType(),
230-
provider);
230+
.getParcelable(ExtraConstants.EXTRA_IDP_RESPONSE)).getProviderType());
231231
assertEquals(
232-
nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_PASSWORD),
233-
null);
232+
null,
233+
nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_PASSWORD));
234234
}
235235

236236
private AuthMethodPickerActivity createActivity(List<String> providers) {

0 commit comments

Comments
 (0)