Skip to content

Commit e102cc1

Browse files
SUPERCILEXsamtstern
authored andcommitted
Use recommended Robolectric setup for gradle plugin 3.0 (#1071)
1 parent 64ccdc9 commit e102cc1

13 files changed

+5
-35
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,12 @@
2727
import org.junit.runner.RunWith;
2828
import org.robolectric.RobolectricTestRunner;
2929
import org.robolectric.RuntimeEnvironment;
30-
import org.robolectric.annotation.Config;
3130

3231
import java.util.Arrays;
3332

3433
import static junit.framework.Assert.assertEquals;
3534

3635
@RunWith(RobolectricTestRunner.class)
37-
@Config(constants = BuildConfig.class, sdk = 25)
3836
public class AuthUITest {
3937
private FirebaseApp mFirebaseApp;
4038

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import android.widget.EditText;
2121

2222
import com.firebase.ui.auth.AuthUI;
23-
import com.firebase.ui.auth.BuildConfig;
2423
import com.firebase.ui.auth.R;
2524
import com.firebase.ui.auth.data.model.User;
2625
import com.firebase.ui.auth.testhelpers.AuthHelperShadow;
@@ -48,7 +47,6 @@
4847
import static org.mockito.Mockito.when;
4948

5049
@RunWith(RobolectricTestRunner.class)
51-
@Config(constants = BuildConfig.class, sdk = 25)
5250
public class EmailActivityTest {
5351

5452
private EmailActivity createActivity() {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import android.content.Intent;
1818
import android.widget.Button;
1919

20-
import com.firebase.ui.auth.BuildConfig;
2120
import com.firebase.ui.auth.R;
2221
import com.firebase.ui.auth.testhelpers.AuthHelperShadow;
2322
import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
@@ -38,7 +37,6 @@
3837
import static org.mockito.Mockito.when;
3938

4039
@RunWith(RobolectricTestRunner.class)
41-
@Config(constants = BuildConfig.class, sdk = 25)
4240
public class RecoverPasswordActivityTest {
4341

4442
@Before

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import android.widget.EditText;
2121

2222
import com.firebase.ui.auth.AuthUI;
23-
import com.firebase.ui.auth.BuildConfig;
2423
import com.firebase.ui.auth.IdpResponse;
2524
import com.firebase.ui.auth.R;
2625
import com.firebase.ui.auth.data.model.User;
@@ -51,7 +50,6 @@
5150
import static org.mockito.Mockito.when;
5251

5352
@RunWith(RobolectricTestRunner.class)
54-
@Config(constants = BuildConfig.class, sdk = 25)
5553
public class WelcomeBackPasswordPromptTest {
5654
@Before
5755
public void setUp() {

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import android.widget.LinearLayout;
2121

2222
import com.firebase.ui.auth.AuthUI;
23-
import com.firebase.ui.auth.BuildConfig;
2423
import com.firebase.ui.auth.R;
2524
import com.firebase.ui.auth.testhelpers.AuthHelperShadow;
2625
import com.firebase.ui.auth.testhelpers.AutoCompleteTask;
@@ -58,12 +57,11 @@
5857
import static org.mockito.Mockito.when;
5958

6059
@RunWith(RobolectricTestRunner.class)
61-
@Config(constants = BuildConfig.class,
62-
shadows = {
63-
GoogleProviderShadow.class,
64-
FacebookProviderShadow.class,
65-
LoginManagerShadow.class
66-
}, sdk = 25)
60+
@Config(shadows = {
61+
GoogleProviderShadow.class,
62+
FacebookProviderShadow.class,
63+
LoginManagerShadow.class
64+
})
6765
public class AuthMethodPickerActivityTest {
6866
@Test
6967
public void testAllProvidersArePopulated() {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import android.content.Intent;
1818

19-
import com.firebase.ui.auth.BuildConfig;
2019
import com.firebase.ui.auth.IdpResponse;
2120
import com.firebase.ui.auth.data.model.FlowParameters;
2221
import com.firebase.ui.auth.data.model.User;
@@ -59,7 +58,6 @@
5958
import static org.mockito.Mockito.when;
6059

6160
@RunWith(RobolectricTestRunner.class)
62-
@Config(constants = BuildConfig.class, sdk = 25)
6361
public class CredentialSignInHandlerTest {
6462
private static final int RC_ACCOUNT_LINK = 3;
6563
private static final String LINKING_ERROR = "ERROR_TEST_LINKING";

auth/src/test/java/com/firebase/ui/auth/ui/phone/BucketedTextChangeListenerTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,19 @@
1919

2020
import android.widget.EditText;
2121

22-
import com.firebase.ui.auth.BuildConfig;
2322
import com.firebase.ui.auth.util.ui.BucketedTextChangeListener;
2423

2524
import org.junit.Before;
2625
import org.junit.Test;
2726
import org.junit.runner.RunWith;
2827
import org.mockito.InOrder;
2928
import org.robolectric.RobolectricTestRunner;
30-
import org.robolectric.annotation.Config;
3129

3230
import static org.mockito.Mockito.inOrder;
3331
import static org.mockito.Mockito.mock;
3432
import static org.mockito.Mockito.verify;
3533

3634
@RunWith(RobolectricTestRunner.class)
37-
@Config(constants = BuildConfig.class, sdk = 21)
3835
public class BucketedTextChangeListenerTest {
3936
private static final int EXPECTED_LENGTH = 6;
4037
private static final String PLACE_HOLDER = "-";

auth/src/test/java/com/firebase/ui/auth/ui/phone/CountryInfoTests.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@
1717
*/
1818
package com.firebase.ui.auth.ui.phone;
1919

20-
import com.firebase.ui.auth.BuildConfig;
2120
import com.firebase.ui.auth.data.model.CountryInfo;
2221

2322
import org.junit.Test;
2423
import org.junit.runner.RunWith;
2524
import org.robolectric.RobolectricTestRunner;
26-
import org.robolectric.annotation.Config;
2725

2826
import java.util.Locale;
2927

@@ -32,7 +30,6 @@
3230
import static org.junit.Assert.assertNotSame;
3331

3432
@RunWith(RobolectricTestRunner.class)
35-
@Config(constants = BuildConfig.class, sdk = 25)
3633
public class CountryInfoTests {
3734
private static final Locale COUNTRY_NAME_US = new Locale("", "US");
3835
private static final int COUNTRY_CODE_US = 1;

auth/src/test/java/com/firebase/ui/auth/ui/phone/CountryListLoadTaskTests.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@
1818

1919
package com.firebase.ui.auth.ui.phone;
2020

21-
import com.firebase.ui.auth.BuildConfig;
2221
import com.firebase.ui.auth.data.client.CountryListLoadTask;
2322
import com.firebase.ui.auth.data.model.CountryInfo;
2423

2524
import org.junit.Before;
2625
import org.junit.Test;
2726
import org.junit.runner.RunWith;
2827
import org.robolectric.RobolectricTestRunner;
29-
import org.robolectric.annotation.Config;
3028

3129
import java.util.ArrayList;
3230
import java.util.Collections;
@@ -40,7 +38,6 @@
4038
import static org.mockito.Mockito.verify;
4139

4240
@RunWith(RobolectricTestRunner.class)
43-
@Config(constants = BuildConfig.class, sdk = 25)
4441
public class CountryListLoadTaskTests {
4542
private static final ArrayList<CountryInfo> COUNTRY_LIST = new ArrayList<>();
4643

auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneActivityTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import android.widget.TextView;
2424

2525
import com.firebase.ui.auth.AuthUI;
26-
import com.firebase.ui.auth.BuildConfig;
2726
import com.firebase.ui.auth.R;
2827
import com.firebase.ui.auth.data.model.CountryInfo;
2928
import com.firebase.ui.auth.testhelpers.AuthHelperShadow;
@@ -74,7 +73,6 @@
7473
import static org.mockito.MockitoAnnotations.initMocks;
7574

7675
@RunWith(RobolectricTestRunner.class)
77-
@Config(constants = BuildConfig.class, sdk = 25)
7876
public class PhoneActivityTest {
7977
private PhoneActivity mActivity;
8078
private TextInputLayout mPhoneLayout;

auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneNumberTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,16 @@
1717
*/
1818
package com.firebase.ui.auth.ui.phone;
1919

20-
import com.firebase.ui.auth.BuildConfig;
2120
import com.firebase.ui.auth.data.model.PhoneNumber;
2221

2322
import org.junit.Test;
2423
import org.junit.runner.RunWith;
2524
import org.robolectric.RobolectricTestRunner;
26-
import org.robolectric.annotation.Config;
2725

2826
import static org.junit.Assert.assertFalse;
2927
import static org.junit.Assert.assertTrue;
3028

3129
@RunWith(RobolectricTestRunner.class)
32-
@Config(constants = BuildConfig.class, sdk = 21)
3330
public class PhoneNumberTest {
3431
@Test
3532
public void testIsValid_emptyPhone() {

auth/src/test/java/com/firebase/ui/auth/ui/phone/PhoneNumberUtilsTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import static org.mockito.Mockito.when;
4444

4545
@RunWith(RobolectricTestRunner.class)
46-
@Config(constants = BuildConfig.class, sdk = 21)
4746
public class PhoneNumberUtilsTest {
4847
@Test
4948
public void testGetPhoneNumber() {

auth/src/test/java/com/firebase/ui/auth/ui/phone/SpacedEditTextTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,19 @@
2323
import android.text.style.ScaleXSpan;
2424
import android.util.AttributeSet;
2525

26-
import com.firebase.ui.auth.BuildConfig;
2726
import com.firebase.ui.auth.R;
2827

2928
import org.junit.Before;
3029
import org.junit.Test;
3130
import org.junit.runner.RunWith;
3231
import org.robolectric.RobolectricTestRunner;
3332
import org.robolectric.RuntimeEnvironment;
34-
import org.robolectric.annotation.Config;
3533

3634
import static junit.framework.Assert.assertEquals;
3735
import static org.mockito.Mockito.mock;
3836
import static org.mockito.Mockito.when;
3937

4038
@RunWith(RobolectricTestRunner.class)
41-
@Config(constants = BuildConfig.class, sdk = 21)
4239
public class SpacedEditTextTest {
4340
private static final float SPACING_PROPORTION = 1.1f;
4441

0 commit comments

Comments
 (0)