Diff
Modified: trunk/LayoutTests/ChangeLog (187802 => 187803)
--- trunk/LayoutTests/ChangeLog 2015-08-04 03:08:18 UTC (rev 187802)
+++ trunk/LayoutTests/ChangeLog 2015-08-04 03:11:39 UTC (rev 187803)
@@ -1,5 +1,19 @@
2015-08-03 Simon Fraser <[email protected]>
+ Move platform/gtk/editing/pasteboard tests into editing/pasteboard/gtk.
+
+ * TestExpectations:
+ * editing/pasteboard/gtk/middle-button-paste-expected.txt: Renamed from LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste-expected.txt.
+ * editing/pasteboard/gtk/middle-button-paste.html: Renamed from LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste.html.
+ * editing/pasteboard/gtk/middle-click-onpaste-expected.txt: Renamed from LayoutTests/platform/gtk/editing/pasteboard/middle-click-onpaste-expected.txt.
+ * editing/pasteboard/gtk/middle-click-onpaste.html: Renamed from LayoutTests/platform/gtk/editing/pasteboard/middle-click-onpaste.html.
+ * editing/pasteboard/gtk/script-tests/TEMPLATE.html: Renamed from LayoutTests/platform/gtk/editing/pasteboard/script-tests/TEMPLATE.html.
+ * editing/pasteboard/gtk/script-tests/middle-click-onpaste.js: Renamed from LayoutTests/platform/gtk/editing/pasteboard/script-tests/middle-click-onpaste.js.
+ (handlePaste):
+ * platform/gtk/TestExpectations:
+
+2015-08-03 Simon Fraser <[email protected]>
+
Move platform/win/accessibility tests to accessibility/win.
Fix paths to script files in the tests. Fix TestExpectations. Remove an unused result.
Modified: trunk/LayoutTests/TestExpectations (187802 => 187803)
--- trunk/LayoutTests/TestExpectations 2015-08-04 03:08:18 UTC (rev 187802)
+++ trunk/LayoutTests/TestExpectations 2015-08-04 03:11:39 UTC (rev 187803)
@@ -9,6 +9,7 @@
accessibility/gtk [ Skip ]
accessibility/mac [ Skip ]
accessibility/win [ Skip ]
+editing/pasteboard/gtk [ Skip ]
#//////////////////////////////////////////////////////////////////////////////////////////
# End platform-specific directories.
Copied: trunk/LayoutTests/editing/pasteboard/gtk/middle-button-paste-expected.txt (from rev 187800, trunk/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste-expected.txt) (0 => 187803)
--- trunk/LayoutTests/editing/pasteboard/gtk/middle-button-paste-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/gtk/middle-button-paste-expected.txt 2015-08-04 03:11:39 UTC (rev 187803)
@@ -0,0 +1,3 @@
+Select me, select me, select meSelect me, select me, select me
+
+The original text was "Select me, select me, select me", after selecting and pasting the result should be "Select me, select me, select meSelect me, select me, select me"
Copied: trunk/LayoutTests/editing/pasteboard/gtk/middle-button-paste.html (from rev 187800, trunk/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste.html) (0 => 187803)
--- trunk/LayoutTests/editing/pasteboard/gtk/middle-button-paste.html (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/gtk/middle-button-paste.html 2015-08-04 03:11:39 UTC (rev 187803)
@@ -0,0 +1,42 @@
+<html>
+<head>
+
+<script type="text/_javascript_">
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+
+<style>
+body { margin: 0; padding: 0 }
+</style>
+
+<script type="text/_javascript_">
+
+function runTest()
+{
+ var target = document.getElementById("text");
+
+ var x = target.offsetParent.offsetLeft + target.offsetLeft;
+ var y = target.offsetParent.offsetTop + target.offsetTop +
+ target.offsetHeight / 2;
+
+ eventSender.mouseDown();
+ eventSender.mouseMoveTo(x, y);
+ eventSender.mouseMoveTo(x, y + target.offsetHeight);
+ eventSender.mouseUp();
+ eventSender.mouseMoveTo(x, y);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+ eventSender.mouseDown(1);
+ eventSender.mouseUp(1);
+}
+
+</script>
+</head>
+<body _onload_="runTest()">
+<div id="text" contenteditable>Select me, select me, select me</div>
+
+<br/>
+<p>The original text was "Select me, select me, select me", after selecting and pasting the result should be "Select me, select me, select meSelect me, select me, select me"</p>
+</body>
+</html>
Copied: trunk/LayoutTests/editing/pasteboard/gtk/middle-click-onpaste-expected.txt (from rev 187800, trunk/LayoutTests/platform/gtk/editing/pasteboard/middle-click-onpaste-expected.txt) (0 => 187803)
--- trunk/LayoutTests/editing/pasteboard/gtk/middle-click-onpaste-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/gtk/middle-click-onpaste-expected.txt 2015-08-04 03:11:39 UTC (rev 187803)
@@ -0,0 +1,10 @@
+Test that middle click triggers the onpaste event
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS pasteCount is 1
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: trunk/LayoutTests/editing/pasteboard/gtk/middle-click-onpaste.html (from rev 187800, trunk/LayoutTests/platform/gtk/editing/pasteboard/middle-click-onpaste.html) (0 => 187803)
--- trunk/LayoutTests/editing/pasteboard/gtk/middle-click-onpaste.html (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/gtk/middle-click-onpaste.html 2015-08-04 03:11:39 UTC (rev 187803)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src=""
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script src=""
+<script src=""
+</body>
+</html>
Copied: trunk/LayoutTests/editing/pasteboard/gtk/script-tests/TEMPLATE.html (from rev 187800, trunk/LayoutTests/platform/gtk/editing/pasteboard/script-tests/TEMPLATE.html) (0 => 187803)
--- trunk/LayoutTests/editing/pasteboard/gtk/script-tests/TEMPLATE.html (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/gtk/script-tests/TEMPLATE.html 2015-08-04 03:11:39 UTC (rev 187803)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src=""
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script src=""
+<script src=""
+</body>
+</html>
Copied: trunk/LayoutTests/editing/pasteboard/gtk/script-tests/middle-click-onpaste.js (from rev 187800, trunk/LayoutTests/platform/gtk/editing/pasteboard/script-tests/middle-click-onpaste.js) (0 => 187803)
--- trunk/LayoutTests/editing/pasteboard/gtk/script-tests/middle-click-onpaste.js (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/gtk/script-tests/middle-click-onpaste.js 2015-08-04 03:11:39 UTC (rev 187803)
@@ -0,0 +1,26 @@
+description('Test that middle click triggers the onpaste event');
+
+var pasteCount = 0;
+
+function handlePaste(eventObj)
+{
+ pasteCount++;
+}
+
+var target = document.getElementById("description");
+target._onpaste_ = handlePaste;
+
+if (window.testRunner)
+{
+ testRunner.dumpAsText();
+ var x = target.offsetParent.offsetLeft + target.offsetLeft +
+ target.offsetWidth / 2;
+ var y = target.offsetParent.offsetTop + target.offsetTop +
+ target.offsetHeight / 2;
+ eventSender.mouseMoveTo(x, y);
+ eventSender.mouseDown(1);
+ eventSender.mouseUp(1);
+ shouldBe("pasteCount", "1");
+}
+
+var successfullyParsed = true;
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (187802 => 187803)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2015-08-04 03:08:18 UTC (rev 187802)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2015-08-04 03:11:39 UTC (rev 187803)
@@ -7,6 +7,7 @@
#//////////////////////////////////////////////////////////////////////////////////////////
accessibility/gtk [ Pass ]
+editing/pasteboard/gtk [ Pass ]
#//////////////////////////////////////////////////////////////////////////////////////////
# End platform-specific directories.
Deleted: trunk/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste-expected.txt (187802 => 187803)
--- trunk/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste-expected.txt 2015-08-04 03:08:18 UTC (rev 187802)
+++ trunk/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste-expected.txt 2015-08-04 03:11:39 UTC (rev 187803)
@@ -1,3 +0,0 @@
-Select me, select me, select meSelect me, select me, select me
-
-The original text was "Select me, select me, select me", after selecting and pasting the result should be "Select me, select me, select meSelect me, select me, select me"
Deleted: trunk/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste.html (187802 => 187803)
--- trunk/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste.html 2015-08-04 03:08:18 UTC (rev 187802)
+++ trunk/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste.html 2015-08-04 03:11:39 UTC (rev 187803)
@@ -1,42 +0,0 @@
-<html>
-<head>
-
-<script type="text/_javascript_">
-if (window.testRunner)
- testRunner.dumpAsText();
-</script>
-
-<style>
-body { margin: 0; padding: 0 }
-</style>
-
-<script type="text/_javascript_">
-
-function runTest()
-{
- var target = document.getElementById("text");
-
- var x = target.offsetParent.offsetLeft + target.offsetLeft;
- var y = target.offsetParent.offsetTop + target.offsetTop +
- target.offsetHeight / 2;
-
- eventSender.mouseDown();
- eventSender.mouseMoveTo(x, y);
- eventSender.mouseMoveTo(x, y + target.offsetHeight);
- eventSender.mouseUp();
- eventSender.mouseMoveTo(x, y);
- eventSender.mouseDown();
- eventSender.mouseUp();
- eventSender.mouseDown(1);
- eventSender.mouseUp(1);
-}
-
-</script>
-</head>
-<body _onload_="runTest()">
-<div id="text" contenteditable>Select me, select me, select me</div>
-
-<br/>
-<p>The original text was "Select me, select me, select me", after selecting and pasting the result should be "Select me, select me, select meSelect me, select me, select me"</p>
-</body>
-</html>
Deleted: trunk/LayoutTests/platform/gtk/editing/pasteboard/middle-click-onpaste-expected.txt (187802 => 187803)
--- trunk/LayoutTests/platform/gtk/editing/pasteboard/middle-click-onpaste-expected.txt 2015-08-04 03:08:18 UTC (rev 187802)
+++ trunk/LayoutTests/platform/gtk/editing/pasteboard/middle-click-onpaste-expected.txt 2015-08-04 03:11:39 UTC (rev 187803)
@@ -1,10 +0,0 @@
-Test that middle click triggers the onpaste event
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS pasteCount is 1
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/platform/gtk/editing/pasteboard/middle-click-onpaste.html (187802 => 187803)
--- trunk/LayoutTests/platform/gtk/editing/pasteboard/middle-click-onpaste.html 2015-08-04 03:08:18 UTC (rev 187802)
+++ trunk/LayoutTests/platform/gtk/editing/pasteboard/middle-click-onpaste.html 2015-08-04 03:11:39 UTC (rev 187803)
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script src=""
-<script src=""
-</body>
-</html>
Deleted: trunk/LayoutTests/platform/gtk/editing/pasteboard/script-tests/TEMPLATE.html (187802 => 187803)
--- trunk/LayoutTests/platform/gtk/editing/pasteboard/script-tests/TEMPLATE.html 2015-08-04 03:08:18 UTC (rev 187802)
+++ trunk/LayoutTests/platform/gtk/editing/pasteboard/script-tests/TEMPLATE.html 2015-08-04 03:11:39 UTC (rev 187803)
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script src=""
-<script src=""
-</body>
-</html>
Deleted: trunk/LayoutTests/platform/gtk/editing/pasteboard/script-tests/middle-click-onpaste.js (187802 => 187803)
--- trunk/LayoutTests/platform/gtk/editing/pasteboard/script-tests/middle-click-onpaste.js 2015-08-04 03:08:18 UTC (rev 187802)
+++ trunk/LayoutTests/platform/gtk/editing/pasteboard/script-tests/middle-click-onpaste.js 2015-08-04 03:11:39 UTC (rev 187803)
@@ -1,26 +0,0 @@
-description('Test that middle click triggers the onpaste event');
-
-var pasteCount = 0;
-
-function handlePaste(eventObj)
-{
- pasteCount++;
-}
-
-var target = document.getElementById("description");
-target._onpaste_ = handlePaste;
-
-if (window.testRunner)
-{
- testRunner.dumpAsText();
- var x = target.offsetParent.offsetLeft + target.offsetLeft +
- target.offsetWidth / 2;
- var y = target.offsetParent.offsetTop + target.offsetTop +
- target.offsetHeight / 2;
- eventSender.mouseMoveTo(x, y);
- eventSender.mouseDown(1);
- eventSender.mouseUp(1);
- shouldBe("pasteCount", "1");
-}
-
-var successfullyParsed = true;
