Add test coverage for pointerId, pointerType for click as PointerEvent

Check pointerId, pointerType are the same as for the pointer event
stream that generated the click/auxclick event.

Bug: 1150441
Change-Id: Ic3c7bc05efad1b4024edbe3fc83cdbd812111c31
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2549464
Commit-Queue: Liviu Tinta <[email protected]>
Reviewed-by: Mustaq Ahmed <[email protected]>
Cr-Commit-Position: refs/heads/master@{#830213}

Author: liviutinta

pointerevents/pointerevent_auxclick_is_a_pointerevent.html

@@ -10,17 +10,47 @@
 <input id="target" style="margin: 20px">
 
 <script>
-  'use strict';
-  let auxclickTest = async_test("auxclick is a PointerEvent");
-  let target = document.getElementById("target");
+'use strict';
+let target = document.getElementById("target");
+let pointerId = 0;
+let pointerType = "";
 
-  target.addEventListener("auxclick", auxclickTest.step_func((e)=>{
+target.addEventListener("pointerdown", (e)=>{
+  pointerId = e.pointerId;
+  pointerType = e.pointerType;
+});
+
+function testFunction(test){
+  return test.step_func(e=>{
+    assert_equals(e.constructor, window.PointerEvent, "auxclick should use a PointerEvent constructor");
     assert_true(e instanceof PointerEvent, "auxclick should be a PointerEvent");
-  }));
-  let eventWatcher = new EventWatcher(auxclickTest, target, ["auxclick"]);
-  let actions = new test_driver.Actions();
-  actions = actions.pointerMove(0,0, {origin:target})
-    .pointerDown({button:actions.ButtonType.MIDDLE})
-    .pointerUp({button:actions.ButtonType.MIDDLE});
-  Promise.all([eventWatcher.wait_for("auxclick"), actions.send()]).then(()=>auxclickTest.done());
+    assert_equals(e.pointerId, pointerId, "auxclick's pointerId should match the pointerId of the pointer event that triggers it");
+    assert_equals(e.pointerType, pointerType, "axclick's pointerType should match the pointerType of the pointer event that triggers it");
+  });
+}
+
+function run_test(pointerType){
+  promise_test((test) => new Promise((resolve, reject) => {
+    const testPointer = "TestPointer";
+    let auxclickFunc = testFunction(test);
+    test.add_cleanup(() => {
+      target.removeEventListener("auxclick", auxclickFunc);
+      pointerId = 0;
+      pointerType = "";
+    });
+    target.addEventListener("auxclick", auxclickFunc);
+    let eventWatcher = new EventWatcher(test, target, ["auxclick"]);
+    let actions = new test_driver.Actions();
+    actions = actions
+      .addPointer(testPointer, pointerType)
+      .pointerMove(0,0, {origin:target, sourceName:testPointer})
+      .pointerDown({button:actions.ButtonType.MIDDLE, sourceName:testPointer})
+      .pointerUp({button:actions.ButtonType.MIDDLE, sourceName:testPointer});
+    Promise.all([eventWatcher.wait_for("auxclick"), actions.send()]).then(()=>resolve());
+  }), "auxclick using " + pointerType + " is a PointerEvent");
+}
+
+run_test("mouse");
+run_test("pen");
+// TODO(crbug.com/1150441): Add test for auxclick from touch.Note: Calling run_test("touch") here times out.
 </script>

pointerevents/pointerevent_click_is_a_pointerevent.html

@@ -4,18 +4,53 @@
 <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>
 
 <input id="target" style="margin: 20px">
 
 <script>
-  'use strict';
-  let clickTest = async_test("click is a PointerEvent");
-  let target = document.getElementById("target");
+'use strict';
+let target = document.getElementById("target");
+let pointerId = 0;
+let pointerType = "";
 
-  target.addEventListener("click", clickTest.step_func((e)=>{
+target.addEventListener("pointerdown", (e)=>{
+  pointerId = e.pointerId;
+  pointerType = e.pointerType;
+});
+
+function testFunction(test){
+  return test.step_func(e=>{
+    assert_equals(e.constructor, window.PointerEvent, "click should use a PointerEvent constructor");
     assert_true(e instanceof PointerEvent, "click should be a PointerEvent");
-  }));
-  let eventWatcher = new EventWatcher(clickTest, target, ["click"]);
-  Promise.all([eventWatcher.wait_for("click"), test_driver.click(target)]).then(()=>clickTest.done());
+    assert_equals(e.pointerId, pointerId, "click's pointerId should match the pointerId of the pointer event that triggers it");
+    assert_equals(e.pointerType, pointerType, "click's pointerType should match the pointerType of the pointer event that triggers it");
+  });
+}
+
+function run_test(pointerType){
+  promise_test((test) => new Promise((resolve, reject) => {
+    const testPointer = "TestPointer";
+    let clickFunc = testFunction(test);
+    test.add_cleanup(() => {
+      target.removeEventListener("click", clickFunc);
+      pointerId = 0;
+      pointerType = "";
+    });
+    target.addEventListener("click", clickFunc);
+    let eventWatcher = new EventWatcher(test, target, ["click"]);
+    let actions = new test_driver.Actions();
+    actions = actions
+      .addPointer(testPointer, pointerType)
+      .pointerMove(0,0, {origin:target, sourceName:testPointer})
+      .pointerDown({sourceName:testPointer})
+      .pointerUp({sourceName:testPointer});
+    Promise.all([eventWatcher.wait_for("click"), actions.send()]).then(()=>resolve());
+  }), "click using " + pointerType + " is a PointerEvent");
+}
+
+run_test("mouse");
+run_test("pen");
+// TODO(crbug.com/1150593): Add wpt test for touch (reuse run_test)
 </script>

pointerevents/pointerevent_contextmenu_is_a_pointerevent.html

@@ -10,17 +10,20 @@
 <input id="target" style="margin: 20px">
 
 <script>
-  'use strict';
-  let contextmenuTest = async_test("contextmenu is a PointerEvent");
-  let target = document.getElementById("target");
+'use strict';
+let contextmenuTest = async_test("contextmenu is a PointerEvent");
+let target = document.getElementById("target");
 
-  target.addEventListener("contextmenu", contextmenuTest.step_func((e)=>{
-    assert_true(e instanceof PointerEvent, "contextmenu should be a PointerEvent");
-  }));
-  let eventWatcher = new EventWatcher(contextmenuTest, target, ["contextmenu"]);
-  let actions = new test_driver.Actions();
-  actions = actions.pointerMove(0,0, {origin:target})
-    .pointerDown({button:actions.ButtonType.RIGHT})
-    .pointerUp({button:actions.ButtonType.RIGHT});
-  Promise.all([eventWatcher.wait_for("contextmenu"), actions.send()]).then(()=>contextmenuTest.done());
+target.addEventListener("contextmenu", contextmenuTest.step_func((e)=>{
+  assert_equals(e.constructor, window.PointerEvent, "contextmenu should use a PointerEvent constructor");
+  assert_true(e instanceof PointerEvent, "contextmenu should be a PointerEvent");
+  // TODO(crbug.com/1150441,crbug.com/1150442): Test pointerId, pointerType are properly populated from the pointer event stream
+}));
+
+let eventWatcher = new EventWatcher(contextmenuTest, target, ["contextmenu"]);
+let actions = new test_driver.Actions();
+actions = actions.pointerMove(0,0, {origin:target})
+  .pointerDown({button:actions.ButtonType.RIGHT})
+  .pointerUp({button:actions.ButtonType.RIGHT});
+Promise.all([eventWatcher.wait_for("contextmenu"), actions.send()]).then(()=>contextmenuTest.done());
 </script>