Auto convert content shell tests to JUnit4

content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java

Index: content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
index fdf3b1d587897b4ceb6f57db0fe8037b866fa7c1..4fe20668a65c63983e656762b6aa780b0df412d6 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java
@@ -1,4 +1,4 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
+// Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,7 +6,14 @@ package org.chromium.content.browser;
 
 import android.support.test.filters.SmallTest;
 
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import org.chromium.base.annotations.SuppressFBWarnings;
+import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.JavaBridgeTestCommon.Controller;
 
@@ -21,7 +28,13 @@ import org.chromium.content.browser.JavaBridgeTestCommon.Controller;
  * FIXME: Consider making our implementation more compliant, if it will not
  * break backwards-compatibility. See b/4408210.
  */
-public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
+@RunWith(BaseJUnit4ClassRunner.class)
+public class JavaBridgeArrayCoercionTest {
+    private static final double ASSERTION_DELTA = 0.00000001;

[boliu, 2017/03/10 18:32:32]

afaict, previous code effectively has the delta as 0, so should keep that unless
it actually cause a failure.

also avoid promoting float to double

[the real yoland, 2017/03/10 19:31:58]

Changed to 0

float is always promoted to double in JUnit4 assertEquals
http://junit.sourceforge.net/javadoc/org/junit/Assert.html

+
+    @Rule
+    public JavaBridgeActivityTestRule mActivityTestRule = new JavaBridgeActivityTestRule();
+
     @SuppressFBWarnings("CHROMIUM_SYNCHRONIZED_METHOD")
     private static class TestObject extends Controller {
         private final Object mObjectInstance;
@@ -148,11 +161,10 @@ public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
 
     private TestObject mTestObject;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
         mTestObject = new TestObject();
-        injectObjectAndReload(mTestObject, "testObject");
+        mActivityTestRule.injectObjectAndReload(mTestObject, "testObject");
     }
 
     // Note that all tests use a single element array for simplicity. We test
@@ -160,809 +172,841 @@ public class JavaBridgeArrayCoercionTest extends JavaBridgeTestBase {
 
     // Test passing an array of JavaScript numbers in the int32 range to a
     // method which takes a Java array.
+    @Test
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassNumberInt32() throws Throwable {
-        executeJavaScript("testObject.setBooleanArray([0]);");
-        assertFalse(mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setBooleanArray([0]);");
+        Assert.assertFalse(mTestObject.waitForBooleanArray()[0]);
         // LIVECONNECT_COMPLIANCE: Should convert to boolean.
-        executeJavaScript("testObject.setBooleanArray([42]);");
-        assertFalse(mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setBooleanArray([42]);");
+        Assert.assertFalse(mTestObject.waitForBooleanArray()[0]);
 
-        executeJavaScript("testObject.setByteArray([42]);");
-        assertEquals(42, mTestObject.waitForByteArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setByteArray([42]);");
+        Assert.assertEquals(42, mTestObject.waitForByteArray()[0]);
 
-        executeJavaScript("testObject.setCharArray([42]);");
-        assertEquals(42, mTestObject.waitForCharArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setCharArray([42]);");
+        Assert.assertEquals(42, mTestObject.waitForCharArray()[0]);
 
-        executeJavaScript("testObject.setShortArray([42]);");
-        assertEquals(42, mTestObject.waitForShortArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setShortArray([42]);");
+        Assert.assertEquals(42, mTestObject.waitForShortArray()[0]);
 
-        executeJavaScript("testObject.setIntArray([42]);");
-        assertEquals(42, mTestObject.waitForIntArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setIntArray([42]);");
+        Assert.assertEquals(42, mTestObject.waitForIntArray()[0]);
 
-        executeJavaScript("testObject.setLongArray([42]);");
-        assertEquals(42L, mTestObject.waitForLongArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setLongArray([42]);");
+        Assert.assertEquals(42L, mTestObject.waitForLongArray()[0]);
 
-        executeJavaScript("testObject.setFloatArray([42]);");
-        assertEquals(42.0f, mTestObject.waitForFloatArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setFloatArray([42]);");
+        Assert.assertEquals(42.0f, mTestObject.waitForFloatArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setDoubleArray([42]);");
-        assertEquals(42.0, mTestObject.waitForDoubleArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setDoubleArray([42]);");
+        Assert.assertEquals(42.0, mTestObject.waitForDoubleArray()[0], ASSERTION_DELTA);
 
         // LIVECONNECT_COMPLIANCE: Should create array and create instances of java.lang.Number.
-        executeJavaScript("testObject.setObjectArray([42]);");
-        assertNull(mTestObject.waitForObjectArray());
+        mActivityTestRule.executeJavaScript("testObject.setObjectArray([42]);");
+        Assert.assertNull(mTestObject.waitForObjectArray());
 
         // LIVECONNECT_COMPLIANCE: Should create instances of java.lang.String.
-        executeJavaScript("testObject.setStringArray([42]);");
-        assertNull(mTestObject.waitForStringArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setStringArray([42]);");
+        Assert.assertNull(mTestObject.waitForStringArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setCustomTypeArray([42]);");
-        assertNull(mTestObject.waitForCustomTypeArray());
+        mActivityTestRule.executeJavaScript("testObject.setCustomTypeArray([42]);");
+        Assert.assertNull(mTestObject.waitForCustomTypeArray());
     }
 
     // Test passing an array of JavaScript numbers in the double range to a
     // method which takes a Java array.
+    @Test
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassNumberDouble() throws Throwable {
         // LIVECONNECT_COMPLIANCE: Should convert to boolean.
-        executeJavaScript("testObject.setBooleanArray([42.1]);");
-        assertFalse(mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setBooleanArray([42.1]);");
+        Assert.assertFalse(mTestObject.waitForBooleanArray()[0]);
 
-        executeJavaScript("testObject.setByteArray([42.1]);");
-        assertEquals(42, mTestObject.waitForByteArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setByteArray([42.1]);");
+        Assert.assertEquals(42, mTestObject.waitForByteArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should convert to numeric char value.
-        executeJavaScript("testObject.setCharArray([42.1]);");
-        assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setCharArray([42.1]);");
+        Assert.assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
 
-        executeJavaScript("testObject.setShortArray([42.1]);");
-        assertEquals(42, mTestObject.waitForShortArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setShortArray([42.1]);");
+        Assert.assertEquals(42, mTestObject.waitForShortArray()[0]);
 
-        executeJavaScript("testObject.setIntArray([42.1]);");
-        assertEquals(42, mTestObject.waitForIntArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setIntArray([42.1]);");
+        Assert.assertEquals(42, mTestObject.waitForIntArray()[0]);
 
-        executeJavaScript("testObject.setLongArray([42.1]);");
-        assertEquals(42L, mTestObject.waitForLongArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setLongArray([42.1]);");
+        Assert.assertEquals(42L, mTestObject.waitForLongArray()[0]);
 
-        executeJavaScript("testObject.setFloatArray([42.1]);");
-        assertEquals(42.1f, mTestObject.waitForFloatArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setFloatArray([42.1]);");
+        Assert.assertEquals(42.1f, mTestObject.waitForFloatArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setDoubleArray([42.1]);");
-        assertEquals(42.1, mTestObject.waitForDoubleArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setDoubleArray([42.1]);");
+        Assert.assertEquals(42.1, mTestObject.waitForDoubleArray()[0], ASSERTION_DELTA);
 
         // LIVECONNECT_COMPLIANCE: Should create array and create instances of java.lang.Number.
-        executeJavaScript("testObject.setObjectArray([42.1]);");
-        assertNull(mTestObject.waitForObjectArray());
+        mActivityTestRule.executeJavaScript("testObject.setObjectArray([42.1]);");
+        Assert.assertNull(mTestObject.waitForObjectArray());
 
         // LIVECONNECT_COMPLIANCE: Should create instances of java.lang.String.
-        executeJavaScript("testObject.setStringArray([42.1]);");
-        assertNull(mTestObject.waitForStringArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setStringArray([42.1]);");
+        Assert.assertNull(mTestObject.waitForStringArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setCustomTypeArray([42.1]);");
-        assertNull(mTestObject.waitForCustomTypeArray());
+        mActivityTestRule.executeJavaScript("testObject.setCustomTypeArray([42.1]);");
+        Assert.assertNull(mTestObject.waitForCustomTypeArray());
     }
 
     // Test passing an array of JavaScript NaN values to a method which takes a
     // Java array.
+    @Test
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassNumberNaN() throws Throwable {
-        executeJavaScript("testObject.setBooleanArray([Number.NaN]);");
-        assertFalse(mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setBooleanArray([Number.NaN]);");
+        Assert.assertFalse(mTestObject.waitForBooleanArray()[0]);
 
-        executeJavaScript("testObject.setByteArray([Number.NaN]);");
-        assertEquals(0, mTestObject.waitForByteArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setByteArray([Number.NaN]);");
+        Assert.assertEquals(0, mTestObject.waitForByteArray()[0]);
 
-        executeJavaScript("testObject.setCharArray([Number.NaN]);");
-        assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setCharArray([Number.NaN]);");
+        Assert.assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
 
-        executeJavaScript("testObject.setShortArray([Number.NaN]);");
-        assertEquals(0, mTestObject.waitForShortArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setShortArray([Number.NaN]);");
+        Assert.assertEquals(0, mTestObject.waitForShortArray()[0]);
 
-        executeJavaScript("testObject.setIntArray([Number.NaN]);");
-        assertEquals(0, mTestObject.waitForIntArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setIntArray([Number.NaN]);");
+        Assert.assertEquals(0, mTestObject.waitForIntArray()[0]);
 
-        executeJavaScript("testObject.setLongArray([Number.NaN]);");
-        assertEquals(0L, mTestObject.waitForLongArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setLongArray([Number.NaN]);");
+        Assert.assertEquals(0L, mTestObject.waitForLongArray()[0]);
 
-        executeJavaScript("testObject.setFloatArray([Number.NaN]);");
-        assertEquals(Float.NaN, mTestObject.waitForFloatArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setFloatArray([Number.NaN]);");
+        Assert.assertEquals(Float.NaN, mTestObject.waitForFloatArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setDoubleArray([Number.NaN]);");
-        assertEquals(Double.NaN, mTestObject.waitForDoubleArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setDoubleArray([Number.NaN]);");
+        Assert.assertEquals(Double.NaN, mTestObject.waitForDoubleArray()[0], ASSERTION_DELTA);
 
         // LIVECONNECT_COMPLIANCE: Should create array and create instances of java.lang.Number.
-        executeJavaScript("testObject.setObjectArray([Number.NaN]);");
-        assertNull(mTestObject.waitForObjectArray());
+        mActivityTestRule.executeJavaScript("testObject.setObjectArray([Number.NaN]);");
+        Assert.assertNull(mTestObject.waitForObjectArray());
 
         // LIVECONNECT_COMPLIANCE: Should create instances of java.lang.String.
-        executeJavaScript("testObject.setStringArray([Number.NaN]);");
-        assertNull(mTestObject.waitForStringArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setStringArray([Number.NaN]);");
+        Assert.assertNull(mTestObject.waitForStringArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setCustomTypeArray([Number.NaN]);");
-        assertNull(mTestObject.waitForCustomTypeArray());
+        mActivityTestRule.executeJavaScript("testObject.setCustomTypeArray([Number.NaN]);");
+        Assert.assertNull(mTestObject.waitForCustomTypeArray());
     }
 
     // Test passing an array of JavaScript infinity values to a method which
     // takes a Java array.
+    @Test
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassNumberInfinity() throws Throwable {
-        executeJavaScript("testObject.setBooleanArray([Infinity]);");
-        assertFalse(mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setBooleanArray([Infinity]);");
+        Assert.assertFalse(mTestObject.waitForBooleanArray()[0]);
 
-        executeJavaScript("testObject.setByteArray([Infinity]);");
-        assertEquals(-1, mTestObject.waitForByteArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setByteArray([Infinity]);");
+        Assert.assertEquals(-1, mTestObject.waitForByteArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should convert to maximum numeric char value.
-        executeJavaScript("testObject.setCharArray([Infinity]);");
-        assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setCharArray([Infinity]);");
+        Assert.assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
 
-        executeJavaScript("testObject.setShortArray([Infinity]);");
-        assertEquals(-1, mTestObject.waitForShortArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setShortArray([Infinity]);");
+        Assert.assertEquals(-1, mTestObject.waitForShortArray()[0]);
 
-        executeJavaScript("testObject.setIntArray([Infinity]);");
-        assertEquals(Integer.MAX_VALUE, mTestObject.waitForIntArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setIntArray([Infinity]);");
+        Assert.assertEquals(Integer.MAX_VALUE, mTestObject.waitForIntArray()[0]);
 
-        executeJavaScript("testObject.setLongArray([Infinity]);");
-        assertEquals(Long.MAX_VALUE, mTestObject.waitForLongArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setLongArray([Infinity]);");
+        Assert.assertEquals(Long.MAX_VALUE, mTestObject.waitForLongArray()[0]);
 
-        executeJavaScript("testObject.setFloatArray([Infinity]);");
-        assertEquals(Float.POSITIVE_INFINITY, mTestObject.waitForFloatArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setFloatArray([Infinity]);");
+        Assert.assertEquals(
+                Float.POSITIVE_INFINITY, mTestObject.waitForFloatArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setDoubleArray([Infinity]);");
-        assertEquals(Double.POSITIVE_INFINITY, mTestObject.waitForDoubleArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setDoubleArray([Infinity]);");
+        Assert.assertEquals(
+                Double.POSITIVE_INFINITY, mTestObject.waitForDoubleArray()[0], ASSERTION_DELTA);
 
         // LIVECONNECT_COMPLIANCE: Should create array and create instances of java.lang.Number.
-        executeJavaScript("testObject.setObjectArray([Infinity]);");
-        assertNull(mTestObject.waitForObjectArray());
+        mActivityTestRule.executeJavaScript("testObject.setObjectArray([Infinity]);");
+        Assert.assertNull(mTestObject.waitForObjectArray());
 
         // LIVECONNECT_COMPLIANCE: Should create instances of java.lang.String.
-        executeJavaScript("testObject.setStringArray([Infinity]);");
-        assertNull(mTestObject.waitForStringArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setStringArray([Infinity]);");
+        Assert.assertNull(mTestObject.waitForStringArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setCustomTypeArray([Infinity]);");
-        assertNull(mTestObject.waitForCustomTypeArray());
+        mActivityTestRule.executeJavaScript("testObject.setCustomTypeArray([Infinity]);");
+        Assert.assertNull(mTestObject.waitForCustomTypeArray());
     }
 
     // Test passing an array of JavaScript boolean values to a method which
     // takes a Java array.
+    @Test
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassBoolean() throws Throwable {
-        executeJavaScript("testObject.setBooleanArray([true]);");
-        assertTrue(mTestObject.waitForBooleanArray()[0]);
-        executeJavaScript("testObject.setBooleanArray([false]);");
-        assertFalse(mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setBooleanArray([true]);");
+        Assert.assertTrue(mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setBooleanArray([false]);");
+        Assert.assertFalse(mTestObject.waitForBooleanArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should be 1.
-        executeJavaScript("testObject.setByteArray([true]);");
-        assertEquals(0, mTestObject.waitForByteArray()[0]);
-        executeJavaScript("testObject.setByteArray([false]);");
-        assertEquals(0, mTestObject.waitForByteArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setByteArray([true]);");
+        Assert.assertEquals(0, mTestObject.waitForByteArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setByteArray([false]);");
+        Assert.assertEquals(0, mTestObject.waitForByteArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should convert to numeric char value 1.
-        executeJavaScript("testObject.setCharArray([true]);");
-        assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
-        executeJavaScript("testObject.setCharArray([false]);");
-        assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setCharArray([true]);");
+        Assert.assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setCharArray([false]);");
+        Assert.assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should be 1.
-        executeJavaScript("testObject.setShortArray([true]);");
-        assertEquals(0, mTestObject.waitForShortArray()[0]);
-        executeJavaScript("testObject.setShortArray([false]);");
-        assertEquals(0, mTestObject.waitForShortArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setShortArray([true]);");
+        Assert.assertEquals(0, mTestObject.waitForShortArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setShortArray([false]);");
+        Assert.assertEquals(0, mTestObject.waitForShortArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should be 1.
-        executeJavaScript("testObject.setIntArray([true]);");
-        assertEquals(0, mTestObject.waitForIntArray()[0]);
-        executeJavaScript("testObject.setIntArray([false]);");
-        assertEquals(0, mTestObject.waitForIntArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setIntArray([true]);");
+        Assert.assertEquals(0, mTestObject.waitForIntArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setIntArray([false]);");
+        Assert.assertEquals(0, mTestObject.waitForIntArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should be 1.
-        executeJavaScript("testObject.setLongArray([true]);");
-        assertEquals(0L, mTestObject.waitForLongArray()[0]);
-        executeJavaScript("testObject.setLongArray([false]);");
-        assertEquals(0L, mTestObject.waitForLongArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setLongArray([true]);");
+        Assert.assertEquals(0L, mTestObject.waitForLongArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setLongArray([false]);");
+        Assert.assertEquals(0L, mTestObject.waitForLongArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should be 1.0.
-        executeJavaScript("testObject.setFloatArray([true]);");
-        assertEquals(0.0f, mTestObject.waitForFloatArray()[0]);
-        executeJavaScript("testObject.setFloatArray([false]);");
-        assertEquals(0.0f, mTestObject.waitForFloatArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setFloatArray([true]);");
+        Assert.assertEquals(0.0f, mTestObject.waitForFloatArray()[0], ASSERTION_DELTA);
+        mActivityTestRule.executeJavaScript("testObject.setFloatArray([false]);");
+        Assert.assertEquals(0.0f, mTestObject.waitForFloatArray()[0], ASSERTION_DELTA);
 
         // LIVECONNECT_COMPLIANCE: Should be 1.0.
-        executeJavaScript("testObject.setDoubleArray([true]);");
-        assertEquals(0.0, mTestObject.waitForDoubleArray()[0]);
-        executeJavaScript("testObject.setDoubleArray([false]);");
-        assertEquals(0.0, mTestObject.waitForDoubleArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setDoubleArray([true]);");
+        Assert.assertEquals(0.0, mTestObject.waitForDoubleArray()[0], ASSERTION_DELTA);
+        mActivityTestRule.executeJavaScript("testObject.setDoubleArray([false]);");
+        Assert.assertEquals(0.0, mTestObject.waitForDoubleArray()[0], ASSERTION_DELTA);
 
         // LIVECONNECT_COMPLIANCE: Should create array and create instances of java.lang.Number.
-        executeJavaScript("testObject.setObjectArray([true]);");
-        assertNull(mTestObject.waitForObjectArray());
+        mActivityTestRule.executeJavaScript("testObject.setObjectArray([true]);");
+        Assert.assertNull(mTestObject.waitForObjectArray());
 
         // LIVECONNECT_COMPLIANCE: Should create instances of java.lang.String.
-        executeJavaScript("testObject.setStringArray([true]);");
-        assertNull(mTestObject.waitForStringArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setStringArray([true]);");
+        Assert.assertNull(mTestObject.waitForStringArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setCustomTypeArray([true]);");
-        assertNull(mTestObject.waitForCustomTypeArray());
+        mActivityTestRule.executeJavaScript("testObject.setCustomTypeArray([true]);");
+        Assert.assertNull(mTestObject.waitForCustomTypeArray());
     }
 
     // Test passing an array of JavaScript strings to a method which takes a
     // Java array.
+    @Test
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassString() throws Throwable {
         // LIVECONNECT_COMPLIANCE: Non-empty string should convert to true.
-        executeJavaScript("testObject.setBooleanArray([\"+042.10\"]);");
-        assertFalse(mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setBooleanArray([\"+042.10\"]);");
+        Assert.assertFalse(mTestObject.waitForBooleanArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should use valueOf() of appropriate type.
-        executeJavaScript("testObject.setByteArray([\"+042.10\"]);");
-        assertEquals(0, mTestObject.waitForByteArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setByteArray([\"+042.10\"]);");
+        Assert.assertEquals(0, mTestObject.waitForByteArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should decode and convert to numeric char value.
-        executeJavaScript("testObject.setCharArray([\"+042.10\"]);");
-        assertEquals(0, mTestObject.waitForCharArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setCharArray([\"+042.10\"]);");
+        Assert.assertEquals(0, mTestObject.waitForCharArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should use valueOf() of appropriate type.
-        executeJavaScript("testObject.setShortArray([\"+042.10\"]);");
-        assertEquals(0, mTestObject.waitForShortArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setShortArray([\"+042.10\"]);");
+        Assert.assertEquals(0, mTestObject.waitForShortArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should use valueOf() of appropriate type.
-        executeJavaScript("testObject.setIntArray([\"+042.10\"]);");
-        assertEquals(0, mTestObject.waitForIntArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setIntArray([\"+042.10\"]);");
+        Assert.assertEquals(0, mTestObject.waitForIntArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should use valueOf() of appropriate type.
-        executeJavaScript("testObject.setLongArray([\"+042.10\"]);");
-        assertEquals(0L, mTestObject.waitForLongArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setLongArray([\"+042.10\"]);");
+        Assert.assertEquals(0L, mTestObject.waitForLongArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should use valueOf() of appropriate type.
-        executeJavaScript("testObject.setFloatArray([\"+042.10\"]);");
-        assertEquals(0.0f, mTestObject.waitForFloatArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setFloatArray([\"+042.10\"]);");
+        Assert.assertEquals(0.0f, mTestObject.waitForFloatArray()[0], ASSERTION_DELTA);
 
         // LIVECONNECT_COMPLIANCE: Should use valueOf() of appropriate type.
-        executeJavaScript("testObject.setDoubleArray([\"+042.10\"]);");
-        assertEquals(0.0, mTestObject.waitForDoubleArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setDoubleArray([\"+042.10\"]);");
+        Assert.assertEquals(0.0, mTestObject.waitForDoubleArray()[0], ASSERTION_DELTA);
 
         // LIVECONNECT_COMPLIANCE: Should create array and create instances of java.lang.Number.
-        executeJavaScript("testObject.setObjectArray([\"+042.10\"]);");
-        assertNull(mTestObject.waitForObjectArray());
+        mActivityTestRule.executeJavaScript("testObject.setObjectArray([\"+042.10\"]);");
+        Assert.assertNull(mTestObject.waitForObjectArray());
 
-        executeJavaScript("testObject.setStringArray([\"+042.10\"]);");
-        assertEquals("+042.10", mTestObject.waitForStringArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setStringArray([\"+042.10\"]);");
+        Assert.assertEquals("+042.10", mTestObject.waitForStringArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setCustomTypeArray([\"+042.10\"]);");
-        assertNull(mTestObject.waitForCustomTypeArray());
+        mActivityTestRule.executeJavaScript("testObject.setCustomTypeArray([\"+042.10\"]);");
+        Assert.assertNull(mTestObject.waitForCustomTypeArray());
     }
 
     // Test passing an array of JavaScript objects to a method which takes a
     // Java array.
+    @Test
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassJavaScriptObject() throws Throwable {
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setBooleanArray([{foo: 42}]);");
-        assertFalse(mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setBooleanArray([{foo: 42}]);");
+        Assert.assertFalse(mTestObject.waitForBooleanArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setByteArray([{foo: 42}]);");
-        assertEquals(0, mTestObject.waitForByteArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setByteArray([{foo: 42}]);");
+        Assert.assertEquals(0, mTestObject.waitForByteArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setCharArray([{foo: 42}]);");
-        assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setCharArray([{foo: 42}]);");
+        Assert.assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setShortArray([{foo: 42}]);");
-        assertEquals(0, mTestObject.waitForShortArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setShortArray([{foo: 42}]);");
+        Assert.assertEquals(0, mTestObject.waitForShortArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setIntArray([{foo: 42}]);");
-        assertEquals(0, mTestObject.waitForIntArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setIntArray([{foo: 42}]);");
+        Assert.assertEquals(0, mTestObject.waitForIntArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setLongArray([{foo: 42}]);");
-        assertEquals(0L, mTestObject.waitForLongArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setLongArray([{foo: 42}]);");
+        Assert.assertEquals(0L, mTestObject.waitForLongArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setFloatArray([{foo: 42}]);");
-        assertEquals(0.0f, mTestObject.waitForFloatArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setFloatArray([{foo: 42}]);");
+        Assert.assertEquals(0.0f, mTestObject.waitForFloatArray()[0], ASSERTION_DELTA);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setDoubleArray([{foo: 42}]);");
-        assertEquals(0.0, mTestObject.waitForDoubleArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setDoubleArray([{foo: 42}]);");
+        Assert.assertEquals(0.0, mTestObject.waitForDoubleArray()[0], ASSERTION_DELTA);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setObjectArray([{foo: 42}]);");
-        assertNull(mTestObject.waitForObjectArray());
+        mActivityTestRule.executeJavaScript("testObject.setObjectArray([{foo: 42}]);");
+        Assert.assertNull(mTestObject.waitForObjectArray());
 
         // LIVECONNECT_COMPLIANCE: Should call toString() on object.
-        executeJavaScript("testObject.setStringArray([{foo: 42}]);");
-        assertNull(mTestObject.waitForStringArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setStringArray([{foo: 42}]);");
+        Assert.assertNull(mTestObject.waitForStringArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setCustomTypeArray([{foo: 42}]);");
-        assertNull(mTestObject.waitForCustomTypeArray());
+        mActivityTestRule.executeJavaScript("testObject.setCustomTypeArray([{foo: 42}]);");
+        Assert.assertNull(mTestObject.waitForCustomTypeArray());
     }
 
     // Test passing an array of Java objects to a method which takes a Java
     // array.
+    @Test
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassJavaObject() throws Throwable {
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setBooleanArray([testObject.getObjectInstance()]);");
-        assertFalse(mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript(
+                "testObject.setBooleanArray([testObject.getObjectInstance()]);");
+        Assert.assertFalse(mTestObject.waitForBooleanArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setByteArray([testObject.getObjectInstance()]);");
-        assertEquals(0, mTestObject.waitForByteArray()[0]);
+        mActivityTestRule.executeJavaScript(
+                "testObject.setByteArray([testObject.getObjectInstance()]);");
+        Assert.assertEquals(0, mTestObject.waitForByteArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setCharArray([testObject.getObjectInstance()]);");
-        assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
+        mActivityTestRule.executeJavaScript(
+                "testObject.setCharArray([testObject.getObjectInstance()]);");
+        Assert.assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setShortArray([testObject.getObjectInstance()]);");
-        assertEquals(0, mTestObject.waitForShortArray()[0]);
+        mActivityTestRule.executeJavaScript(
+                "testObject.setShortArray([testObject.getObjectInstance()]);");
+        Assert.assertEquals(0, mTestObject.waitForShortArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setIntArray([testObject.getObjectInstance()]);");
-        assertEquals(0, mTestObject.waitForIntArray()[0]);
+        mActivityTestRule.executeJavaScript(
+                "testObject.setIntArray([testObject.getObjectInstance()]);");
+        Assert.assertEquals(0, mTestObject.waitForIntArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setLongArray([testObject.getObjectInstance()]);");
-        assertEquals(0L, mTestObject.waitForLongArray()[0]);
+        mActivityTestRule.executeJavaScript(
+                "testObject.setLongArray([testObject.getObjectInstance()]);");
+        Assert.assertEquals(0L, mTestObject.waitForLongArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setFloatArray([testObject.getObjectInstance()]);");
-        assertEquals(0.0f, mTestObject.waitForFloatArray()[0]);
+        mActivityTestRule.executeJavaScript(
+                "testObject.setFloatArray([testObject.getObjectInstance()]);");
+        Assert.assertEquals(0.0f, mTestObject.waitForFloatArray()[0], ASSERTION_DELTA);
 
         // LIVECONNECT_COMPLIANCE: Should raise a JavaScript exception.
-        executeJavaScript("testObject.setDoubleArray([testObject.getObjectInstance()]);");
-        assertEquals(0.0, mTestObject.waitForDoubleArray()[0]);
+        mActivityTestRule.executeJavaScript(
+                "testObject.setDoubleArray([testObject.getObjectInstance()]);");
+        Assert.assertEquals(0.0, mTestObject.waitForDoubleArray()[0], ASSERTION_DELTA);
 
         // LIVECONNECT_COMPLIANCE: Should create an array and pass Java object.
-        executeJavaScript("testObject.setObjectArray([testObject.getObjectInstance()]);");
-        assertNull(mTestObject.waitForObjectArray());
+        mActivityTestRule.executeJavaScript(
+                "testObject.setObjectArray([testObject.getObjectInstance()]);");
+        Assert.assertNull(mTestObject.waitForObjectArray());
 
         // LIVECONNECT_COMPLIANCE: Should call toString() on object.
-        executeJavaScript("testObject.setStringArray([testObject.getObjectInstance()]);");
-        assertNull(mTestObject.waitForStringArray()[0]);
+        mActivityTestRule.executeJavaScript(
+                "testObject.setStringArray([testObject.getObjectInstance()]);");
+        Assert.assertNull(mTestObject.waitForStringArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should create array and pass Java object.
-        executeJavaScript("testObject.setCustomTypeArray([testObject.getObjectInstance()]);");
-        assertNull(mTestObject.waitForCustomTypeArray());
-        executeJavaScript("testObject.setCustomTypeArray([testObject.getCustomTypeInstance()]);");
-        assertNull(mTestObject.waitForCustomTypeArray());
+        mActivityTestRule.executeJavaScript(
+                "testObject.setCustomTypeArray([testObject.getObjectInstance()]);");
+        Assert.assertNull(mTestObject.waitForCustomTypeArray());
+        mActivityTestRule.executeJavaScript(
+                "testObject.setCustomTypeArray([testObject.getCustomTypeInstance()]);");
+        Assert.assertNull(mTestObject.waitForCustomTypeArray());
     }
 
     // Test passing an array of JavaScript null values to a method which takes
     // a Java array.
+    @Test
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassNull() throws Throwable {
-        executeJavaScript("testObject.setByteArray([null]);");
-        assertEquals(0, mTestObject.waitForByteArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setByteArray([null]);");
+        Assert.assertEquals(0, mTestObject.waitForByteArray()[0]);
 
-        executeJavaScript("testObject.setCharArray([null]);");
-        assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setCharArray([null]);");
+        Assert.assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
 
-        executeJavaScript("testObject.setShortArray([null]);");
-        assertEquals(0, mTestObject.waitForShortArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setShortArray([null]);");
+        Assert.assertEquals(0, mTestObject.waitForShortArray()[0]);
 
-        executeJavaScript("testObject.setIntArray([null]);");
-        assertEquals(0, mTestObject.waitForIntArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setIntArray([null]);");
+        Assert.assertEquals(0, mTestObject.waitForIntArray()[0]);
 
-        executeJavaScript("testObject.setLongArray([null]);");
-        assertEquals(0L, mTestObject.waitForLongArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setLongArray([null]);");
+        Assert.assertEquals(0L, mTestObject.waitForLongArray()[0]);
 
-        executeJavaScript("testObject.setFloatArray([null]);");
-        assertEquals(0.0f, mTestObject.waitForFloatArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setFloatArray([null]);");
+        Assert.assertEquals(0.0f, mTestObject.waitForFloatArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setDoubleArray([null]);");
-        assertEquals(0.0, mTestObject.waitForDoubleArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setDoubleArray([null]);");
+        Assert.assertEquals(0.0, mTestObject.waitForDoubleArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setBooleanArray([null]);");
-        assertFalse(mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setBooleanArray([null]);");
+        Assert.assertFalse(mTestObject.waitForBooleanArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should create array and pass null.
-        executeJavaScript("testObject.setObjectArray([null]);");
-        assertNull(mTestObject.waitForObjectArray());
+        mActivityTestRule.executeJavaScript("testObject.setObjectArray([null]);");
+        Assert.assertNull(mTestObject.waitForObjectArray());
 
-        executeJavaScript("testObject.setStringArray([null]);");
-        assertNull(mTestObject.waitForStringArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setStringArray([null]);");
+        Assert.assertNull(mTestObject.waitForStringArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should create array and pass null.
-        executeJavaScript("testObject.setCustomTypeArray([null]);");
-        assertNull(mTestObject.waitForCustomTypeArray());
+        mActivityTestRule.executeJavaScript("testObject.setCustomTypeArray([null]);");
+        Assert.assertNull(mTestObject.waitForCustomTypeArray());
     }
 
     // Test passing an array of JavaScript undefined values to a method which
     // takes a Java array.
+    @Test
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassUndefined() throws Throwable {
-        executeJavaScript("testObject.setByteArray([undefined]);");
-        assertEquals(0, mTestObject.waitForByteArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setByteArray([undefined]);");
+        Assert.assertEquals(0, mTestObject.waitForByteArray()[0]);
 
-        executeJavaScript("testObject.setCharArray([undefined]);");
-        assertEquals(0, mTestObject.waitForCharArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setCharArray([undefined]);");
+        Assert.assertEquals(0, mTestObject.waitForCharArray()[0]);
 
-        executeJavaScript("testObject.setShortArray([undefined]);");
-        assertEquals(0, mTestObject.waitForShortArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setShortArray([undefined]);");
+        Assert.assertEquals(0, mTestObject.waitForShortArray()[0]);
 
-        executeJavaScript("testObject.setIntArray([undefined]);");
-        assertEquals(0, mTestObject.waitForIntArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setIntArray([undefined]);");
+        Assert.assertEquals(0, mTestObject.waitForIntArray()[0]);
 
-        executeJavaScript("testObject.setLongArray([undefined]);");
-        assertEquals(0L, mTestObject.waitForLongArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setLongArray([undefined]);");
+        Assert.assertEquals(0L, mTestObject.waitForLongArray()[0]);
 
-        executeJavaScript("testObject.setFloatArray([undefined]);");
-        assertEquals(0.0f, mTestObject.waitForFloatArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setFloatArray([undefined]);");
+        Assert.assertEquals(0.0f, mTestObject.waitForFloatArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setDoubleArray([undefined]);");
-        assertEquals(0.0, mTestObject.waitForDoubleArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setDoubleArray([undefined]);");
+        Assert.assertEquals(0.0, mTestObject.waitForDoubleArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setBooleanArray([undefined]);");
-        assertEquals(false, mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setBooleanArray([undefined]);");
+        Assert.assertEquals(false, mTestObject.waitForBooleanArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should create array and pass null.
-        executeJavaScript("testObject.setObjectArray([undefined]);");
-        assertNull(mTestObject.waitForObjectArray());
+        mActivityTestRule.executeJavaScript("testObject.setObjectArray([undefined]);");
+        Assert.assertNull(mTestObject.waitForObjectArray());
 
-        executeJavaScript("testObject.setStringArray([undefined]);");
-        assertNull(mTestObject.waitForStringArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setStringArray([undefined]);");
+        Assert.assertNull(mTestObject.waitForStringArray()[0]);
 
         // LIVECONNECT_COMPLIANCE: Should create array and pass null.
-        executeJavaScript("testObject.setCustomTypeArray([undefined]);");
-        assertNull(mTestObject.waitForCustomTypeArray());
+        mActivityTestRule.executeJavaScript("testObject.setCustomTypeArray([undefined]);");
+        Assert.assertNull(mTestObject.waitForCustomTypeArray());
     }
 
     // Test passing a typed Int8Array to a method which takes a Java array.
+    @Test
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassInt8Array() throws Throwable {
-        executeJavaScript("buffer = new ArrayBuffer(1);");
-        executeJavaScript("int8_array = new Int8Array(buffer);");
-        executeJavaScript("int8_array[0] = 42;");
+        mActivityTestRule.executeJavaScript("buffer = new ArrayBuffer(1);");
+        mActivityTestRule.executeJavaScript("int8_array = new Int8Array(buffer);");
+        mActivityTestRule.executeJavaScript("int8_array[0] = 42;");
 
-        executeJavaScript("testObject.setBooleanArray(int8_array);");
-        assertFalse(mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setBooleanArray(int8_array);");
+        Assert.assertFalse(mTestObject.waitForBooleanArray()[0]);
 
-        executeJavaScript("testObject.setByteArray(int8_array);");
-        assertEquals(42, mTestObject.waitForByteArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setByteArray(int8_array);");
+        Assert.assertEquals(42, mTestObject.waitForByteArray()[0]);
 
-        executeJavaScript("testObject.setCharArray(int8_array);");
-        assertEquals(42, mTestObject.waitForCharArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setCharArray(int8_array);");
+        Assert.assertEquals(42, mTestObject.waitForCharArray()[0]);
 
-        executeJavaScript("testObject.setShortArray(int8_array);");
-        assertEquals(42, mTestObject.waitForShortArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setShortArray(int8_array);");
+        Assert.assertEquals(42, mTestObject.waitForShortArray()[0]);
 
-        executeJavaScript("testObject.setIntArray(int8_array);");
-        assertEquals(42, mTestObject.waitForIntArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setIntArray(int8_array);");
+        Assert.assertEquals(42, mTestObject.waitForIntArray()[0]);
 
-        executeJavaScript("testObject.setLongArray(int8_array);");
-        assertEquals(42L, mTestObject.waitForLongArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setLongArray(int8_array);");
+        Assert.assertEquals(42L, mTestObject.waitForLongArray()[0]);
 
-        executeJavaScript("testObject.setFloatArray(int8_array);");
-        assertEquals(42.0f, mTestObject.waitForFloatArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setFloatArray(int8_array);");
+        Assert.assertEquals(42.0f, mTestObject.waitForFloatArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setDoubleArray(int8_array);");
-        assertEquals(42.0, mTestObject.waitForDoubleArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setDoubleArray(int8_array);");
+        Assert.assertEquals(42.0, mTestObject.waitForDoubleArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setObjectArray(int8_array);");
-        assertNull(mTestObject.waitForObjectArray());
+        mActivityTestRule.executeJavaScript("testObject.setObjectArray(int8_array);");
+        Assert.assertNull(mTestObject.waitForObjectArray());
 
-        executeJavaScript("testObject.setStringArray(int8_array);");
-        assertNull(mTestObject.waitForStringArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setStringArray(int8_array);");
+        Assert.assertNull(mTestObject.waitForStringArray()[0]);
 
-        executeJavaScript("testObject.setCustomTypeArray(int8_array);");
-        assertNull(mTestObject.waitForCustomTypeArray());
+        mActivityTestRule.executeJavaScript("testObject.setCustomTypeArray(int8_array);");
+        Assert.assertNull(mTestObject.waitForCustomTypeArray());
     }
 
     // Test passing a typed Uint8Array to a method which takes a Java array.
+    @Test
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassUint8Array() throws Throwable {
-        executeJavaScript("buffer = new ArrayBuffer(1);");
-        executeJavaScript("uint8_array = new Uint8Array(buffer);");
-        executeJavaScript("uint8_array[0] = 42;");
+        mActivityTestRule.executeJavaScript("buffer = new ArrayBuffer(1);");
+        mActivityTestRule.executeJavaScript("uint8_array = new Uint8Array(buffer);");
+        mActivityTestRule.executeJavaScript("uint8_array[0] = 42;");
 
-        executeJavaScript("testObject.setBooleanArray(uint8_array);");
-        assertFalse(mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setBooleanArray(uint8_array);");
+        Assert.assertFalse(mTestObject.waitForBooleanArray()[0]);
 
-        executeJavaScript("testObject.setByteArray(uint8_array);");
-        assertEquals(42, mTestObject.waitForByteArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setByteArray(uint8_array);");
+        Assert.assertEquals(42, mTestObject.waitForByteArray()[0]);
 
-        executeJavaScript("testObject.setCharArray(uint8_array);");
-        assertEquals(42, mTestObject.waitForCharArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setCharArray(uint8_array);");
+        Assert.assertEquals(42, mTestObject.waitForCharArray()[0]);
 
-        executeJavaScript("testObject.setShortArray(uint8_array);");
-        assertEquals(42, mTestObject.waitForShortArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setShortArray(uint8_array);");
+        Assert.assertEquals(42, mTestObject.waitForShortArray()[0]);
 
-        executeJavaScript("testObject.setIntArray(uint8_array);");
-        assertEquals(42, mTestObject.waitForIntArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setIntArray(uint8_array);");
+        Assert.assertEquals(42, mTestObject.waitForIntArray()[0]);
 
-        executeJavaScript("testObject.setLongArray(uint8_array);");
-        assertEquals(42L, mTestObject.waitForLongArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setLongArray(uint8_array);");
+        Assert.assertEquals(42L, mTestObject.waitForLongArray()[0]);
 
-        executeJavaScript("testObject.setFloatArray(uint8_array);");
-        assertEquals(42.0f, mTestObject.waitForFloatArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setFloatArray(uint8_array);");
+        Assert.assertEquals(42.0f, mTestObject.waitForFloatArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setDoubleArray(uint8_array);");
-        assertEquals(42.0, mTestObject.waitForDoubleArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setDoubleArray(uint8_array);");
+        Assert.assertEquals(42.0, mTestObject.waitForDoubleArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setObjectArray(uint8_array);");
-        assertNull(mTestObject.waitForObjectArray());
+        mActivityTestRule.executeJavaScript("testObject.setObjectArray(uint8_array);");
+        Assert.assertNull(mTestObject.waitForObjectArray());
 
-        executeJavaScript("testObject.setStringArray(uint8_array);");
-        assertNull(mTestObject.waitForStringArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setStringArray(uint8_array);");
+        Assert.assertNull(mTestObject.waitForStringArray()[0]);
 
-        executeJavaScript("testObject.setCustomTypeArray(uint8_array);");
-        assertNull(mTestObject.waitForCustomTypeArray());
+        mActivityTestRule.executeJavaScript("testObject.setCustomTypeArray(uint8_array);");
+        Assert.assertNull(mTestObject.waitForCustomTypeArray());
     }
 
     // Test passing a typed Int16Array to a method which takes a Java array.
+    @Test
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassInt16Array() throws Throwable {
-        executeJavaScript("buffer = new ArrayBuffer(2);");
-        executeJavaScript("int16_array = new Int16Array(buffer);");
-        executeJavaScript("int16_array[0] = 42;");
+        mActivityTestRule.executeJavaScript("buffer = new ArrayBuffer(2);");
+        mActivityTestRule.executeJavaScript("int16_array = new Int16Array(buffer);");
+        mActivityTestRule.executeJavaScript("int16_array[0] = 42;");
 
-        executeJavaScript("testObject.setBooleanArray(int16_array);");
-        assertFalse(mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setBooleanArray(int16_array);");
+        Assert.assertFalse(mTestObject.waitForBooleanArray()[0]);
 
-        executeJavaScript("testObject.setByteArray(int16_array);");
-        assertEquals(42, mTestObject.waitForByteArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setByteArray(int16_array);");
+        Assert.assertEquals(42, mTestObject.waitForByteArray()[0]);
 
-        executeJavaScript("testObject.setCharArray(int16_array);");
-        assertEquals(42, mTestObject.waitForCharArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setCharArray(int16_array);");
+        Assert.assertEquals(42, mTestObject.waitForCharArray()[0]);
 
-        executeJavaScript("testObject.setShortArray(int16_array);");
-        assertEquals(42, mTestObject.waitForShortArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setShortArray(int16_array);");
+        Assert.assertEquals(42, mTestObject.waitForShortArray()[0]);
 
-        executeJavaScript("testObject.setIntArray(int16_array);");
-        assertEquals(42, mTestObject.waitForIntArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setIntArray(int16_array);");
+        Assert.assertEquals(42, mTestObject.waitForIntArray()[0]);
 
-        executeJavaScript("testObject.setLongArray(int16_array);");
-        assertEquals(42L, mTestObject.waitForLongArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setLongArray(int16_array);");
+        Assert.assertEquals(42L, mTestObject.waitForLongArray()[0]);
 
-        executeJavaScript("testObject.setFloatArray(int16_array);");
-        assertEquals(42.0f, mTestObject.waitForFloatArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setFloatArray(int16_array);");
+        Assert.assertEquals(42.0f, mTestObject.waitForFloatArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setDoubleArray(int16_array);");
-        assertEquals(42.0, mTestObject.waitForDoubleArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setDoubleArray(int16_array);");
+        Assert.assertEquals(42.0, mTestObject.waitForDoubleArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setObjectArray(int16_array);");
-        assertNull(mTestObject.waitForObjectArray());
+        mActivityTestRule.executeJavaScript("testObject.setObjectArray(int16_array);");
+        Assert.assertNull(mTestObject.waitForObjectArray());
 
-        executeJavaScript("testObject.setStringArray(int16_array);");
-        assertNull(mTestObject.waitForStringArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setStringArray(int16_array);");
+        Assert.assertNull(mTestObject.waitForStringArray()[0]);
 
-        executeJavaScript("testObject.setCustomTypeArray(int16_array);");
-        assertNull(mTestObject.waitForCustomTypeArray());
+        mActivityTestRule.executeJavaScript("testObject.setCustomTypeArray(int16_array);");
+        Assert.assertNull(mTestObject.waitForCustomTypeArray());
     }
 
     // Test passing a typed Uint16Array to a method which takes a Java array.
+    @Test
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassUint16Array() throws Throwable {
-        executeJavaScript("buffer = new ArrayBuffer(2);");
-        executeJavaScript("uint16_array = new Uint16Array(buffer);");
-        executeJavaScript("uint16_array[0] = 42;");
+        mActivityTestRule.executeJavaScript("buffer = new ArrayBuffer(2);");
+        mActivityTestRule.executeJavaScript("uint16_array = new Uint16Array(buffer);");
+        mActivityTestRule.executeJavaScript("uint16_array[0] = 42;");
 
-        executeJavaScript("testObject.setBooleanArray(uint16_array);");
-        assertFalse(mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setBooleanArray(uint16_array);");
+        Assert.assertFalse(mTestObject.waitForBooleanArray()[0]);
 
-        executeJavaScript("testObject.setByteArray(uint16_array);");
-        assertEquals(42, mTestObject.waitForByteArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setByteArray(uint16_array);");
+        Assert.assertEquals(42, mTestObject.waitForByteArray()[0]);
 
-        executeJavaScript("testObject.setCharArray(uint16_array);");
-        assertEquals(42, mTestObject.waitForCharArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setCharArray(uint16_array);");
+        Assert.assertEquals(42, mTestObject.waitForCharArray()[0]);
 
-        executeJavaScript("testObject.setShortArray(uint16_array);");
-        assertEquals(42, mTestObject.waitForShortArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setShortArray(uint16_array);");
+        Assert.assertEquals(42, mTestObject.waitForShortArray()[0]);
 
-        executeJavaScript("testObject.setIntArray(uint16_array);");
-        assertEquals(42, mTestObject.waitForIntArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setIntArray(uint16_array);");
+        Assert.assertEquals(42, mTestObject.waitForIntArray()[0]);
 
-        executeJavaScript("testObject.setLongArray(uint16_array);");
-        assertEquals(42L, mTestObject.waitForLongArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setLongArray(uint16_array);");
+        Assert.assertEquals(42L, mTestObject.waitForLongArray()[0]);
 
-        executeJavaScript("testObject.setFloatArray(uint16_array);");
-        assertEquals(42.0f, mTestObject.waitForFloatArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setFloatArray(uint16_array);");
+        Assert.assertEquals(42.0f, mTestObject.waitForFloatArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setDoubleArray(uint16_array);");
-        assertEquals(42.0, mTestObject.waitForDoubleArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setDoubleArray(uint16_array);");
+        Assert.assertEquals(42.0, mTestObject.waitForDoubleArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setObjectArray(uint16_array);");
-        assertNull(mTestObject.waitForObjectArray());
+        mActivityTestRule.executeJavaScript("testObject.setObjectArray(uint16_array);");
+        Assert.assertNull(mTestObject.waitForObjectArray());
 
-        executeJavaScript("testObject.setStringArray(uint16_array);");
-        assertNull(mTestObject.waitForStringArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setStringArray(uint16_array);");
+        Assert.assertNull(mTestObject.waitForStringArray()[0]);
 
-        executeJavaScript("testObject.setCustomTypeArray(uint16_array);");
-        assertNull(mTestObject.waitForCustomTypeArray());
+        mActivityTestRule.executeJavaScript("testObject.setCustomTypeArray(uint16_array);");
+        Assert.assertNull(mTestObject.waitForCustomTypeArray());
     }
 
     // Test passing a typed Int32Array to a method which takes a Java array.
+    @Test
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassInt32Array() throws Throwable {
-        executeJavaScript("buffer = new ArrayBuffer(4);");
-        executeJavaScript("int32_array = new Int32Array(buffer);");
-        executeJavaScript("int32_array[0] = 42;");
+        mActivityTestRule.executeJavaScript("buffer = new ArrayBuffer(4);");
+        mActivityTestRule.executeJavaScript("int32_array = new Int32Array(buffer);");
+        mActivityTestRule.executeJavaScript("int32_array[0] = 42;");
 
-        executeJavaScript("testObject.setBooleanArray(int32_array);");
-        assertFalse(mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setBooleanArray(int32_array);");
+        Assert.assertFalse(mTestObject.waitForBooleanArray()[0]);
 
-        executeJavaScript("testObject.setByteArray(int32_array);");
-        assertEquals(42, mTestObject.waitForByteArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setByteArray(int32_array);");
+        Assert.assertEquals(42, mTestObject.waitForByteArray()[0]);
 
-        executeJavaScript("testObject.setCharArray(int32_array);");
-        assertEquals(42, mTestObject.waitForCharArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setCharArray(int32_array);");
+        Assert.assertEquals(42, mTestObject.waitForCharArray()[0]);
 
-        executeJavaScript("testObject.setShortArray(int32_array);");
-        assertEquals(42, mTestObject.waitForShortArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setShortArray(int32_array);");
+        Assert.assertEquals(42, mTestObject.waitForShortArray()[0]);
 
-        executeJavaScript("testObject.setIntArray(int32_array);");
-        assertEquals(42, mTestObject.waitForIntArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setIntArray(int32_array);");
+        Assert.assertEquals(42, mTestObject.waitForIntArray()[0]);
 
-        executeJavaScript("testObject.setLongArray(int32_array);");
-        assertEquals(42L, mTestObject.waitForLongArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setLongArray(int32_array);");
+        Assert.assertEquals(42L, mTestObject.waitForLongArray()[0]);
 
-        executeJavaScript("testObject.setFloatArray(int32_array);");
-        assertEquals(42.0f, mTestObject.waitForFloatArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setFloatArray(int32_array);");
+        Assert.assertEquals(42.0f, mTestObject.waitForFloatArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setDoubleArray(int32_array);");
-        assertEquals(42.0, mTestObject.waitForDoubleArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setDoubleArray(int32_array);");
+        Assert.assertEquals(42.0, mTestObject.waitForDoubleArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setObjectArray(int32_array);");
-        assertNull(mTestObject.waitForObjectArray());
+        mActivityTestRule.executeJavaScript("testObject.setObjectArray(int32_array);");
+        Assert.assertNull(mTestObject.waitForObjectArray());
 
-        executeJavaScript("testObject.setStringArray(int32_array);");
-        assertNull(mTestObject.waitForStringArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setStringArray(int32_array);");
+        Assert.assertNull(mTestObject.waitForStringArray()[0]);
 
-        executeJavaScript("testObject.setCustomTypeArray(int32_array);");
-        assertNull(mTestObject.waitForCustomTypeArray());
+        mActivityTestRule.executeJavaScript("testObject.setCustomTypeArray(int32_array);");
+        Assert.assertNull(mTestObject.waitForCustomTypeArray());
     }
 
     // Test passing a typed Uint32Array to a method which takes a Java array.
+    @Test
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassUint32Array() throws Throwable {
-        executeJavaScript("buffer = new ArrayBuffer(4);");
-        executeJavaScript("uint32_array = new Uint32Array(buffer);");
-        executeJavaScript("uint32_array[0] = 42;");
+        mActivityTestRule.executeJavaScript("buffer = new ArrayBuffer(4);");
+        mActivityTestRule.executeJavaScript("uint32_array = new Uint32Array(buffer);");
+        mActivityTestRule.executeJavaScript("uint32_array[0] = 42;");
 
-        executeJavaScript("testObject.setBooleanArray(uint32_array);");
-        assertFalse(mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setBooleanArray(uint32_array);");
+        Assert.assertFalse(mTestObject.waitForBooleanArray()[0]);
 
-        executeJavaScript("testObject.setByteArray(uint32_array);");
-        assertEquals(42, mTestObject.waitForByteArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setByteArray(uint32_array);");
+        Assert.assertEquals(42, mTestObject.waitForByteArray()[0]);
 
-        executeJavaScript("testObject.setCharArray(uint32_array);");
-        assertEquals(42, mTestObject.waitForCharArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setCharArray(uint32_array);");
+        Assert.assertEquals(42, mTestObject.waitForCharArray()[0]);
 
-        executeJavaScript("testObject.setShortArray(uint32_array);");
-        assertEquals(42, mTestObject.waitForShortArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setShortArray(uint32_array);");
+        Assert.assertEquals(42, mTestObject.waitForShortArray()[0]);
 
-        executeJavaScript("testObject.setIntArray(uint32_array);");
-        assertEquals(42, mTestObject.waitForIntArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setIntArray(uint32_array);");
+        Assert.assertEquals(42, mTestObject.waitForIntArray()[0]);
 
-        executeJavaScript("testObject.setLongArray(uint32_array);");
-        assertEquals(42L, mTestObject.waitForLongArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setLongArray(uint32_array);");
+        Assert.assertEquals(42L, mTestObject.waitForLongArray()[0]);
 
-        executeJavaScript("testObject.setFloatArray(uint32_array);");
-        assertEquals(42.0f, mTestObject.waitForFloatArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setFloatArray(uint32_array);");
+        Assert.assertEquals(42.0f, mTestObject.waitForFloatArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setDoubleArray(uint32_array);");
-        assertEquals(42.0, mTestObject.waitForDoubleArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setDoubleArray(uint32_array);");
+        Assert.assertEquals(42.0, mTestObject.waitForDoubleArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setObjectArray(uint32_array);");
-        assertNull(mTestObject.waitForObjectArray());
+        mActivityTestRule.executeJavaScript("testObject.setObjectArray(uint32_array);");
+        Assert.assertNull(mTestObject.waitForObjectArray());
 
-        executeJavaScript("testObject.setStringArray(uint32_array);");
-        assertNull(mTestObject.waitForStringArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setStringArray(uint32_array);");
+        Assert.assertNull(mTestObject.waitForStringArray()[0]);
 
-        executeJavaScript("testObject.setCustomTypeArray(uint32_array);");
-        assertNull(mTestObject.waitForCustomTypeArray());
+        mActivityTestRule.executeJavaScript("testObject.setCustomTypeArray(uint32_array);");
+        Assert.assertNull(mTestObject.waitForCustomTypeArray());
     }
 
     // Test passing a typed Float32Array to a method which takes a Java array.
+    @Test
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassFloat32Array() throws Throwable {
-        executeJavaScript("buffer = new ArrayBuffer(4);");
-        executeJavaScript("float32_array = new Float32Array(buffer);");
-        executeJavaScript("float32_array[0] = 42.0;");
+        mActivityTestRule.executeJavaScript("buffer = new ArrayBuffer(4);");
+        mActivityTestRule.executeJavaScript("float32_array = new Float32Array(buffer);");
+        mActivityTestRule.executeJavaScript("float32_array[0] = 42.0;");
 
-        executeJavaScript("testObject.setBooleanArray(float32_array);");
-        assertFalse(mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setBooleanArray(float32_array);");
+        Assert.assertFalse(mTestObject.waitForBooleanArray()[0]);
 
-        executeJavaScript("testObject.setByteArray(float32_array);");
-        assertEquals(42, mTestObject.waitForByteArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setByteArray(float32_array);");
+        Assert.assertEquals(42, mTestObject.waitForByteArray()[0]);
 
-        executeJavaScript("testObject.setCharArray(float32_array);");
-        assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setCharArray(float32_array);");
+        Assert.assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
 
-        executeJavaScript("testObject.setShortArray(float32_array);");
-        assertEquals(42, mTestObject.waitForShortArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setShortArray(float32_array);");
+        Assert.assertEquals(42, mTestObject.waitForShortArray()[0]);
 
-        executeJavaScript("testObject.setIntArray(float32_array);");
-        assertEquals(42, mTestObject.waitForIntArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setIntArray(float32_array);");
+        Assert.assertEquals(42, mTestObject.waitForIntArray()[0]);
 
-        executeJavaScript("testObject.setLongArray(float32_array);");
-        assertEquals(42L, mTestObject.waitForLongArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setLongArray(float32_array);");
+        Assert.assertEquals(42L, mTestObject.waitForLongArray()[0]);
 
-        executeJavaScript("testObject.setFloatArray(float32_array);");
-        assertEquals(42.0f, mTestObject.waitForFloatArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setFloatArray(float32_array);");
+        Assert.assertEquals(42.0f, mTestObject.waitForFloatArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setDoubleArray(float32_array);");
-        assertEquals(42.0, mTestObject.waitForDoubleArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setDoubleArray(float32_array);");
+        Assert.assertEquals(42.0, mTestObject.waitForDoubleArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setObjectArray(float32_array);");
-        assertNull(mTestObject.waitForObjectArray());
+        mActivityTestRule.executeJavaScript("testObject.setObjectArray(float32_array);");
+        Assert.assertNull(mTestObject.waitForObjectArray());
 
-        executeJavaScript("testObject.setStringArray(float32_array);");
-        assertNull(mTestObject.waitForStringArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setStringArray(float32_array);");
+        Assert.assertNull(mTestObject.waitForStringArray()[0]);
 
-        executeJavaScript("testObject.setCustomTypeArray(float32_array);");
-        assertNull(mTestObject.waitForCustomTypeArray());
+        mActivityTestRule.executeJavaScript("testObject.setCustomTypeArray(float32_array);");
+        Assert.assertNull(mTestObject.waitForCustomTypeArray());
     }
 
     // Test passing a typed Float64Array to a method which takes a Java array.
+    @Test
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testPassFloat64Array() throws Throwable {
-        executeJavaScript("buffer = new ArrayBuffer(8);");
-        executeJavaScript("float64_array = new Float64Array(buffer);");
-        executeJavaScript("float64_array[0] = 42.0;");
+        mActivityTestRule.executeJavaScript("buffer = new ArrayBuffer(8);");
+        mActivityTestRule.executeJavaScript("float64_array = new Float64Array(buffer);");
+        mActivityTestRule.executeJavaScript("float64_array[0] = 42.0;");
 
-        executeJavaScript("testObject.setBooleanArray(float64_array);");
-        assertFalse(mTestObject.waitForBooleanArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setBooleanArray(float64_array);");
+        Assert.assertFalse(mTestObject.waitForBooleanArray()[0]);
 
-        executeJavaScript("testObject.setByteArray(float64_array);");
-        assertEquals(42, mTestObject.waitForByteArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setByteArray(float64_array);");
+        Assert.assertEquals(42, mTestObject.waitForByteArray()[0]);
 
-        executeJavaScript("testObject.setCharArray(float64_array);");
-        assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setCharArray(float64_array);");
+        Assert.assertEquals('\u0000', mTestObject.waitForCharArray()[0]);
 
-        executeJavaScript("testObject.setShortArray(float64_array);");
-        assertEquals(42, mTestObject.waitForShortArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setShortArray(float64_array);");
+        Assert.assertEquals(42, mTestObject.waitForShortArray()[0]);
 
-        executeJavaScript("testObject.setIntArray(float64_array);");
-        assertEquals(42, mTestObject.waitForIntArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setIntArray(float64_array);");
+        Assert.assertEquals(42, mTestObject.waitForIntArray()[0]);
 
-        executeJavaScript("testObject.setLongArray(float64_array);");
-        assertEquals(42L, mTestObject.waitForLongArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setLongArray(float64_array);");
+        Assert.assertEquals(42L, mTestObject.waitForLongArray()[0]);
 
-        executeJavaScript("testObject.setFloatArray(float64_array);");
-        assertEquals(42.0f, mTestObject.waitForFloatArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setFloatArray(float64_array);");
+        Assert.assertEquals(42.0f, mTestObject.waitForFloatArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setDoubleArray(float64_array);");
-        assertEquals(42.0, mTestObject.waitForDoubleArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setDoubleArray(float64_array);");
+        Assert.assertEquals(42.0, mTestObject.waitForDoubleArray()[0], ASSERTION_DELTA);
 
-        executeJavaScript("testObject.setObjectArray(float64_array);");
-        assertNull(mTestObject.waitForObjectArray());
+        mActivityTestRule.executeJavaScript("testObject.setObjectArray(float64_array);");
+        Assert.assertNull(mTestObject.waitForObjectArray());
 
-        executeJavaScript("testObject.setStringArray(float64_array);");
-        assertNull(mTestObject.waitForStringArray()[0]);
+        mActivityTestRule.executeJavaScript("testObject.setStringArray(float64_array);");
+        Assert.assertNull(mTestObject.waitForStringArray()[0]);
 
-        executeJavaScript("testObject.setCustomTypeArray(float64_array);");
-        assertNull(mTestObject.waitForCustomTypeArray());
+        mActivityTestRule.executeJavaScript("testObject.setCustomTypeArray(float64_array);");
+        Assert.assertNull(mTestObject.waitForCustomTypeArray());
     }
 }