Add more tests around JsObjectName

Clarify that this is allowed. Bug: 918065 Change-Id: Ibb593015218dbb391d2165bc724191a4654ac33d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1898476Reviewed-by: Shimi Zhang <ctzsm@chromium.org> Commit-Queue: Changwan Ryu <changwan@chromium.org> Cr-Commit-Position: refs/heads/master@{#712328}

Add more tests around JsObjectName
Clarify that this is allowed. Bug: 918065 Change-Id: Ibb593015218dbb391d2165bc724191a4654ac33d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1898476Reviewed-by: Shimi Zhang <ctzsm@chromium.org> Commit-Queue: Changwan Ryu <changwan@chromium.org> Cr-Commit-Position: refs/heads/master@{#712328}
455bf14a · Changwan Ryu · Commit Bot · e4b75039 · 455bf14a
Commit 455bf14a authored Nov 04, 2019 by Changwan Ryu Committed by Commit Bot Nov 04, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 34 additions and 0 deletions

android_webview/javatests/src/org/chromium/android_webview/test/JsJavaInteractionTest.java .../chromium/android_webview/test/JsJavaInteractionTest.java +34 -0

No files found.
--- a/android_webview/javatests/src/org/chromium/android_webview/test/JsJavaInteractionTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/JsJavaInteractionTest.java
@@ -827,6 +827,40 @@ public class JsJavaInteractionTest {
        Assert.assertTrue(mListener.hasNoMoreOnPostMessage());
    }
+    @Test
+    @SmallTest
+    @Feature({"AndroidWebView", "JsJavaInteraction"})
+    public void testPostMessage_JsObjectName_Number() throws Throwable {
+        checkInjectAndAccessJsObjectNameAsWindowProperty("123");
+    }
+    @Test
+    @SmallTest
+    @Feature({"AndroidWebView", "JsJavaInteraction"})
+    public void testPostMessage_JsObjectName_Keyword() throws Throwable {
+        checkInjectAndAccessJsObjectNameAsWindowProperty("var");
+    }
+    private void checkInjectAndAccessJsObjectNameAsWindowProperty(String jsObjName)
+            throws Throwable {
+        addWebMessageListenerOnUiThread(mAwContents, jsObjName, new String[] {"*"}, mListener);
+        String html = "<html><head><script>window['" + jsObjName + "'].postMessage('Hello');"
+                + "</script></head><body><div>postMessage</div></body></html>";
+        mActivityTestRule.loadDataWithBaseUrlSync(mAwContents,
+                mContentsClient.getOnPageFinishedHelper(), html, "text/html", false,
+                "http://www.google.com", null);
+        TestWebMessageListener.Data data = mListener.waitForOnPostMessage();
+        Assert.assertEquals("http://www.google.com", data.mSourceOrigin.toString());
+        Assert.assertEquals(HELLO, data.mMessage);
+        Assert.assertTrue(data.mIsMainFrame);
+        Assert.assertEquals(0, data.mPorts.length);
+        Assert.assertTrue(mListener.hasNoMoreOnPostMessage());
+    }
    private boolean isJsObjectInjectedWhenLoadingUrl(
            final String baseUrl, final String jsObjectName) throws Throwable {
        mActivityTestRule.loadDataWithBaseUrlSync(mAwContents,