android_webview/javatests/src/org/chromium/android_webview/test/PostMessageTest.java - Issue 971433002: Revert of Test PostMessage to popup window

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/PostMessageTest.java

Issue 971433002: Revert of Test PostMessage to popup window (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 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: android_webview/javatests/src/org/chromium/android_webview/test/PostMessageTest.java

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/PostMessageTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/PostMessageTest.java

index 9ed18573499696b2ef6fa4e32c4c5ccb57b80dbd..a9923be82699597ea7d9364692e9a0b3ad1ca198 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/PostMessageTest.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/PostMessageTest.java

@@ -763,90 +763,4 @@

mMessageObject.waitForMessage();

assertEquals(WORKER_MESSAGE, mMessageObject.getData());

}

- private static final String POPUP_MESSAGE = "from_popup";

- private static final String POPUP_URL = "/popup.html";

- private static final String IFRAME_URL = "/iframe.html";

- private static final String MAIN_PAGE_FOR_POPUP_TEST = "<!DOCTYPE html><html>"

- + "<head>"

- + " <script>"

- + " function createPopup() {"

- + " var popupWindow = window.open('" + POPUP_URL + "');"

- + " onmessage = function(e) {"

- + " popupWindow.postMessage(e.data, '*', e.ports);"

- + " };"

- + " }"

- + " </script>"

- + "</head>"

- + "</html>";

- // Sends message and ports to the iframe.

- private static final String POPUP_PAGE_WITH_IFRAME = "<!DOCTYPE html><html>"

- + "<script>"

- + " onmessage = function(e) {"

- + " var iframe = document.getElementsByTagName('iframe')[0];"

- + " iframe.contentWindow.postMessage('" + POPUP_MESSAGE + "', '*', e.ports);"

- + " };"

- + "</script>"

- + "<body><iframe src='" + IFRAME_URL + "'></iframe></body>"

- + "</html>";

- // Test if WebView can post a message from/to a popup window owning a message port.

- @SmallTest

- @Feature({"AndroidWebView", "Android-PostMessage"})

- public void testPostMessageToPopup() throws Throwable {

- triggerPopup(mAwContents, mContentsClient, mWebServer, MAIN_PAGE_FOR_POPUP_TEST, ECHO_PAGE,

- POPUP_URL, "createPopup()");

- connectPendingPopup(mAwContents);

- final ChannelContainer channelContainer = new ChannelContainer();

- runTestOnUiThread(new Runnable() {

- @Override

- public void run() {

- MessagePort[] channel = mAwContents.createMessageChannel();

- channelContainer.set(channel);

- channel[0].setWebEventHandler(new MessagePort.WebEventHandler() {

- @Override

- public void onMessage(String message) {

- channelContainer.setMessage(message);

- }

- });

- mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),

- new MessagePort[] {channel[1]});

- channel[0].postMessage(HELLO, null);

- }

- });

- channelContainer.waitForMessage();

- assertEquals(HELLO + JS_MESSAGE, channelContainer.getMessage());

- }

- // Test if WebView can post a message from/to an iframe in a popup window.

- @SmallTest

- @Feature({"AndroidWebView", "Android-PostMessage"})

- public void testPostMessageToIframeInsidePopup() throws Throwable {

- mWebServer.setResponse(IFRAME_URL, ECHO_PAGE, null);

- triggerPopup(mAwContents, mContentsClient, mWebServer, MAIN_PAGE_FOR_POPUP_TEST,

- POPUP_PAGE_WITH_IFRAME, POPUP_URL, "createPopup()");

- connectPendingPopup(mAwContents);

- final ChannelContainer channelContainer = new ChannelContainer();

- runTestOnUiThread(new Runnable() {

- @Override

- public void run() {

- MessagePort[] channel = mAwContents.createMessageChannel();

- channelContainer.set(channel);

- channel[0].setWebEventHandler(new MessagePort.WebEventHandler() {

- @Override

- public void onMessage(String message) {

- channelContainer.setMessage(message);

- }

- });

- mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),

- new MessagePort[] {channel[1]});

- channel[0].postMessage(HELLO, null);

- }

- });

- channelContainer.waitForMessage();

- assertEquals(HELLO + JS_MESSAGE, channelContainer.getMessage());

- }

}

« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/PopupWindowTest.java ('k') | no next file » | no next file with comments »