Convert Image Tests 23 and 24 to use the Actions API
Bug: 1302171
Change-Id: I57668b611c9603c70f5564fae1a659ad4fdba309
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3861250
Commit-Queue: Suyash Nayan <suyashnyn1@gmail.com>
Reviewed-by: Andrew Williams <awillia@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1045548}
diff --git a/html/editing/dnd/images/023.html b/html/editing/dnd/images/023.html
new file mode 100644
index 0000000..4765d79
--- /dev/null
+++ b/html/editing/dnd/images/023.html
@@ -0,0 +1,47 @@
+<!doctype html>
+<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>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="../resources/test-helper.js"></script>
+<head>
+<title>Dropping image on horizontal object scrollbar</title>
+<style type="text/css">
+p:first-child
+ {padding-left:1em;}
+object
+ {height:3em;
+ width:4em;}
+img
+ {width:5px;
+ height:5px;}
+</style>
+<script type="application/ecmascript">
+function dragImage()
+ {event.dataTransfer.effectAllowed = 'copy';}
+function dropImage(event)
+ {document.querySelector('p + p').firstChild.nodeValue = 'PASS';}
+</script>
+</head>
+<body ondragenter="event.preventDefault()" ondragover="return false">
+<p><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAEElEQVR42mNgaGD4D8YwBgAw9AX9Y9zBwwAAAABJRU5ErkJggg==" alt="PNG green pixel" ondragstart="dragImage()"/></p>
+<p>Drag little square above and drop it on horizontal scrollbar. Word PASS should appear once you drop it.</p>
+<object type="application/xhtml+xml" data="helper-drop-horizontal-scrollbar.xhtml">XHTML document</object>
+<script>
+async function test(){
+ await new Promise(loaded => window.addEventListener("load", loaded));
+ const img = document.querySelector('img');
+ const object = document.querySelector('object');
+ function onDropCallBack(event) {
+ dropImage(event);
+ assert_equals('PASS', document.querySelector('p + p').firstChild.nodeValue);
+ return true;
+ }
+
+ dragDropTest(img, object, onDropCallBack, 'Dragging the image to the horizontal object scrollbar should copy it there');
+}
+test();
+</script>
+</body>
+</html>
diff --git a/html/editing/dnd/images/023.xhtml b/html/editing/dnd/images/023.xhtml
deleted file mode 100644
index 0d9e340..0000000
--- a/html/editing/dnd/images/023.xhtml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Dropping image on horizontal object scrollbar</title>
-<style type="text/css">
-p:first-child
- {padding-left:1em;}
-object
- {height:3em;
- width:4em;}
-img
- {width:5px;
- height:5px;}
-</style>
-<script type="application/ecmascript">
-function dragImage()
- {event.dataTransfer.effectAllowed = 'copy';}
-function dropImage(event)
- {document.querySelector('p + p').firstChild.nodeValue = 'PASS';}
-</script>
-</head>
-<body ondragenter="event.preventDefault()" ondragover="return false">
-<p><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAEElEQVR42mNgaGD4D8YwBgAw9AX9Y9zBwwAAAABJRU5ErkJggg==" alt="PNG green pixel" ondragstart="dragImage()" ondragend="dropImage(event)"/></p>
-<p>Drag little square above and drop it on horizontal scrollbar. Word PASS should appear once you drop it.</p>
-<object type="application/xhtml+xml" data="helper-drop-horizontal-scrollbar.xhtml">XHTML document</object>
-</body>
-</html>
diff --git a/html/editing/dnd/images/024.html b/html/editing/dnd/images/024.html
new file mode 100644
index 0000000..0e695cf
--- /dev/null
+++ b/html/editing/dnd/images/024.html
@@ -0,0 +1,47 @@
+<!doctype html>
+<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>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="../resources/test-helper.js"></script>
+<head>
+<title>Dropping image on vertical object scrollbar</title>
+<style type="text/css">
+p:first-child
+ {padding-left:1em;}
+object
+ {height:6em;
+ width:3em;}
+img
+ {width:5px;
+ height:5px;}
+</style>
+<script type="application/ecmascript">
+function dragImage()
+ {event.dataTransfer.effectAllowed = 'copy';}
+function dropImage(event)
+ {document.querySelector('p + p').firstChild.nodeValue = 'PASS';}
+</script>
+</head>
+<body ondragenter="event.preventDefault()" ondragover="return false">
+<p><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAEElEQVR42mNgaGD4D8YwBgAw9AX9Y9zBwwAAAABJRU5ErkJggg==" alt="PNG green pixel" ondragstart="dragImage()"/></p>
+<p>Drag little square above and drop it on vertical scrollbar. Word PASS should appear once you drop it.</p>
+<object type="application/xhtml+xml" data="helper-drop-vertical-scrollbar.xhtml">XHTML document</object>
+<script>
+async function test(){
+ await new Promise(loaded => window.addEventListener("load", loaded));
+ const img = document.querySelector('img');
+ const object = document.querySelector('object');
+ function onDropCallBack(event) {
+ dropImage(event);
+ assert_equals('PASS', document.querySelector('p + p').firstChild.nodeValue);
+ return true;
+ }
+
+ dragDropTest(img, object, onDropCallBack, 'Dragging the image to the vertical object scrollbar should copy it there');
+}
+test();
+</script>
+</body>
+</html>
diff --git a/html/editing/dnd/images/024.xhtml b/html/editing/dnd/images/024.xhtml
deleted file mode 100644
index 0c3a456..0000000
--- a/html/editing/dnd/images/024.xhtml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Dropping image on vertical object scrollbar</title>
-<style type="text/css">
-p:first-child
- {padding-left:1em;}
-object
- {height:6em;
- width:3em;}
-img
- {width:5px;
- height:5px;}
-</style>
-<script type="application/ecmascript">
-function dragImage()
- {event.dataTransfer.effectAllowed = 'copy';}
-function dropImage(event)
- {document.querySelector('p + p').firstChild.nodeValue = 'PASS';}
-</script>
-</head>
-<body ondragenter="event.preventDefault()" ondragover="return false">
-<p><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAEElEQVR42mNgaGD4D8YwBgAw9AX9Y9zBwwAAAABJRU5ErkJggg==" alt="PNG green pixel" ondragstart="dragImage()" ondragend="dropImage(event)"/></p>
-<p>Drag little square above and drop it on vertical scrollbar. Word PASS should appear once you drop it.</p>
-<object type="application/xhtml+xml" data="helper-drop-vertical-scrollbar.xhtml">XHTML document</object>
-</body>
-</html>
