Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(942)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/editing/selection/shift-click.html

Issue 2966473002: Convert editing/selection/shift-click.html to use assert_selection() (Closed)
Patch Set: 2017-07-03T15:30:45 Rebase Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/editing/selection/script-tests/shift-click.js ('k') | third_party/WebKit/LayoutTests/editing/selection/shift-click-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/editing/selection/shift-click.html
diff --git a/third_party/WebKit/LayoutTests/editing/selection/shift-click.html b/third_party/WebKit/LayoutTests/editing/selection/shift-click.html
index aaf8860a18da4d4c870f75b91997bb171c603744..fa9ca683be6c51147cd7105115a8626b5248121e 100644
--- a/third_party/WebKit/LayoutTests/editing/selection/shift-click.html
+++ b/third_party/WebKit/LayoutTests/editing/selection/shift-click.html
@@ -1,12 +1,143 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src="../../resources/js-test.js"></script>
-<script src="resources/js-test-selection-shared.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script src="script-tests/shift-click.js"></script>
-</body>
-</html>
+<!doctype html>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<script src="../assert_selection.js"></script>
+<script>
+// TODO(editing-dev): Once http://crbug.com/736253 fixed, we should use
+// |chrome.pointerActionSequence()| instead of |eventSender|.
+const kSample = [
+ '<div id="first">one <span id="start"></span>two three</div>',
+ '<div id="second">four <span id="end"></span>five six</div>',
+].join('');
+
+function doTest(behavior) {
+ assert_exists(window, 'eventSender', 'This test requires eventSender.');
+ assert_exists(window, 'internals', 'This test requires internals.');
+
+ function doDrag(selection) {
+ const document = selection.document;
+ const start = document.getElementById('start');
+ const end = document.getElementById('end');
+
+ // Reset selection granularity
+ eventSender.leapForward(1000);
+ eventSender.mouseMoveTo(0, 0);
+ eventSender.mouseDown();
+ eventSender.leapForward(1000);
+
+ // Double-click select to get around eventSender bug where it won't select
+ // text just using single-click.
+ eventSender.mouseMoveTo(selection.computeLeft(start),
+ selection.computeTop(start));
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+ eventSender.mouseDown();
+ eventSender.mouseMoveTo(selection.computeLeft(end),
+ selection.computeTop(end));
+ eventSender.mouseUp();
+ }
+
+ function doShiftClick(selection, target, offsetX) {
+ const document = selection.document;
+ const parent = target.parentNode;
+ eventSender.mouseMoveTo(selection.computeLeft(target) + offsetX,
+ selection.computeTop(target));
+ eventSender.mouseDown(0, ['shiftKey']);
+ eventSender.mouseUp(0, ['shiftKey']);
+ }
+
+ internals.settings.setEditingBehavior(behavior);
+
+ assert_selection(
+ kSample,
+ selection => doDrag(selection),
+ [
+ '<div id="first">one <span id="start"></span>^two three</div>',
+ '<div id="second">four <span id="end"></span>five| six</div>',
+ ].join(''),
+ `${behavior}-1: Drag start to end`);
+
+ assert_selection(
+ kSample,
+ selection => {
+ const second = selection.document.getElementById('second');
+ doDrag(selection);
+ doShiftClick(selection, second, second.offsetWidth);
+ },
+ [
+ '<div id="first">one <span id="start"></span>^two three</div>',
+ '<div id="second">four <span id="end"></span>five six|</div>',
+ ].join(''),
+ `${behavior}-2: Shift click second`);
+
+ assert_selection(
+ kSample,
+ selection => {
+ const end = selection.document.getElementById('end');
+ const second = selection.document.getElementById('second');
+ doDrag(selection);
+ doShiftClick(selection, second, second.offsetWidth);
+ doShiftClick(selection, end, 0);
+ },
+ [
+ '<div id="first">one <span id="start"></span>^two three</div>',
+ '<div id="second">four <span id="end"></span>five| six</div>',
+ ].join(''),
+ `${behavior}-3: Shift click end`);
+
+ // These two fail on Mac due https://bugs.webkit.org/show_bug.cgi?id=36256
+ // In the first shiftClick call, the space after five is selected and
+ // shouldn't be. In the second shiftClick call, "six" is selected and
+ // shouldn't be.
+ assert_selection(
+ kSample,
+ selection => {
+ const end = selection.document.getElementById('end');
+ const first = selection.document.getElementById('first');
+ const second = selection.document.getElementById('second');
+ doDrag(selection);
+ doShiftClick(selection, second, second.offsetWidth);
+ doShiftClick(selection, end, 0);
+ doShiftClick(selection, first, 0);
+ },
+ behavior === 'mac'
+ ? [
+ '<div id="first">|one <span id="start"></span>two three</div>',
+ '<div id="second">four <span id="end"></span>five ^six</div>',
+ ].join('')
+ : [
+ '<div id="first">|one <span id="start"></span>two^ three</div>',
+ '<div id="second">four <span id="end"></span>five six</div>',
+ ].join(''),
+ `${behavior}-4: Shift click first`);
+
+ assert_selection(
+ kSample,
+ selection => {
+ const end = selection.document.getElementById('end');
+ const first = selection.document.getElementById('first');
+ const second = selection.document.getElementById('second');
+ const start = selection.document.getElementById('start');
+ doDrag(selection);
+ doShiftClick(selection, second, second.offsetWidth);
+ doShiftClick(selection, end, 0);
+ doShiftClick(selection, first, 0);
+ doShiftClick(selection, start, 0);
+ },
+ behavior === 'mac'
+ ? [
+ '<div id="first">one <span id="start"></span>|two three</div>',
+ '<div id="second">four <span id="end"></span>five six^</div>',
+ ].join('')
+ : [
+ '<div id="first">one <span id="start"></span>^two| three</div>',
+ '<div id="second">four <span id="end"></span>five six</div>',
+ ].join(''),
+ `${behavior}-5: Shift click start`);
+}
+
+for (const behavior of ['mac', 'win']) {
+ test(() => doTest(behavior),
+ `${behavior}: Expand selection with Shift+Click`);
+}
+</script>
« no previous file with comments | « third_party/WebKit/LayoutTests/editing/selection/script-tests/shift-click.js ('k') | third_party/WebKit/LayoutTests/editing/selection/shift-click-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698