[Android WebView] Fix FindBugs warnings in AwSettingsTest
R=benm@chromium.org NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11590015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173465 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
mnaganov@chromium.org
android_webview/javatests/src/org/chromium/android_webview/test
build/android/findbugs_filter
@ -439,7 +439,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
|
||||
protected void doEnsureSettingHasValue(String value) throws Throwable {
|
||||
loadDataSync(getData());
|
||||
assertEquals(
|
||||
value == DEFAULT_UA ? mDefaultUa : value,
|
||||
DEFAULT_UA.equals(value) ? mDefaultUa : value,
|
||||
getTitleOnUiThread());
|
||||
}
|
||||
|
||||
@ -799,7 +799,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
|
||||
}
|
||||
|
||||
class AwSettingsTextZoomTestHelper extends AwSettingsTestHelper<Integer> {
|
||||
private final int mInitialTextZoom = 100;
|
||||
private static final int INITIAL_TEXT_ZOOM = 100;
|
||||
private final float mInitialActualFontSize;
|
||||
|
||||
AwSettingsTextZoomTestHelper(
|
||||
@ -813,12 +813,12 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
|
||||
|
||||
@Override
|
||||
protected Integer getAlteredValue() {
|
||||
return mInitialTextZoom * 2;
|
||||
return INITIAL_TEXT_ZOOM * 2;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Integer getInitialValue() {
|
||||
return mInitialTextZoom;
|
||||
return INITIAL_TEXT_ZOOM;
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -838,10 +838,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
|
||||
// text zoom values ratio.
|
||||
final float ratiosDelta = Math.abs(
|
||||
(actualFontSize / mInitialActualFontSize) -
|
||||
(value / (float)mInitialTextZoom));
|
||||
(value / (float)INITIAL_TEXT_ZOOM));
|
||||
assertTrue(
|
||||
"|(" + actualFontSize + " / " + mInitialActualFontSize + ") - (" +
|
||||
value + " / " + mInitialTextZoom + ")| = " + ratiosDelta,
|
||||
value + " / " + INITIAL_TEXT_ZOOM + ")| = " + ratiosDelta,
|
||||
ratiosDelta <= 0.2f);
|
||||
}
|
||||
|
||||
@ -880,8 +880,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
|
||||
|
||||
AwSettingsJavaScriptPopupsTestHelper(
|
||||
AwContents awContents,
|
||||
TestAwContentsClient contentViewClient,
|
||||
int index) throws Throwable {
|
||||
TestAwContentsClient contentViewClient) throws Throwable {
|
||||
super(awContents, contentViewClient, true);
|
||||
}
|
||||
|
||||
@ -1237,7 +1236,6 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
|
||||
final AwTestContainerView testContainerView =
|
||||
createAwTestContainerViewOnMainSync(contentClient);
|
||||
final AwContents awContents = testContainerView.getAwContents();
|
||||
CallbackHelper onPageFinishedHelper = contentClient.getOnPageFinishedHelper();
|
||||
ContentSettings settings = getContentSettingsOnUiThread(awContents);
|
||||
settings.setJavaScriptEnabled(true);
|
||||
ImagePageGenerator generator = new ImagePageGenerator(0, false);
|
||||
@ -1346,8 +1344,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
|
||||
"Version/\\d+\\.\\d+( Mobile)? Safari/(\\d+)\\.(\\d+)";
|
||||
final Pattern userAgentExpr = Pattern.compile(patternString);
|
||||
Matcher patternMatcher = userAgentExpr.matcher(actualUserAgentString);
|
||||
assertTrue(String.format("User agent string did not match expected pattern. \nExpected " +
|
||||
"pattern:\n%s\nActual:\n%s", patternString, actualUserAgentString),
|
||||
assertTrue(String.format("User agent string did not match expected pattern. %nExpected " +
|
||||
"pattern:%n%s%nActual:%n%s", patternString, actualUserAgentString),
|
||||
patternMatcher.find());
|
||||
// No country-language code token.
|
||||
assertEquals(null, patternMatcher.group(3));
|
||||
@ -1415,10 +1413,10 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
|
||||
final String page2 = String.format(pageTemplate, page2Title);
|
||||
settings.setUserAgentString(customUserAgentString);
|
||||
loadDataSync(
|
||||
awContents, contentClient.getOnPageFinishedHelper(), page1, "text/html", false);
|
||||
awContents, onPageFinishedHelper, page1, "text/html", false);
|
||||
assertEquals(page1Title + customUserAgentString, getTitleOnUiThread(awContents));
|
||||
loadDataSync(
|
||||
awContents, contentClient.getOnPageFinishedHelper(), page2, "text/html", false);
|
||||
awContents, onPageFinishedHelper, page2, "text/html", false);
|
||||
assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(awContents));
|
||||
settings.setUserAgentString(null);
|
||||
// Must not cause any changes until the next page loading.
|
||||
@ -1990,8 +1988,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
|
||||
public void testJavaScriptPopupsNormal() throws Throwable {
|
||||
ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
|
||||
runPerViewSettingsTest(
|
||||
new AwSettingsJavaScriptPopupsTestHelper(views.getContents0(), views.getClient0(), 0),
|
||||
new AwSettingsJavaScriptPopupsTestHelper(views.getContents1(), views.getClient1(), 1));
|
||||
new AwSettingsJavaScriptPopupsTestHelper(views.getContents0(), views.getClient0()),
|
||||
new AwSettingsJavaScriptPopupsTestHelper(views.getContents1(), views.getClient1()));
|
||||
}
|
||||
|
||||
@SmallTest
|
||||
@ -1999,8 +1997,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
|
||||
public void testJavaScriptPopupsIncognito() throws Throwable {
|
||||
ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
|
||||
runPerViewSettingsTest(
|
||||
new AwSettingsJavaScriptPopupsTestHelper(views.getContents0(), views.getClient0(), 0),
|
||||
new AwSettingsJavaScriptPopupsTestHelper(views.getContents1(), views.getClient1(), 1));
|
||||
new AwSettingsJavaScriptPopupsTestHelper(views.getContents0(), views.getClient0()),
|
||||
new AwSettingsJavaScriptPopupsTestHelper(views.getContents1(), views.getClient1()));
|
||||
}
|
||||
|
||||
@SmallTest
|
||||
@ -2008,8 +2006,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
|
||||
public void testJavaScriptPopupsBoth() throws Throwable {
|
||||
ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
|
||||
runPerViewSettingsTest(
|
||||
new AwSettingsJavaScriptPopupsTestHelper(views.getContents0(), views.getClient0(), 0),
|
||||
new AwSettingsJavaScriptPopupsTestHelper(views.getContents1(), views.getClient1(), 1));
|
||||
new AwSettingsJavaScriptPopupsTestHelper(views.getContents0(), views.getClient0()),
|
||||
new AwSettingsJavaScriptPopupsTestHelper(views.getContents1(), views.getClient1()));
|
||||
}
|
||||
|
||||
@SmallTest
|
||||
@ -2306,7 +2304,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
|
||||
}
|
||||
}
|
||||
|
||||
class ViewPair {
|
||||
static class ViewPair {
|
||||
private final AwContents contents0;
|
||||
private final TestAwContentsClient client0;
|
||||
private final AwContents contents1;
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
H B ES: Comparison of String parameter using == or != in org.chromium.android_webview.test.AwSettingsTest$AwSettingsUserAgentStringTestHelper.doEnsureSettingHasValue(String) At AwSettingsTest.java
|
||||
H B Nm: The class name org.chromium.content.browser.test.util.TouchUtils shadows the simple name of the superclass android.test.TouchUtils At TouchUtils.java
|
||||
H C EC: Using pointer equality to compare a JavaBridgeCoercionTest$CustomType with a JavaBridgeCoercionTest$CustomType2 in org.chromium.content.browser.JavaBridgeCoercionTest.testPassJavaObject() At JavaBridgeCoercionTest.java
|
||||
H D RCN: Redundant nullcheck of org.chromium.content.browser.SandboxedProcessConnection.mConnectionParams, which is known to be non-null in org.chromium.content.browser.SandboxedProcessConnection.doConnectionSetup() Redundant null check at SandboxedProcessConnection.java
|
||||
@ -10,7 +9,6 @@ H V MS: org.chromium.content.browser.ContentViewTestBase.WAIT_TIMEOUT_SECONDS is
|
||||
H V MS: org.chromium.content.browser.test.util.CallbackHelper.WAIT_TIMEOUT_SECONDS isn't final but should be At CallbackHelper.java
|
||||
H V MS: org.chromium.content.browser.test.util.HistoryUtils.WAIT_TIMEOUT_SECONDS isn't final but should be At HistoryUtils.java
|
||||
M B DE: org.chromium.net.X509Util.clearTestRootCertificates() might ignore java.io.IOException At X509Util.java
|
||||
M B FS: Format string should use %n rather than \n in org.chromium.android_webview.test.AwSettingsTest.testUserAgentStringDefault() At AwSettingsTest.java
|
||||
M B Nm: The method name org.chromium.base.test.util.ScalableTimeout.ScaleTimeout(long) doesn't start with a lower case letter At ScalableTimeout.java
|
||||
M B RV: exceptional return value of java.io.File.delete() ignored in org.chromium.android_webview.test.ArchiveTest.doArchiveTest(AwContents, String, boolean, String) At ArchiveTest.java
|
||||
M B RV: exceptional return value of java.io.File.delete() ignored in org.chromium.android_webview.test.ArchiveTest.testAutoBadPath() At ArchiveTest.java
|
||||
@ -70,7 +68,6 @@ M C UMAC: Uncallable method org.chromium.content.browser.JavaBridgeBasicsTest$9.
|
||||
M C USELESS_STRING: Invocation of toString on certChain in org.chromium.net.X509Util.verifyServerCertificates(byte[][], String) At X509Util.java
|
||||
M D DLS: Dead store to context in org.chromium.android_webview.test.AndroidWebViewTestBase.createAwTestContainerViewOnMainSync(boolean, AwContentsClient) At AndroidWebViewTestBase.java
|
||||
M D DLS: Dead store to eventTime in org.chromium.content.browser.LongPressDetectorTest$1.run() At LongPressDetectorTest.java
|
||||
M D DLS: Dead store to onPageFinishedHelper in org.chromium.android_webview.test.AwSettingsTest.testLoadsImagesAutomaticallyNoPageReload() At AwSettingsTest.java
|
||||
M D DLS: Dead store to prevEditableLength in org.chromium.content.browser.ImeAdapter$AdapterInputConnection.setEditableText(String, int, int, int, int) At ImeAdapter.java
|
||||
M D DLS: Dead store to testUrl in org.chromium.android_webview.test.ClientOnPageFinishedTest.testOnPageFinishedNotCalledForValidSubresources() At ClientOnPageFinishedTest.java
|
||||
M D DLS: Dead store to time in org.chromium.net.test.util.TestWebServer.setDateHeaders(HttpResponse) At TestWebServer.java
|
||||
@ -106,7 +103,6 @@ M M LI: Incorrect lazy initialization and update of static field org.chromium.ne
|
||||
M M LI: Incorrect lazy initialization of static field org.chromium.net.NetworkChangeNotifier.sInstance in org.chromium.net.NetworkChangeNotifier.createInstance(Context, int) At NetworkChangeNotifier.java
|
||||
M M UG: org.chromium.content.browser.JavaBridgeReturnValuesTest$TestObject.getBooleanValue() is unsynchronized, org.chromium.content.browser.JavaBridgeReturnValuesTest$TestObject.setBooleanValue(boolean) is synchronized At JavaBridgeReturnValuesTest.java
|
||||
M M UG: org.chromium.content.browser.JavaBridgeReturnValuesTest$TestObject.getStringValue() is unsynchronized, org.chromium.content.browser.JavaBridgeReturnValuesTest$TestObject.setStringValue(String) is synchronized At JavaBridgeReturnValuesTest.java
|
||||
M P SIC: Should org.chromium.android_webview.test.AwSettingsTest$ViewPair be a _static_ inner class? At AwSettingsTest.java
|
||||
M P SIC: Should org.chromium.android_webview.test.TestAwContentsClient$AddMessageToConsoleHelper be a _static_ inner class? At TestAwContentsClient.java
|
||||
M P SIC: Should org.chromium.android_webview.test.TestContentProvider$ProviderStateCursor be a _static_ inner class? At TestContentProvider.java
|
||||
M P SIC: Should org.chromium.content.browser.ContentViewGestureHandlerTest$GestureRecordingMotionEventDelegate$GestureEvent be a _static_ inner class? At ContentViewGestureHandlerTest.java
|
||||
@ -114,7 +110,6 @@ M P SIC: Should org.chromium.content.browser.JavaBridgeArrayCoercionTest$CustomT
|
||||
M P SIC: Should org.chromium.content.browser.JavaBridgeFieldsTest$CustomType be a _static_ inner class? At JavaBridgeFieldsTest.java
|
||||
M P SIC: Should org.chromium.content.browser.JavaBridgeReturnValuesTest$CustomType be a _static_ inner class? At JavaBridgeReturnValuesTest.java
|
||||
M P SIC: Should org.chromium.content.browser.PopupZoomerTest$CustomCanvasPopupZoomer be a _static_ inner class? At PopupZoomerTest.java
|
||||
M P SS: Unread field: org.chromium.android_webview.test.AwSettingsTest$AwSettingsTextZoomTestHelper.mInitialTextZoom; should this field be static? At AwSettingsTest.java
|
||||
M P SS: Unread field: org.chromium.android_webview.test.util.ImagePageGenerator.IMAGE_PREFIX; should this field be static? At ImagePageGenerator.java
|
||||
M P SS: Unread field: org.chromium.android_webview.test.util.ImagePageGenerator.IMAGE_SUFFIX; should this field be static? At ImagePageGenerator.java
|
||||
M P SS: Unread field: org.chromium.native_test.ChromeNativeTestActivity.EXTRA_RUN_IN_SUB_THREAD; should this field be static? At ChromeNativeTestActivity.java
|
||||
|
||||
Reference in New Issue
Block a user