forked from chromium/chromium
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix onCloseWindow() behavior in WebPlatformTestActivity
onCloseWindow() will be called on the child window's chromeclient, so moving the handling logic there. Also, add a test around this behavior, which can be extended to handle multi window support. Bug: 994939, 996790 Change-Id: Iaf7cc8b3da21c0f1ad607ae8a8c725a3cc774713 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1761650 Commit-Queue: Changwan Ryu <changwan@chromium.org> Reviewed-by: Andrew Luo <aluo@chromium.org> Reviewed-by: Nate Fischer <ntfschr@chromium.org> Cr-Commit-Position: refs/heads/master@{#691524}
- Loading branch information
Showing
5 changed files
with
142 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 0 additions & 9 deletions
9
android_webview/tools/system_webview_shell/apk/res/anim/slide_down.xml
This file was deleted.
Oops, something went wrong.
9 changes: 0 additions & 9 deletions
9
android_webview/tools/system_webview_shell/apk/res/anim/slide_up.xml
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
..._shell/layout_tests/src/org/chromium/webview_shell/test/WebPlatformTestsActivityTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| // Copyright 2019 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. | ||
|
|
||
| package org.chromium.webview_shell.test; | ||
|
|
||
| import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout; | ||
|
|
||
| import android.support.test.InstrumentationRegistry; | ||
| import android.support.test.filters.MediumTest; | ||
| import android.support.test.rule.ActivityTestRule; | ||
| import android.webkit.WebView; | ||
|
|
||
| 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.test.BaseJUnit4ClassRunner; | ||
| import org.chromium.webview_shell.WebPlatformTestsActivity; | ||
|
|
||
| import java.util.concurrent.BlockingQueue; | ||
| import java.util.concurrent.LinkedBlockingQueue; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| /** | ||
| * Tests to ensure that system webview shell can handle WPT tests correctly. | ||
| */ | ||
| @RunWith(BaseJUnit4ClassRunner.class) | ||
| public class WebPlatformTestsActivityTest { | ||
| private static final String OPEN_TEST_WINDOW_SCRIPT = | ||
| "<html><head><script>function ensure_test_window() {" | ||
| + " if (!this.test_window || this.test_window.location === null) {" | ||
| + " this.test_window = window.open('about:blank', 800, 600);" | ||
| + " this.test_window.close();" | ||
| + " }" | ||
| + "};" | ||
| + "ensure_test_window();" | ||
| + "</script></head><body>TestRunner Window</body></html>"; | ||
|
|
||
| private static final int CHILD_LAYOUT_SHOWN = 1; | ||
| private static final int CHILD_LAYOUT_HIDDEN = 2; | ||
|
|
||
| private static final long TEST_TIMEOUT_IN_SECONDS = scaleTimeout(3); | ||
|
|
||
| private WebPlatformTestsActivity mTestActivity; | ||
|
|
||
| @Rule | ||
| public ActivityTestRule<WebPlatformTestsActivity> mActivityTestRule = | ||
| new ActivityTestRule<>(WebPlatformTestsActivity.class, false, true); | ||
|
|
||
| @Before | ||
| public void setUp() throws Exception { | ||
| mTestActivity = mActivityTestRule.getActivity(); | ||
| } | ||
|
|
||
| @Test | ||
| @MediumTest | ||
| public void testOpenDestroyWindowFromTestRunner() throws Exception { | ||
| final BlockingQueue<Integer> queue = new LinkedBlockingQueue<>(); | ||
|
|
||
| InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> { | ||
| mTestActivity.setTestCallback(new WebPlatformTestsActivity.TestCallback() { | ||
| @Override | ||
| public void onChildLayoutVisible() { | ||
| queue.add(CHILD_LAYOUT_SHOWN); | ||
| } | ||
|
|
||
| @Override | ||
| public void onChildLayoutInvisible() { | ||
| queue.add(CHILD_LAYOUT_HIDDEN); | ||
| } | ||
| }); | ||
| WebView webView = mTestActivity.getTestRunnerWebView(); | ||
| webView.loadDataWithBaseURL( | ||
| "https://some.domain.test/", OPEN_TEST_WINDOW_SCRIPT, "text/html", null, null); | ||
| }); | ||
| Assert.assertEquals("Child window should be created.", Integer.valueOf(CHILD_LAYOUT_SHOWN), | ||
| queue.poll(TEST_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS)); | ||
| Assert.assertEquals("Child window should be destroyed.", | ||
| Integer.valueOf(CHILD_LAYOUT_HIDDEN), | ||
| queue.poll(TEST_TIMEOUT_IN_SECONDS, TimeUnit.SECONDS)); | ||
| } | ||
| } |