Skip to content

Commit e07bb4c

Browse files
LyokoneLyokone
committed
remove Theme
1 parent 5f81dc0 commit e07bb4c

File tree

3 files changed

+38
-53
lines changed

3 files changed

+38
-53
lines changed

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

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import org.junit.runner.RunWith;
3737
import org.robolectric.Robolectric;
3838
import org.robolectric.RobolectricTestRunner;
39+
import org.robolectric.android.controller.ActivityController;
3940
import org.robolectric.Shadows;
4041
import org.robolectric.annotation.LooperMode;
4142
import org.robolectric.shadows.ShadowActivity;
@@ -77,7 +78,8 @@ public void testOnCreate_emailLinkNormalFlow_expectCheckEmailFlowStarted() {
7778
public void testOnCreate_emailLinkLinkingFlow_expectSendEmailLinkFlowStarted() {
7879
// This is normally done by EmailLinkSendEmailHandler, saving the IdpResponse is done
7980
// in EmailActivity but it will not be saved if we haven't previously set the email
80-
EmailLinkPersistenceManager.getInstance().saveEmail(ApplicationProvider.getApplicationContext(),
81+
EmailLinkPersistenceManager.getInstance().saveEmail(
82+
ApplicationProvider.getApplicationContext(),
8183
EMAIL, TestConstants.SESSION_ID, TestConstants.UID);
8284

8385
EmailActivity emailActivity = createActivity(AuthUI.EMAIL_LINK_PROVIDER, true, false);
@@ -99,9 +101,7 @@ public void testOnCreate_emailLinkLinkingFlow_expectSendEmailLinkFlowStarted() {
99101
// @Test TODO(lsirac): uncomment after figuring out why this no longer works
100102
public void testOnTroubleSigningIn_expectTroubleSigningInFragment() {
101103
EmailActivity emailActivity = createActivity(AuthUI.EMAIL_LINK_PROVIDER);
102-
103104
emailActivity.onTroubleSigningIn(EMAIL);
104-
105105
TroubleSigningInFragment fragment = (TroubleSigningInFragment) emailActivity
106106
.getSupportFragmentManager().findFragmentByTag(TroubleSigningInFragment.TAG);
107107
assertThat(fragment).isNotNull();
@@ -110,32 +110,24 @@ public void testOnTroubleSigningIn_expectTroubleSigningInFragment() {
110110
@Test
111111
public void testOnClickResendEmail_expectSendEmailLinkFlowStarted() {
112112
EmailActivity emailActivity = createActivity(AuthUI.EMAIL_LINK_PROVIDER);
113-
114113
emailActivity.onClickResendEmail(EMAIL);
115-
116114
shadowOf(Looper.getMainLooper()).idle();
117-
118115
EmailLinkFragment fragment = (EmailLinkFragment) emailActivity
119116
.getSupportFragmentManager().findFragmentByTag(EmailLinkFragment.TAG);
120117
assertThat(fragment).isNotNull();
121118
}
122119

123-
124120
@Test
125121
public void testSignUpButton_validatesFields() {
126122
EmailActivity emailActivity = createActivity(EmailAuthProvider.PROVIDER_ID);
127-
128123
// Trigger RegisterEmailFragment (bypass check email)
129124
emailActivity.onNewUser(
130125
new User.Builder(EmailAuthProvider.PROVIDER_ID, TestConstants.EMAIL).build());
131-
132126
shadowOf(Looper.getMainLooper()).idle();
133127
Button button = emailActivity.findViewById(R.id.button_create);
134128
button.performClick();
135-
136129
TextInputLayout nameLayout = emailActivity.findViewById(R.id.name_layout);
137130
TextInputLayout passwordLayout = emailActivity.findViewById(R.id.password_layout);
138-
139131
assertEquals(
140132
emailActivity.getString(R.string.fui_missing_first_and_last_name),
141133
nameLayout.getError().toString());
@@ -153,42 +145,33 @@ public void testSignUpButton_validatesFields() {
153145
@Test
154146
public void testSetDefaultEmail_validField() {
155147
EmailActivity emailActivity = createActivity(EmailAuthProvider.PROVIDER_ID, false, true);
156-
157148
CheckEmailFragment fragment = (CheckEmailFragment) emailActivity
158149
.getSupportFragmentManager().findFragmentByTag(CheckEmailFragment.TAG);
159150
assertThat(fragment).isNotNull();
160-
161-
TextInputEditText email = emailActivity.findViewById(R.id.email);
162-
assertEquals(TestConstants.EMAIL, email.getText().toString());
163-
151+
TextInputEditText email = emailActivity.findViewById(R.id.email);
152+
assertEquals(TestConstants.EMAIL, email.getText().toString());
164153
}
165154

166155
@Test
167156
public void testSetDefaultEmail_expectWelcomeBackPasswordPrompt() {
168157
EmailActivity emailActivity = createActivity(EmailAuthProvider.PROVIDER_ID, false, true);
169-
170158
emailActivity.onExistingEmailUser(new User.Builder(EmailAuthProvider.PROVIDER_ID, TestConstants.EMAIL).build());
171-
172159
ShadowActivity.IntentForResult nextIntent =
173-
shadowOf(emailActivity).getNextStartedActivityForResult();
160+
Shadows.shadowOf(emailActivity).getNextStartedActivityForResult();
174161
assertEquals(WelcomeBackPasswordPrompt.class.getName(),
175162
nextIntent.intent.getComponent().getClassName());
176-
177163
}
178164

179165
@Test
180166
public void testSetDefaultEmail_expectRegisterEmailFragment() {
181167
EmailActivity emailActivity = createActivity(EmailAuthProvider.PROVIDER_ID, false, true);
182-
183168
emailActivity.onNewUser(new User.Builder(EmailAuthProvider.PROVIDER_ID, TestConstants.EMAIL).build());
184-
185169
shadowOf(Looper.getMainLooper()).idle();
186170
RegisterEmailFragment registerEmailFragment = (RegisterEmailFragment) emailActivity
187171
.getSupportFragmentManager().findFragmentByTag(RegisterEmailFragment.TAG);
188172
assertThat(registerEmailFragment).isNotNull();
189173
}
190174

191-
192175
private EmailActivity createActivity(String providerId) {
193176
return createActivity(providerId, false, false);
194177
}
@@ -199,7 +182,7 @@ private EmailActivity createActivity(String providerId, boolean emailLinkLinking
199182
TestHelper.getFlowParameters(Collections.singletonList(providerId)));
200183

201184
if (hasDefaultEmail) {
202-
startIntent = EmailActivity.createIntent(
185+
startIntent = EmailActivity.createIntent(
203186
ApplicationProvider.getApplicationContext(),
204187
TestHelper.getFlowParameters(Collections.singletonList(providerId), false, null, true));
205188
}
@@ -209,11 +192,11 @@ private EmailActivity createActivity(String providerId, boolean emailLinkLinking
209192
startIntent.putExtra(ExtraConstants.IDP_RESPONSE, buildGoogleIdpResponse());
210193
}
211194

212-
return Robolectric.buildActivity(EmailActivity.class, startIntent)
213-
.create()
214-
.start()
215-
.visible()
216-
.get();
195+
ActivityController<EmailActivity> controller =
196+
Robolectric.buildActivity(EmailActivity.class, startIntent);
197+
EmailActivity activity = controller.get();
198+
activity.setTheme(R.style.Theme_AppCompat);
199+
return controller.create().start().visible().get();
217200
}
218201

219202
private IdpResponse buildGoogleIdpResponse() {

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package com.firebase.ui.auth.ui.email;
1616

1717
import android.content.Intent;
18+
import android.content.res.Resources;
1819
import android.widget.Button;
1920

2021
import com.firebase.ui.auth.IdpResponse;
@@ -28,6 +29,7 @@
2829
import org.junit.Before;
2930
import org.junit.Test;
3031
import org.junit.runner.RunWith;
32+
import org.robolectric.android.controller.ActivityController;
3133
import org.robolectric.Robolectric;
3234
import org.robolectric.RobolectricTestRunner;
3335
import org.robolectric.Shadows;
@@ -42,6 +44,7 @@
4244

4345
@RunWith(RobolectricTestRunner.class)
4446
public class WelcomeBackPasswordPromptTest {
47+
4548
@Before
4649
public void setUp() {
4750
TestHelper.initialize();
@@ -54,21 +57,21 @@ private WelcomeBackPasswordPrompt createActivity() {
5457
new IdpResponse.Builder(new User.Builder(
5558
EmailAuthProvider.PROVIDER_ID, TestConstants.EMAIL
5659
).build()).build());
57-
return Robolectric
58-
.buildActivity(WelcomeBackPasswordPrompt.class, startIntent)
59-
.create()
60-
.visible()
61-
.get();
60+
61+
ActivityController<WelcomeBackPasswordPrompt> controller =
62+
Robolectric.buildActivity(WelcomeBackPasswordPrompt.class, startIntent);
63+
WelcomeBackPasswordPrompt activity = controller.get();
64+
activity.setTheme(R.style.Theme_AppCompat);
65+
return controller.create().visible().get();
6266
}
6367

6468
@Test
6569
public void testSignInButton_validatesFields() {
6670
WelcomeBackPasswordPrompt welcomeBack = createActivity();
6771
Button signIn = welcomeBack.findViewById(R.id.button_done);
6872
signIn.performClick();
69-
TextInputLayout passwordLayout =
70-
welcomeBack.findViewById(R.id.password_layout);
7173

74+
TextInputLayout passwordLayout = welcomeBack.findViewById(R.id.password_layout);
7275
assertEquals(
7376
welcomeBack.getString(R.string.fui_error_invalid_password),
7477
passwordLayout.getError().toString());

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

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import com.firebase.ui.auth.ui.email.EmailActivity;
2626
import com.firebase.ui.auth.ui.phone.PhoneActivity;
2727
import com.google.firebase.auth.EmailAuthProvider;
28-
import com.google.firebase.auth.GoogleAuthProvider;
2928
import com.google.firebase.auth.PhoneAuthProvider;
3029
import com.google.firebase.auth.TwitterAuthProvider;
3130

@@ -34,6 +33,7 @@
3433
import org.junit.runner.RunWith;
3534
import org.robolectric.Robolectric;
3635
import org.robolectric.RobolectricTestRunner;
36+
import org.robolectric.android.controller.ActivityController;
3737
import org.robolectric.Shadows;
3838
import org.robolectric.shadows.ShadowActivity;
3939

@@ -43,7 +43,6 @@
4343
import androidx.test.core.app.ApplicationProvider;
4444

4545
import static junit.framework.Assert.assertEquals;
46-
import static junit.framework.Assert.assertNotNull;
4746

4847
@RunWith(RobolectricTestRunner.class)
4948
public class AuthMethodPickerActivityTest {
@@ -57,8 +56,8 @@ public void testAllProvidersArePopulated() {
5756
// Exclude Facebook until the `NoClassDefFoundError: com/facebook/common/R$style` exception
5857
// is fixed.
5958
List<String> providers = Arrays.asList(
60-
// GoogleAuthProvider.PROVIDER_ID, we remove GoogleAuthProvider otherwise
61-
// CredentialManager will be initialized and it will throw an exception
59+
// GoogleAuthProvider.PROVIDER_ID is removed to avoid initializing CredentialManager,
60+
// which can throw an exception.
6261
TwitterAuthProvider.PROVIDER_ID,
6362
EmailAuthProvider.PROVIDER_ID,
6463
PhoneAuthProvider.PROVIDER_ID,
@@ -117,7 +116,7 @@ public void testCustomAuthMethodPickerLayout() {
117116
Button emailButton = authMethodPickerActivity.findViewById(R.id.email_button);
118117
emailButton.performClick();
119118

120-
//Expected result -> Directing users to EmailActivity
119+
// Expected result: Directing users to EmailActivity
121120
ShadowActivity.IntentForResult nextIntent =
122121
Shadows.shadowOf(authMethodPickerActivity).getNextStartedActivityForResult();
123122
assertEquals(
@@ -139,7 +138,7 @@ public void testCustomAuthMethodPickerLayoutWithEmailLink() {
139138
Button emailButton = authMethodPickerActivity.findViewById(R.id.email_button);
140139
emailButton.performClick();
141140

142-
//Expected result -> Directing users to EmailActivity
141+
// Expected result: Directing users to EmailActivity
143142
ShadowActivity.IntentForResult nextIntent =
144143
Shadows.shadowOf(authMethodPickerActivity).getNextStartedActivityForResult();
145144
assertEquals(
@@ -160,7 +159,7 @@ public void testCustomAuthMethodPickerLayoutWithDefaultEmail() {
160159
Button emailButton = authMethodPickerActivity.findViewById(R.id.email_button);
161160
emailButton.performClick();
162161

163-
//Expected result -> Directing users to EmailActivity
162+
// Expected result: Directing users to EmailActivity
164163
ShadowActivity.IntentForResult nextIntent =
165164
Shadows.shadowOf(authMethodPickerActivity).getNextStartedActivityForResult();
166165
assertEquals(
@@ -175,22 +174,22 @@ private AuthMethodPickerActivity createActivityWithCustomLayout(List<String> pro
175174
ApplicationProvider.getApplicationContext(),
176175
TestHelper.getFlowParameters(providers, false, layout, hasDefaultEmail));
177176

178-
return Robolectric
179-
.buildActivity(AuthMethodPickerActivity.class, startIntent)
180-
.create()
181-
.visible()
182-
.get();
177+
ActivityController<AuthMethodPickerActivity> controller =
178+
Robolectric.buildActivity(AuthMethodPickerActivity.class, startIntent);
179+
AuthMethodPickerActivity activity = controller.get();
180+
activity.setTheme(R.style.Theme_AppCompat);
181+
return controller.create().visible().get();
183182
}
184183

185184
private AuthMethodPickerActivity createActivity(List<String> providers) {
186185
Intent startIntent = AuthMethodPickerActivity.createIntent(
187186
ApplicationProvider.getApplicationContext(),
188187
TestHelper.getFlowParameters(providers));
189188

190-
return Robolectric
191-
.buildActivity(AuthMethodPickerActivity.class, startIntent)
192-
.create()
193-
.visible()
194-
.get();
189+
ActivityController<AuthMethodPickerActivity> controller =
190+
Robolectric.buildActivity(AuthMethodPickerActivity.class, startIntent);
191+
AuthMethodPickerActivity activity = controller.get();
192+
activity.setTheme(R.style.Theme_AppCompat);
193+
return controller.create().visible().get();
195194
}
196195
}

0 commit comments

Comments
 (0)