Skip to content

GitLab

T
tangled
Commit bd7943e7 authored by Ella Ge's avatar Ella Ge Committed by Commit Bot
Browse files
Options

[CodeHealth] Update some UserActivation related web_tests to testdriver 

This CL migrates some UserActivation related web_tests (layouttests)
to use testdriver (or gpubenchmarking), instead of EventSender.

This CL also fixes these test with BrowserVerifiedUserActivationTypeMouse
enabled. Because EventSender generated events are not from browser side,
so the browser side verification will failed. This CL update the failing
mouse type tests to use either testdriver or gpubenchmarking, so that
events are correctly dispatch from browser side.

Bug: 848778
Change-Id: I23380932d083aef18cf1f54d82621e5e96c52ad5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1872928
Commit-Queue: Ella Ge <eirage@chromium.org>
Reviewed-by: default avatarMustaq Ahmed <mustaq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720011}
parent 0c2d0246
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 159 deletions
third_party/blink/web_tests/fast/dom/Window/window-postmessage-user-gesture.html
View file @ bd7943e7
<html>
<head>
<script src="../../../resources/js-test.js"></script>
<script src="../../../resources/testdriver.js"></script>
<script src="../../../resources/testdriver-vendor.js"></script>
</head>
<body>
<div id="description">Test that user gesture is kept when postMessage() to self or across frames.</div>
......@@ -90,12 +92,7 @@ function clickHandler() {
}
function clickDiv() {
var div1 = document.getElementById("div1");
if (window.eventSender) {
eventSender.mouseMoveTo(div1.offsetLeft + 10, div1.offsetTop + 5);
eventSender.mouseDown();
eventSender.mouseUp();
}
test_driver.click(div1)
}
function startTest() {
......
third_party/blink/web_tests/fast/events/open-window-from-another-frame.html
View file @ bd7943e7
<html>
<head>
<script src="../../resources/testdriver.js"></script>
<script src="../../resources/testdriver-vendor.js"></script>
<script>
if (window.testRunner) {
testRunner.dumpAsText();
......@@ -15,13 +17,7 @@
var myLink = document.getElementById('link');
var myFrame = window.frames['otherFrame'];
myLink.onclick = myFrame.handleClick;
if (window.testRunner) {
var x = myLink.offsetLeft + 2;
var y = myLink.offsetTop + 2;
eventSender.mouseMoveTo(x, y);
eventSender.mouseDown();
eventSender.mouseUp();
}
test_driver.click(myLink);
}
function log(msg)
......
third_party/blink/web_tests/fast/events/popup-allowed-from-gesture-initiated-event.html
View file @ bd7943e7
<html>
<html>
<head>
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<script src="../../resources/testdriver.js"></script>
<script src="../../resources/testdriver-vendor.js"></script>
</head>
<body>
<button id="button1" onclick="testButton1()">Click Here</button>
......@@ -20,12 +22,16 @@
function testButton1() {
document.getElementById("test").click();
++testNum;
closeWindowAndRunNextTest();
}
function testButton2() {
var clickEvent = document.createEvent("MouseEvents");
clickEvent.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
document.getElementById("test").dispatchEvent(clickEvent);
++testNum;
closeWindowAndRunNextTest();
}
function closeWindowAndRunNextTest() {
......@@ -47,23 +53,15 @@
function nextTest() {
if (testNum == 0) {
test(() => {
var button1 = document.getElementById("button1");
eventSender.mouseMoveTo(button1.offsetLeft + button1.offsetWidth / 2, button1.offsetTop + button1.offsetHeight / 2);
eventSender.mouseDown();
eventSender.mouseUp();
test_driver.click(button1);
}, 'Click button1');
} else if (testNum == 1) {
test(() => {
var button2 = document.getElementById("button2");
eventSender.mouseMoveTo(button2.offsetLeft + button2.offsetWidth / 2, button2.offsetTop + button2.offsetHeight / 2);
eventSender.mouseDown();
eventSender.mouseUp();
test_driver.click(button2);
}, 'Click button2');
} else {
done();
}
++testNum;
closeWindowAndRunNextTest();
}
if (window.testRunner) {
......@@ -73,6 +71,6 @@
nextTest();
}
</script>
</body>
</script>
</body>
</html>
third_party/blink/web_tests/fast/events/popup-allowed-from-gesture-initiated-form-submit.html
View file @ bd7943e7
<html>
<html>
<script src="../../resources/testdriver.js"></script>
<script src="../../resources/testdriver-vendor.js"></script>
<body>
<form action="resources/popup-allowed-from-gesture-initiated-form-submit-target.html" method="post" target="_blank">
<input id="button" type="submit" value="Click Here" />
</form>
<div id="console">FAIL</div>
<script>
<script>
if (window.testRunner) {
testRunner.dumpAsText();
testRunner.setCanOpenWindows();
......@@ -15,13 +17,9 @@
var button = document.getElementById("button");
window.onload = function() {
if (window.eventSender) {
eventSender.mouseMoveTo(button.offsetLeft + button.offsetWidth / 2, button.offsetTop + button.offsetHeight / 2);
eventSender.mouseDown();
eventSender.mouseUp();
}
test_driver.click(button);
}
}
</script>
</body>
</script>
</body>
</html>
third_party/blink/web_tests/fast/events/popup-allowed-from-gesture-only-once-iframes.html
View file @ bd7943e7
<!DOCTYPE html>
<html>
<html>
<script src="../../resources/testdriver.js"></script>
<script src="../../resources/testdriver-vendor.js"></script>
<body>
<p>
Test that we don't create a new user gesture indicator every time
......@@ -34,12 +36,7 @@
windowCount = testRunner.windowCount();
var frame = document.getElementById("iframe");
if (window.eventSender) {
eventSender.mouseMoveTo(frame.offsetLeft + frame.offsetWidth / 2, frame.offsetTop + frame.offsetHeight / 2);
eventSender.mouseDown();
eventSender.mouseUp();
}
test_driver.click(frame)
}
</script>
</body>
......
third_party/blink/web_tests/fast/events/popup-allowed-from-gesture-only-once-two-events.html
View file @ bd7943e7
<!DOCTYPE html>
<html>
<script src="../../resources/testdriver.js"></script>
<script src="../../resources/testdriver-vendor.js"></script>
<html>
<body>
<p>
Test that only a single popup is allowed in response to a single
......@@ -33,12 +35,7 @@
windowCount = testRunner.windowCount();
var button = document.getElementById("button");
if (window.eventSender) {
eventSender.mouseMoveTo(button.offsetLeft + button.offsetWidth / 2, button.offsetTop + button.offsetHeight / 2);
eventSender.mouseDown();
eventSender.mouseUp();
}
test_driver.click(button);
}
</script>
</body>
......
third_party/blink/web_tests/fast/events/popup-allowed-from-gesture-only-once.html
View file @ bd7943e7
<!DOCTYPE html>
<html>
<html>
<script src="../../resources/testdriver.js"></script>
<script src="../../resources/testdriver-vendor.js"></script>
<body>
<p>
Test that only a single popup is allowed in response to a single
......@@ -32,11 +34,7 @@
var button = document.getElementById("button");
if (window.eventSender) {
eventSender.mouseMoveTo(button.offsetLeft + button.offsetWidth / 2, button.offsetTop + button.offsetHeight / 2);
eventSender.mouseDown();
eventSender.mouseUp();
}
test_driver.click(button);
}
</script>
</body>
......
third_party/blink/web_tests/fast/events/popup-blocked-from-different-frames-expected.txt
View file @ bd7943e7
Click Here
PASS win is non-null.
PASS win is null
PASS successfullyParsed is true
TEST COMPLETE
PASS win is non-null.
PASS win is null
third_party/blink/web_tests/fast/events/popup-blocked-from-different-frames.html
View file @ bd7943e7
......@@ -2,6 +2,8 @@
<html>
<head>
<script src="../../resources/js-test.js"></script>
<script src="../../resources/testdriver.js"></script>
<script src="../../resources/testdriver-vendor.js"></script>
<style>
iframe {
position: absolute;
......@@ -35,6 +37,7 @@
{
win = window.open("about:blank");
shouldBeNull("win");
testRunner.notifyDone();
}
document.querySelector("#test").addEventListener("mousedown", clickHandler1);
......@@ -43,15 +46,13 @@
if (window.testRunner) {
testRunner.dumpAsText();
testRunner.waitUntilDone();
testRunner.setCanOpenWindows();
testRunner.setPopupBlockingEnabled(true);
testRunner.setCloseRemainingWindowsWhenComplete(true);
var button = document.querySelector("#test");
eventSender.mouseMoveTo(button.offsetLeft + button.offsetWidth / 2, button.offsetTop + button.offsetHeight / 2);
eventSender.mouseDown();
eventSender.mouseUp();
test_driver.click(button);
}
</script>
</body>
......
third_party/blink/web_tests/fast/events/popup-blocked-from-fake-user-gesture-expected.txt
View file @ bd7943e7
Click Here
PASS win is non-null.
PASS win is null
PASS successfullyParsed is true
TEST COMPLETE
PASS win is non-null.
PASS win is null
third_party/blink/web_tests/fast/events/popup-blocked-from-fake-user-gesture.html
View file @ bd7943e7
<html>
<head>
<script src="../../resources/js-test.js"></script>
<script src="../../resources/testdriver.js"></script>
<script src="../../resources/testdriver-vendor.js"></script>
</head>
<body>
<button id="test" onclick="clickHandler()">Click Here</button>
......@@ -14,6 +16,10 @@
win = window.open("about:blank", "blank");
shouldBeNonNull("win");
win.close();
clickHandler = clickHandler2;
window.event = stolenEvent;
button.click();
}
function clickHandler2()
......@@ -21,6 +27,7 @@
window.event = stolenEvent;
win = window.open("about:blank", "blank");
shouldBeNull("win");
testRunner.notifyDone();
}
clickHandler = clickHandler1;
......@@ -33,18 +40,7 @@
testRunner.waitUntilDone();
var button = document.getElementById("test");
if (window.eventSender) {
eventSender.mouseMoveTo(button.offsetLeft + button.offsetWidth / 2, button.offsetTop + button.offsetHeight / 2);
eventSender.mouseDown();
eventSender.mouseUp();
}
clickHandler = clickHandler2;
window.event = stolenEvent;
button.click();
testRunner.notifyDone();
test_driver.click(button);
}
</script>
</body>
......
third_party/blink/web_tests/fast/events/popup-blocking-click-in-iframe.html
View file @ bd7943e7
<html>
<head>
<script src="../../resources/gesture-util.js"></script>
<script>
if (window.testRunner) {
testRunner.dumpAsText();
......@@ -37,10 +38,7 @@
function test()
{
if (window.testRunner) {
eventSender.mouseMoveTo(2, 2);
eventSender.scheduleAsynchronousClick();
}
mouseClickOn(2, 2);
}
function log(msg)
......
third_party/blink/web_tests/fast/events/popup-blocking-timers1.html
View file @ bd7943e7
<!DOCTYPE html>
<head>
<script src="../../resources/js-test.js"></script>
<script src="../../resources/testdriver.js"></script>
<script src="../../resources/testdriver-vendor.js"></script>
<script>
var newWindow;
if (window.testRunner) {
testRunner.dumpAsText();
testRunner.setCanOpenWindows();
testRunner.waitUntilDone();
testRunner.setPopupBlockingEnabled(true);
}
function clickHandler() {
newWindow = window.open("about:blank");
self.focus();
......@@ -19,17 +21,11 @@
if (window.testRunner)
testRunner.notifyDone();
}
function clickButton() {
var button = document.getElementById("test");
var buttonX = button.offsetLeft + button.offsetWidth / 2;
var buttonY = button.offsetTop + button.offsetHeight / 2;
if (window.eventSender) {
eventSender.mouseMoveTo(buttonX, buttonY);
eventSender.mouseDown();
eventSender.mouseUp();
}
}
test_driver.click(button);
}
</script>
</head>
<body onload="clickButton()">
......
third_party/blink/web_tests/fast/events/popup-blocking-timers2.html
View file @ bd7943e7
<!DOCTYPE html>
<head>
<script src="../../resources/js-test.js"></script>
<script src="../../resources/testdriver.js"></script>
<script src="../../resources/testdriver-vendor.js"></script>
<script>
var newWindow;
if (window.testRunner) {
testRunner.dumpAsText();
testRunner.setCanOpenWindows();
testRunner.waitUntilDone();
testRunner.setPopupBlockingEnabled(true);
}
function clickHandler() {
setTimeout(function() {
newWindow = window.open("about:blank");
......@@ -21,17 +23,11 @@
testRunner.notifyDone();
}, 0);
}
function clickButton() {
var button = document.getElementById("test");
var buttonX = button.offsetLeft + button.offsetWidth / 2;
var buttonY = button.offsetTop + button.offsetHeight / 2;
if (window.eventSender) {
eventSender.mouseMoveTo(buttonX, buttonY);
eventSender.mouseDown();
eventSender.mouseUp();
}
}
test_driver.click(button);
}
</script>
</head>
<body onload="clickButton()">
......
third_party/blink/web_tests/fast/events/popup-blocking-timers3.html
View file @ bd7943e7
<!DOCTYPE html>
<head>
<script src="../../resources/js-test.js"></script>
<script src="../../resources/testdriver.js"></script>
<script src="../../resources/testdriver-vendor.js"></script>
<script>
var newWindow;
var intervalId;
var firstIntervalExecution = true;
if (window.testRunner) {
testRunner.dumpAsText();
testRunner.setCanOpenWindows();
testRunner.waitUntilDone();
testRunner.setPopupBlockingEnabled(true);
}
function clickHandler() {
intervalId = setInterval(function() {
debug("Test calling window.open() in a 100 ms interval. A popup should only be allowed on the first execution of the interval.");
......@@ -29,17 +31,11 @@
}
}, 100);
}
function clickButton() {
var button = document.getElementById("test");
var buttonX = button.offsetLeft + button.offsetWidth / 2;
var buttonY = button.offsetTop + button.offsetHeight / 2;
if (window.eventSender) {
eventSender.mouseMoveTo(buttonX, buttonY);
eventSender.mouseDown();
eventSender.mouseUp();
}
}
test_driver.click(button);
}
</script>
</head>
<body onload="clickButton()">
......
third_party/blink/web_tests/fast/events/popup-blocking-timers4.html
View file @ bd7943e7
<!DOCTYPE html>
<head>
<script src="../../resources/js-test.js"></script>
<script src="../../resources/testdriver.js"></script>
<script src="../../resources/testdriver-vendor.js"></script>
<script>
var newWindow;
......@@ -26,13 +28,7 @@
function clickButton() {
var button = document.getElementById("test");
var buttonX = button.offsetLeft + button.offsetWidth / 2;
var buttonY = button.offsetTop + button.offsetHeight / 2;
if (window.eventSender) {
eventSender.mouseMoveTo(buttonX, buttonY);
eventSender.mouseDown();
eventSender.mouseUp();
}
test_driver.click(button);
}
</script>
</head>
......
third_party/blink/web_tests/fast/events/popup-blocking-timers5.html
View file @ bd7943e7
<!DOCTYPE html>
<head>
<script src="../../resources/js-test.js"></script>
<script src="../../resources/testdriver.js"></script>
<script src="../../resources/testdriver-vendor.js"></script>
<script>
var newWindow;
if (window.testRunner) {
testRunner.dumpAsText();
testRunner.setCanOpenWindows();
testRunner.waitUntilDone();
testRunner.setPopupBlockingEnabled(true);
}
function clickHandler() {
setTimeout(function() {
newWindow = window.open("about:blank");
......@@ -24,17 +26,11 @@
if (window.eventSender)
eventSender.leapForward(900);
}
function clickButton() {
var button = document.getElementById("test");
var buttonX = button.offsetLeft + button.offsetWidth / 2;
var buttonY = button.offsetTop + button.offsetHeight / 2;
if (window.eventSender) {
eventSender.mouseMoveTo(buttonX, buttonY);
eventSender.mouseDown();
eventSender.mouseUp();
}
}
test_driver.click(button);
}
</script>
</head>
<body onload="clickButton()">
......
third_party/blink/web_tests/fast/events/popup-forwarded-gesture-blocked.html
View file @ bd7943e7
<!DOCTYPE html>
<html>
<script src="../../resources/testdriver.js"></script>
<script src="../../resources/testdriver-vendor.js"></script>
<body>
<p>
Test that a forwarded user gesture that is consumed before the
......@@ -33,12 +35,7 @@
windowCount = testRunner.windowCount();
var button = document.getElementById("button");
if (window.eventSender) {
eventSender.mouseMoveTo(button.offsetLeft + button.offsetWidth / 2, button.offsetTop + button.offsetHeight / 2);
eventSender.mouseDown();
eventSender.mouseUp();
}
test_driver.click(button);
}
</script>
</body>
......
third_party/blink/web_tests/fast/events/popup-forwarded-gesture.html
View file @ bd7943e7
<!DOCTYPE html>
<html>
<script src="../../resources/testdriver.js"></script>
<script src="../../resources/testdriver-vendor.js"></script>
<body>
<p>
Test that a forwarded user gesture can be consumed by any timeout,
......@@ -33,12 +35,7 @@
testRunner.waitUntilDone();
var button = document.getElementById("button");
if (window.eventSender) {
eventSender.mouseMoveTo(button.offsetLeft + button.offsetWidth / 2, button.offsetTop + button.offsetHeight / 2);
eventSender.mouseDown();
eventSender.mouseUp();
}
test_driver.click(button);
}
</script>
</body>
......
third_party/blink/web_tests/fast/loader/navigation-scheduler-user-gesture.html
View file @ bd7943e7
<!DOCTYPE html>
<html>
<script src="../../resources/testdriver.js"></script>
<script src="../../resources/testdriver-vendor.js"></script>
<body>
<p>
Check that the NavigationScheduler correctly tracks user gestures.
......@@ -33,11 +35,7 @@
var button = document.querySelector('button');
button.onclick = popup;
if (window.testRunner) {
eventSender.mouseMoveTo(button.offsetLeft + 2, button.offsetTop + 2);
eventSender.mouseDown();
eventSender.mouseUp();
}
test_driver.click(button)
</script>
</body>
</html>
third_party/blink/web_tests/plugins/plugin-initiate-popup-window-expected.txt
View file @ bd7943e7
CONSOLE MESSAGE: line 17: window count: 1
CONSOLE MESSAGE: line 29: window count: 2
CONSOLE MESSAGE: line 51: window count: 3
CONSOLE MESSAGE: line 18: window count: 1
CONSOLE MESSAGE: line 27: window count: 2
CONSOLE MESSAGE: line 47: window count: 3
Specify a script and a mouse/keyboard event to the plugin. The specified script will be evaluated in the browser when the specified event is received by the plugin. The test is for bug https://bugs.webkit.org/show_bug.cgi?id=41292.
......
third_party/blink/web_tests/plugins/plugin-initiate-popup-window.html
View file @ bd7943e7
<html>
<head>
<script src="../resources/gesture-util.js"></script>
<script>
if (window.testRunner) {
testRunner.dumpAsText();
......@@ -16,10 +17,7 @@ function test() {
window.windowCount = testRunner.windowCount();
console.log("window count: " + testRunner.windowCount());
// Send a mouse-click event to set the input focus to the test plugin.
eventSender.mouseMoveTo(0, 0);
eventSender.mouseMoveTo(20, 20);
eventSender.mouseDown();
eventSender.mouseUp();
mouseClickOn(20, 20);
}
// This function will be called when plugin receives a mousedown event.
......@@ -36,11 +34,9 @@ function popup_by_mousedown() {
function send_key_to_plugin() {
// Send keyboard events to the plugin.
eventSender.mouseMoveTo(0, 0);
eventSender.mouseMoveTo(60, 60);
eventSender.mouseDown();
eventSender.mouseUp();
eventSender.keyDown('p');
mouseClickOn(60, 60).then(()=> {
eventSender.keyDown('p');
});
}
// This function will be called when plugin receives a keydown event.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment