From 68929883be568abe070ff0d3fc990e27294b5939 Mon Sep 17 00:00:00 2001
From: Lan Wei <lanwei@chromium.org>
Date: Mon, 22 Jul 2019 11:06:06 +0000
Subject: [PATCH] Bug 1565382 [wpt PR 17789] - Use testdriver Action API in WPT
 pointerevent tests - Part 10, a=testonly

Automatic update from web-platform-tests
Use testdriver Action API in WPT pointerevent tests - Part 10

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 some pointerevent input test which taps on the elements inside
an inner frame.

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

Bug: 606367
Change-Id: Ib90c92e8267f17fed74a86d70ca6d739b5ccedb2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1638914
Commit-Queue: Lan Wei <lanwei@chromium.org>
Reviewed-by: Navid Zolghadr <nzolghadr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#675891}

--

wpt-commits: e6fff725295afce26b2000ab7644a69d29f78c08
wpt-pr: 17789
---
 ...revent_attributes_hoverable_pointers.html} | 28 ++++++++++++++++++-
 ...terevent_attributes_nohover_pointers.html} | 14 +++++++++-
 .../pointerevents/pointerevent_support.js     |  8 ++++++
 3 files changed, 48 insertions(+), 2 deletions(-)
 rename testing/web-platform/tests/pointerevents/{pointerevent_attributes_hoverable_pointers-manual.html => pointerevent_attributes_hoverable_pointers.html} (86%)
 rename testing/web-platform/tests/pointerevents/{pointerevent_attributes_nohover_pointers-manual.html => pointerevent_attributes_nohover_pointers.html} (90%)

diff --git a/testing/web-platform/tests/pointerevents/pointerevent_attributes_hoverable_pointers-manual.html b/testing/web-platform/tests/pointerevents/pointerevent_attributes_hoverable_pointers.html
similarity index 86%
rename from testing/web-platform/tests/pointerevents/pointerevent_attributes_hoverable_pointers-manual.html
rename to testing/web-platform/tests/pointerevents/pointerevent_attributes_hoverable_pointers.html
index e74714510762..97e0db158ed0 100644
--- a/testing/web-platform/tests/pointerevents/pointerevent_attributes_hoverable_pointers-manual.html
+++ b/testing/web-platform/tests/pointerevents/pointerevent_attributes_hoverable_pointers.html
@@ -6,6 +6,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>
         <!-- Additional helper script for common checks across event types -->
         <script type="text/javascript" src="pointerevent_support.js"></script>
         <script>
@@ -95,6 +98,7 @@
                 var innerFrame = document.getElementById('innerFrame');
                 var square2 = innerFrame.contentDocument.getElementById('square2');
                 var rectSquare2 = square2.getBoundingClientRect();
+                var actions_promise;
 
                 eventList.forEach(function(eventName) {
                     on_event(square1, eventName, function (event) {
@@ -112,10 +116,32 @@
                         checkPointerEventAttributes(event, rectSquare2, "Inner frame ");
                         if (Object.keys(detected_eventTypes).length == eventList.length) {
                             square2.style.visibility = 'hidden';
-                            test_pointerEvent.done();
+                            // Make sure the test finishes after all the input actions are completed.
+                            actions_promise.then( () => {
+                                test_pointerEvent.done();
+                            });
                         }
                     });
                 });
+
+                // Inject mouse and pen inputs.
+                actions_promise = clickInTarget("mouse", square1).then(function() {
+                    return moveToDocument("mouse");
+                }).then(function() {
+                    return clickInTarget("mouse", square2);
+                }).then(function() {
+                    return moveToDocument("mouse");
+                }).then(function() {
+                    test_pointerEvent.done();
+                }).then(function() {
+                    return clickInTarget("pen", square1);
+                }).then(function() {
+                    return moveToDocument("pen");
+                }).then(function() {
+                    return clickInTarget("pen", square2);
+                }).then(function() {
+                    return moveToDocument("pen");
+                });
             }
         </script>
     </head>
diff --git a/testing/web-platform/tests/pointerevents/pointerevent_attributes_nohover_pointers-manual.html b/testing/web-platform/tests/pointerevents/pointerevent_attributes_nohover_pointers.html
similarity index 90%
rename from testing/web-platform/tests/pointerevents/pointerevent_attributes_nohover_pointers-manual.html
rename to testing/web-platform/tests/pointerevents/pointerevent_attributes_nohover_pointers.html
index 0fd7904ef004..e0073defff35 100644
--- a/testing/web-platform/tests/pointerevents/pointerevent_attributes_nohover_pointers-manual.html
+++ b/testing/web-platform/tests/pointerevents/pointerevent_attributes_nohover_pointers.html
@@ -6,6 +6,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>
         <!-- Additional helper script for common checks across event types -->
         <script type="text/javascript" src="pointerevent_support.js"></script>
         <script>
@@ -76,6 +79,7 @@
                 var innerFrame = document.getElementById('innerFrame');
                 var square2 = innerFrame.contentDocument.getElementById('square2');
                 var rectSquare2 = square2.getBoundingClientRect();
+                var actions_promise;
 
                 eventList.forEach(function(eventName) {
                     on_event(square1, eventName, function (event) {
@@ -93,10 +97,18 @@
                         checkPointerEventAttributes(event, rectSquare2, "Inner frame ");
                         if (Object.keys(detected_eventTypes).length == eventList.length) {
                             square2.style.visibility = 'hidden';
-                            test_pointerEvent.done();
+                            // Make sure the test finishes after all the input actions are completed.
+                            actions_promise.then( () => {
+                                test_pointerEvent.done();
+                            });
                         }
                     });
                 });
+
+                // Inject touch inputs.
+                actions_promise = clickInTarget("touch", square1).then(function() {
+                    return clickInTarget("touch", square2);
+                });
             }
         </script>
     </head>
diff --git a/testing/web-platform/tests/pointerevents/pointerevent_support.js b/testing/web-platform/tests/pointerevents/pointerevent_support.js
index ae9b55c43d2c..3b37f48889f2 100644
--- a/testing/web-platform/tests/pointerevents/pointerevent_support.js
+++ b/testing/web-platform/tests/pointerevents/pointerevent_support.js
@@ -353,3 +353,11 @@ function pointerHoverInTarget(pointerType, target, direction) {
                    .pointerMove(3 * x_delta, 3 * y_delta, {origin: target})
                    .send();
 }
+
+function moveToDocument(pointerType) {
+    var pointerId = pointerType + "Pointer1";
+    return new test_driver.Actions()
+                   .addPointer(pointerId, pointerType)
+                   .pointerMove(0, 0)
+                   .send();
+}