Skip to content

GitLab

T
tangled
Commit b457274a authored by Lan Wei's avatar Lan Wei Committed by Commit Bot
Browse files
Options

Use testdriver Action API in WPT pointerevent tests - Part 9 

In order to run the web-platform-tests automatically, we will use
testdriver Action API in all the wpt to simulate inputs. Here we are
changing one pointerevent input test which has "touch-action: none" on
the table's row and cell, which tests that touch-action does not apply
to table rows, row groups, table columns, and column groups.

This is the ninth CL that changes part of the pointerevent input
tests.

Bug: 606367
Change-Id: Ie3b1d4a192c5c538f0de4c60ab5c9c492185d561
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1639080
Commit-Queue: Lan Wei <lanwei@chromium.org>
Reviewed-by: default avatarNavid Zolghadr <nzolghadr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#665568}
parent 8fc372d6
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 48 deletions
third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_touch-action-table-test_touch-manual.html → third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_touch-action-table-none-test_touch.html
View file @ b457274a
......@@ -8,6 +8,9 @@
<link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/resources/testdriver.js"></script>
<script src="/resources/testdriver-actions.js"></script>
<script src="/resources/testdriver-vendor.js"></script>
<script src="pointerevent_support.js"></script>
<style>
#target0 {
......@@ -38,7 +41,8 @@
</head>
<body onload="run()">
<h2>Pointer Events touch-action attribute support</h2>
<h4 id="desc">Test Description: Try to scroll element DOWN starting your touch over the 1st Row. Wait for description update.</h4>
<h4 id="desc">Test Description: Try to scroll element DOWN then RIGHT starting your touch over the 1st Row. <br>
And try to scroll element DOWN then RIGHT starting your touch inside of the Cell 3, then tap complete button.</h4>
<p>Note: this test is for touch only</p>
<div id="target0">
<table id="testtable">
......@@ -56,14 +60,13 @@
var xScrollIsReceived = false;
var yScrollIsReceived = false;
var xScr0, yScr0, xScr1, yScr1;
var scrollReturnInterval = 1000;
var isFirstPart = true;
setup({ explicit_timeout: true });
add_completion_callback(showPointerTypes);
function run() {
var target0 = document.getElementById("target0");
var btnComplete = document.getElementById("btnComplete");
var actions_promise;
//TA 15.19
var test_touchaction_cell = async_test("touch-action attribute test on the cell");
......@@ -74,11 +77,15 @@
on_event(btnComplete, 'click', function(event) {
test_touchaction_cell.step(function() {
assert_equals(target0.scrollLeft, 0, "table scroll x offset should be 0 in the end of the test");
assert_equals(target0.scrollTop, 0, "table scroll y offset should be 0 in the end of the test");
assert_equals(target0.scrollLeft, xScr1, "table scroll x offset should be 0 in the end of the test");
assert_equals(target0.scrollTop, yScr1, "table scroll y offset should be 0 in the end of the test");
assert_true(xScrollIsReceived && yScrollIsReceived, "target0 x and y scroll offsets should be greater than 0 after first two interactions (outside red border) respectively");
});
test_touchaction_cell.done();
// Make sure the test finishes after all the input actions are completed.
actions_promise.then( () => {
test_touchaction_cell.done();
});
updateDescriptionComplete();
});
......@@ -99,43 +106,29 @@
test_touchaction_row.step(function () {
yScrollIsReceived = true;
});
updateDescriptionSecondStepTable(target0, scrollReturnInterval);
}
if(xScrollIsReceived && yScrollIsReceived) {
test_touchaction_row.done();
updateDescriptionThirdStepTable(target0, scrollReturnInterval, function() {
setTimeout(function() {
isFirstPart = false;
}, scrollReturnInterval); // avoid immediate triggering while scroll is still being performed
});
}
}
else {
test_touchaction_cell.step(failOnScroll, "scroll received while shouldn't");
}
});
}
function updateDescriptionSecondStepTable(target, scrollReturnInterval, element) {
window.setTimeout(function() {
objectScroller(target, 'up', 0);
}
, scrollReturnInterval);
document.getElementById('desc').innerHTML = "Test Description: Try to scroll element RIGHT staring your touch over the Row 1";
}
function updateDescriptionThirdStepTable(target, scrollReturnInterval, callback = null) {
window.setTimeout(function() {
objectScroller(target, 'left', 0);
if (callback) {
callback();
}
}
, scrollReturnInterval);
document.getElementById('desc').innerHTML = "Test Description: Try to scroll element DOWN then RIGHT starting your touch inside of the Cell 3";
// Inject touch inputs.
actions_promise = touchScrollInTarget(row1, 'down').then(function() {
return touchScrollInTarget(row1, 'right');
}).then(function() {
isFirstPart = false;
return touchScrollInTarget(cell3, 'down');
}).then(function() {
return touchScrollInTarget(cell3, 'right');
}).then(function() {
return clickInTarget("touch", btnComplete);
});
}
</script>
<h1>touch-action: none</h1>
<div id="complete-notice">
......
third_party/blink/web_tests/external/wpt_automation/pointerevents/pointerevent_touch-action-table-test_touch-manual-automation.js deleted 100644 → 0
View file @ 8fc372d6
importAutomationScript('/pointerevents/pointerevent_common_input.js');
function inject_input() {
return touchScrollInTarget('#row1', 'down').then(function() {
return touchScrollInTarget('#row1', 'right');
}).then(function() {
return delayPromise(4*scrollReturnInterval);
}).then(function() {
return touchScrollInTarget('#cell3', 'down');
}).then(function() {
return touchScrollInTarget('#cell3', 'right');
}).then(function() {
return touchTapInTarget('#btnComplete');
});
}
third_party/blink/web_tests/resources/testdriver-vendor.js
View file @ b457274a
......@@ -29,7 +29,6 @@
}
var centerPoint = getInViewCenterPoint(rectangles[0]);
if ("elementsFromPoint" in document) {
return document.elementsFromPoint(centerPoint[0], centerPoint[1]);
} else if ("msElementsFromPoint" in document) {
......@@ -42,7 +41,7 @@
function inView(element) {
var pointerInteractablePaintTree = getPointerInteractablePaintTree(element);
return pointerInteractablePaintTree.indexOf(element) !== -1;
return pointerInteractablePaintTree.indexOf(element) !== -1 || element.contains(pointerInteractablePaintTree[0]);
}
window.test_driver_internal.click = function(element, coords) {
......
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