third_party/WebKit/LayoutTests/editing/inserting/insert-composition-whitespace.html - Issue 2934883004: Rewrite editing/inserting/insert-composition-whitespace.html to utilize assert_selection()

Unified Diff: third_party/WebKit/LayoutTests/editing/inserting/insert-composition-whitespace.html

Issue 2934883004: Rewrite editing/inserting/insert-composition-whitespace.html to utilize assert_selection() (Closed)

Patch Set: 2017-06-14T13:56:20 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/FlagExpectations/enable-blink-features=LayoutNG ('k') | third_party/WebKit/LayoutTests/editing/inserting/insert-composition-whitespace-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/editing/inserting/insert-composition-whitespace.html

diff --git a/third_party/WebKit/LayoutTests/editing/inserting/insert-composition-whitespace.html b/third_party/WebKit/LayoutTests/editing/inserting/insert-composition-whitespace.html

index dd271d175e8f2cb4ea8b61eb5142f0f8d3f877c8..9c3ca51d5f2bd530e2c9849b50b664e79c4a033c 100644

--- a/third_party/WebKit/LayoutTests/editing/inserting/insert-composition-whitespace.html

+++ b/third_party/WebKit/LayoutTests/editing/inserting/insert-composition-whitespace.html

@@ -1,95 +1,77 @@

-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">

-<html>

-<head>

-<script src="../../resources/js-test.js"></script>

-</head>

-<body>

-<p id="description"></p>

-<div id="console"></div>

+<!doctype html>

+<script src="../../resources/testharness.js"></script>

+<script src="../../resources/testharnessreport.js"></script>

+<script src="../assert_selection.js"></script>

-var sel = document.getSelection();

-var root = document.createElement("root");

-document.body.appendChild(root);

-function createEditable(tagName, text) {

- var node = document.createElement(tagName);

- node.contentEditable = true;

- node.innerHTML = text;

- return node;

+function assertMarkedText(tagName, compositionText, expected) {

+ assert_selection(

+ `<${tagName} contenteditable id="sample">^X|</${tagName}>`,

+ selection => {

+ selection.document.execCommand('delete');

+ textInputController.setMarkedText(compositionText, 0,

+ compositionText.length);

+ const sample = selection.document.getElementById('sample');

+ assert_equals(sample.firstChild.textContent, expected);

+ textInputController.unmarkText();

+ },

+ `<${tagName} contenteditable id="sample">^${expected}|</${tagName}>`);

}

-function test(tagName, compositionText, expected) {

- var node = createEditable(tagName, "X");

- root.appendChild(node);

- var textNode = node.firstChild;

- sel.setBaseAndExtent(textNode, 0, textNode, textNode.data.length);

- document.execCommand("Delete", false);

- textInputController.setMarkedText(compositionText, 0, compositionText.length);

- compositingText = node.innerText;

- textInputController.unmarkText();

- confirmedText = node.innerText;

- shouldBe("compositingText", "'" + expected + "'");

- shouldBe("confirmedText", "'" + expected + "'");

-test("div", "AB", "AB");

-test("div", "A B", "A B");

-test("div", "A B", "A \xA0B");

-test("div", "A B", "A \xA0 B");

-test("div", "A B", "A \xA0 \xA0B");

-test("div", " AB", "\xA0AB");

-test("div", " AB", "\xA0 AB");

-test("div", " AB", "\xA0 \xA0AB");

-test("div", " AB", "\xA0 \xA0 AB");

-test("div", " AB", "\xA0 \xA0 \xA0AB");

-test("div", " AB", "\xA0 \xA0 \xA0 AB");

-test("div", " AB", "\xA0 \xA0 \xA0 \xA0AB");

-test("div", "AB ", "AB \xA0");

-test("div", "AB ", "AB \xA0\xA0");

-test("div", "AB ", "AB \xA0 \xA0");

-test("div", "AB ", "AB \xA0 \xA0\xA0");

-test("div", "AB ", "AB \xA0 \xA0 \xA0");

-test("div", "AB ", "AB \xA0 \xA0 \xA0\xA0");

+test(() => {

+ assert_exists(window, 'textInputController',

+ 'this test requires window.textInputController.');

-test("div", " A B ", "\xA0 A \xA0B \xA0");

-test("div", "\t\tA\t\tB\t\t", "\xA0 A \xA0B \xA0");

+ assertMarkedText('div', 'AB', 'AB');

+ assertMarkedText('div', 'A B', 'A B');

+ assertMarkedText('div', 'A B', 'A \xA0B');

+ assertMarkedText('div', 'A B', 'A \xA0 B');

+ assertMarkedText('div', 'A B', 'A \xA0 \xA0B');

-test("div", " ", "\xA0");

-test("div", " ", "\xA0\xA0");

-test("div", " ", "\xA0 \xA0");

+ assertMarkedText('div', ' AB', '\xA0AB');

+ assertMarkedText('div', ' AB', '\xA0 AB');

+ assertMarkedText('div', ' AB', '\xA0 \xA0AB');

+ assertMarkedText('div', ' AB', '\xA0 \xA0 AB');

+ assertMarkedText('div', ' AB', '\xA0 \xA0 \xA0AB');

+ assertMarkedText('div', ' AB', '\xA0 \xA0 \xA0 AB');

+ assertMarkedText('div', ' AB', '\xA0 \xA0 \xA0 \xA0AB');

+ assertMarkedText('div', 'AB ', 'AB \xA0');

+ assertMarkedText('div', 'AB ', 'AB \xA0\xA0');

+ assertMarkedText('div', 'AB ', 'AB \xA0 \xA0');

+ assertMarkedText('div', 'AB ', 'AB \xA0 \xA0\xA0');

+ assertMarkedText('div', 'AB ', 'AB \xA0 \xA0 \xA0');

+ assertMarkedText('div', 'AB ', 'AB \xA0 \xA0 \xA0\xA0');

-test("pre", "AB", "AB");

-test("pre", "A B", "A B");

-test("pre", "AB ", "AB ");

-test("pre", " AB", " AB");

+ assertMarkedText('div', ' A B ', '\xA0 A \xA0B \xA0');

+ assertMarkedText('div', '\t\tA\t\tB\t\t', '\xA0 A \xA0B \xA0');

-test("pre", " A B ", " A B ");

-test("pre", "\t\tA\t\tB\t\t", "\t\tA\t\tB\t\t");

-test("pre", " ", " ");

+ assertMarkedText('div', ' ', '\xA0');

+ assertMarkedText('div', ' ', '\xA0\xA0');

+ assertMarkedText('div', ' ', '\xA0 \xA0');

-root.style.display = "none";

+ assertMarkedText('pre', 'AB', 'AB');

+ assertMarkedText('pre', 'A B', 'A B');

+ assertMarkedText('pre', 'AB ', 'AB ');

+ assertMarkedText('pre', ' AB', ' AB');

+ assertMarkedText('pre', ' A B ', ' A B ');

+ assertMarkedText('pre', '\t\tA\t\tB\t\t', '\t\tA\t\tB\t\t');

+ assertMarkedText('pre', ' ', ' ');

+}, 'Insert space and TAB via TextInputController');

</script>

</body>

</html>