Skip to content

Commit 9b98c12

Browse files
samtsternsamtstern
authored
Merge pull request #365 from SUPERCILEX/fix-tests
Flip incorrect assertEquals statements
2 parents 068899c + 313dd50 commit 9b98c12

File tree

6 files changed

+36
-32
lines changed

6 files changed

+36
-32
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/test_helpers/AutoCompleteTask.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import java.util.concurrent.Executor;
2727

28-
public class AutoCompleteTask<TResult> extends Task {
28+
public class AutoCompleteTask<TResult> extends Task<TResult> {
2929
TResult mResult;
3030
boolean mComplete;
3131
boolean mSuccess;
@@ -49,7 +49,7 @@ public boolean isSuccessful() {
4949
}
5050

5151
@Override
52-
public Object getResult() {
52+
public TResult getResult() {
5353
return mResult;
5454
}
5555

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import com.firebase.ui.auth.ui.ExtraConstants;
3333
import com.firebase.ui.auth.ui.account_link.SaveCredentialsActivity;
3434
import com.firebase.ui.auth.util.PlayServicesHelper;
35+
import com.google.firebase.auth.AuthResult;
3536
import com.google.firebase.auth.FirebaseUser;
3637
import com.google.firebase.auth.UserProfileChangeRequest;
3738

@@ -85,18 +86,19 @@ public void testSignUpButton_validatesFields() {
8586
.findViewById(R.id.password_layout);
8687

8788
assertEquals(
88-
nameLayout.getError().toString(),
89-
registerEmailActivity.getString(R.string.required_field));
89+
registerEmailActivity.getString(R.string.required_field),
90+
nameLayout.getError().toString());
9091
assertEquals(
91-
passwordLayout.getError().toString(),
92-
String.format(registerEmailActivity.getString(R.string.password_length),
93-
registerEmailActivity.getResources().getInteger(
94-
R.integer.min_password_length)));
92+
String.format(
93+
registerEmailActivity.getString(R.string.password_length),
94+
registerEmailActivity.getResources().getInteger(R.integer.min_password_length)
95+
),
96+
passwordLayout.getError().toString());
9597
}
9698

9799
@Test
98100
@Config(shadows = {ActivityHelperShadow.class, FirebaseAuthWrapperImplShadow.class})
99-
public void testSignupButton_successfulRegisterationShouldContinueToSaveCredentials() {
101+
public void testSignUpButton_successfulRegistrationShouldContinueToSaveCredentials() {
100102
TestHelper.initializeApp(RuntimeEnvironment.application);
101103
RegisterEmailActivity registerEmailActivity = createActivity(TestConstants.EMAIL);
102104

@@ -116,7 +118,7 @@ public void testSignupButton_successfulRegisterationShouldContinueToSaveCredenti
116118
TestConstants.EMAIL,
117119
TestConstants.PASSWORD))
118120
.thenReturn(
119-
new AutoCompleteTask<>(
121+
new AutoCompleteTask<AuthResult>(
120122
new FakeAuthResult(mockFirebaseUser),
121123
true,
122124
null));
@@ -132,8 +134,8 @@ public void testSignupButton_successfulRegisterationShouldContinueToSaveCredenti
132134

133135
assertNotNull(nextIntent);
134136
assertEquals(
135-
nextIntent.intent.getComponent().getClassName(),
136-
SaveCredentialsActivity.class.getName());
137+
SaveCredentialsActivity.class.getName(),
138+
nextIntent.intent.getComponent().getClassName());
137139
assertEquals(
138140
TestConstants.EMAIL,
139141
nextIntent.intent.getExtras().getString(ExtraConstants.EXTRA_EMAIL));

‎auth/src/test/java/com/firebase/ui/auth/ui/email/SignInActivityTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import com.firebase.ui.auth.ui.ExtraConstants;
3232
import com.firebase.ui.auth.ui.account_link.SaveCredentialsActivity;
3333
import com.firebase.ui.auth.util.PlayServicesHelper;
34+
import com.google.firebase.auth.AuthResult;
3435
import com.google.firebase.auth.FirebaseUser;
3536

3637
import org.junit.Before;
@@ -108,7 +109,7 @@ public void testSignInButton_signsInAndSavesCredentials() {
108109
when(ActivityHelperShadow.firebaseAuth.signInWithEmailAndPassword(
109110
TestConstants.EMAIL,
110111
TestConstants.PASSWORD)).thenReturn(
111-
new AutoCompleteTask<>(new FakeAuthResult(mockFirebaseUser), true, null));
112+
new AutoCompleteTask<AuthResult>(new FakeAuthResult(mockFirebaseUser), true, null));
112113
when(mockFirebaseUser.getDisplayName()).thenReturn(TestConstants.NAME);
113114
when(mockFirebaseUser.getEmail()).thenReturn(TestConstants.EMAIL);
114115

‎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)