Skip to content

Commit 2217102

Browse files
committed
Fix more check failures
Change-Id: I0b884bdbe5e62713dc3a4edca8539cace74f3f18
1 parent 47c1a6c commit 2217102

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

auth/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ dependencies {
5656
testCompile 'org.robolectric:robolectric:3.2.2'
5757
// See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
5858
testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
59+
testCompile 'com.facebook.android:facebook-android-sdk:4.23.0'
5960
}
6061

6162
javadoc.exclude([

auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListSpinner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void setSelectedForCountry(final Locale locale, String countryCode) {
8080
final String countryName = locale.getDisplayName();
8181
if (!TextUtils.isEmpty(countryName) && !TextUtils.isEmpty(countryCode)) {
8282
selectedCountryName = countryName;
83-
setSpinnerText(Integer.valueOf(countryCode), locale);
83+
setSpinnerText(Integer.parseInt(countryCode), locale);
8484
}
8585
}
8686

auth/src/test/java/com/firebase/ui/auth/testhelpers/CustomCountDownTimerShadow.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@
22

33
import android.os.CountDownTimer;
44

5-
import com.firebase.ui.auth.ui.BaseHelper;
6-
import com.google.firebase.auth.PhoneAuthProvider;
7-
85
import org.mockito.Mock;
96
import org.robolectric.annotation.Implementation;
107
import org.robolectric.annotation.Implements;
11-
import org.robolectric.annotation.RealObject;
128

139
@Implements(CountDownTimer.class)
1410
public class CustomCountDownTimerShadow {
@@ -22,6 +18,7 @@ public class CustomCountDownTimerShadow {
2218
public CustomCountDownTimerShadow() {
2319
}
2420

21+
@SuppressWarnings("checkstyle:methodname")
2522
public void __constructor__(long millisInFuture, long countDownInterval) {
2623
this.countDownInterval = countDownInterval;
2724
this.millisInFuture = millisInFuture;

auth/src/test/java/com/firebase/ui/auth/testhelpers/FacebookProviderShadow.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414

1515
package com.firebase.ui.auth.testhelpers;
1616

17-
import android.app.Activity;
17+
import android.support.annotation.StyleRes;
1818

1919
import com.facebook.login.LoginResult;
20+
import com.firebase.ui.auth.AuthUI;
2021
import com.firebase.ui.auth.IdpResponse;
2122
import com.firebase.ui.auth.provider.FacebookProvider;
2223
import com.firebase.ui.auth.provider.IdpProvider.IdpCallback;
@@ -25,8 +26,6 @@
2526
import org.robolectric.annotation.Implementation;
2627
import org.robolectric.annotation.Implements;
2728

28-
import java.util.List;
29-
3029
import static org.mockito.Mockito.mock;
3130
import static org.mockito.Mockito.when;
3231

@@ -46,7 +45,7 @@ public FacebookProviderShadow() {
4645
}
4746

4847
@SuppressWarnings("checkstyle:methodname")
49-
public void __constructor__(Activity activity, List<String> scopes) {}
48+
public void __constructor__(AuthUI.IdpConfig idpConfig, @StyleRes int theme) {}
5049

5150
@Implementation
5251
public void setAuthenticationCallback(IdpCallback idpCallback) {

library/quality/checkstyle.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ page at http://checkstyle.sourceforge.net/config.html -->
109109
<module name="MethodNameCheck">
110110
<!-- Validates identifiers for method names. -->
111111
<metadata name="altname" value="MethodName"/>
112-
<property name="format" value="^(__)?+[a-z][a-zA-Z0-9]*(_[a-zA-Z0-9]+)*(__)?+$"/>
112+
<property name="format" value="^[a-z][a-zA-Z0-9]*(_[a-zA-Z0-9]+)*$"/>
113113
<property name="severity" value="warning"/>
114114
</module>
115115

0 commit comments

Comments
 (0)