Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(688)

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java

Issue 793203002: Use SuppressFBWarnings to suppress findbugs warnings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase + landmine Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
index ddc655b8430b3fb0e609ad97f536731c685f2898..950e772a112c7278a1a91fa0e5a28e0b91072e95 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBasicsTest.java
@@ -10,6 +10,7 @@ import android.test.suitebuilder.annotation.SmallTest;
import junit.framework.Assert;
+import org.chromium.base.annotations.SuppressFBWarnings;
import org.chromium.base.test.util.Feature;
import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
import org.chromium.content_public.browser.LoadUrlParams;
@@ -36,6 +37,7 @@ import java.util.concurrent.CountDownLatch;
* - Inheritance
*/
public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
+ @SuppressFBWarnings("CHROMIUM_SYNCHRONIZED_METHOD")
private class TestController extends Controller {
private int mIntValue;
private long mLongValue;
@@ -143,16 +145,25 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
}
// Note that this requires that we can pass a JavaScript boolean to Java.
- private void assertRaisesException(String script) throws Throwable {
+ private void executeAndSetIfException(String script) throws Throwable {
executeJavaScript("try {"
+ script + ";"
+ " testController.setBooleanValue(false);"
+ "} catch (exception) {"
+ " testController.setBooleanValue(true);"
+ "}");
+ }
+
+ private void assertRaisesException(String script) throws Throwable {
+ executeAndSetIfException(script);
assertTrue(mTestController.waitForBooleanValue());
}
+ private void assertNoRaisedException(String script) throws Throwable {
+ executeAndSetIfException(script);
+ assertFalse(mTestController.waitForBooleanValue());
+ }
+
@SmallTest
@Feature({"AndroidWebView", "Android-JavaBridge"})
public void testTypeOfInjectedObject() throws Throwable {
@@ -631,7 +642,9 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
injectObjectAndReload(new Object() {
public void method() {}
private void privateMethod() {}
+ @SuppressFBWarnings("UUF_UNUSED")
public int field;
+ @SuppressFBWarnings("UUF_UNUSED")
private int mPrivateField;
}, "testObject");
executeJavaScript(
@@ -699,13 +712,16 @@ public class JavaBridgeBasicsTest extends JavaBridgeTestBase {
return getClass();
}
+ @SuppressFBWarnings("UUF_UNUSED")
private int mField;
}, "testObject");
- assertRaisesException("testObject.myGetClass().getField('field')");
+ String fieldName = "mField";
+ assertRaisesException("testObject.myGetClass().getField('" + fieldName + "')");
// getDeclaredField() is able to access a private field, but getInt()
// throws a Java exception.
+ assertNoRaisedException("testObject.myGetClass().getDeclaredField('" + fieldName + "')");
assertRaisesException(
- "testObject.myGetClass().getDeclaredField('field').getInt(testObject)");
+ "testObject.myGetClass().getDeclaredField('" + fieldName + "').getInt(testObject)");
}
@SmallTest

Powered by Google App Engine
This is Rietveld 408576698