[Editing][CodeHealth] Allow assert_selection have no anchor sample text. (issue 2114903002 by yoichio@chromium.org)

0 views
Skip to first unread message

yoi...@chromium.org

unread,
Jul 1, 2016, 4:48:55 AM7/1/16
to yo...@chromium.org, chromium...@chromium.org, blink-...@chromium.org
Reviewers: Yosi_UTC9
CL: https://codereview.chromium.org/2114903002/

Description:
[Editing][CodeHealth] Allow assert_selection have no anchor sample text.

This enable us to test creating new selection.

TEST=LayoutTests/editing/assert_selection.html

Base URL: https://chromium.googlesource.com/chromium/src.git@master

Affected files (+2, -8 lines):
M third_party/WebKit/LayoutTests/editing/assert_selection.html
M third_party/WebKit/LayoutTests/editing/assert_selection.js


Index: third_party/WebKit/LayoutTests/editing/assert_selection.html
diff --git a/third_party/WebKit/LayoutTests/editing/assert_selection.html b/third_party/WebKit/LayoutTests/editing/assert_selection.html
index a93a430c412b360913fb373fbae48966caa4eb2c..324ba8c79f372a3fe83079ab075a1f233253dbaf 100644
--- a/third_party/WebKit/LayoutTests/editing/assert_selection.html
+++ b/third_party/WebKit/LayoutTests/editing/assert_selection.html
@@ -14,6 +14,7 @@ function checked_assert_selection(input, command, output) {
}

test(() => {
+ assert_selection('foo', 'noop', 'foo');
assert_selection('|foo', 'noop', '|foo');
assert_selection('f|oo', 'noop', 'f|oo');
assert_selection('foo|', 'noop', 'foo|');
@@ -61,11 +62,6 @@ test(() => {
}, 'markers around table');

test(() => {
- assert_equals(checked_assert_selection('foo', 'noop', 'baz'),
- 'You should specify caret position in "foo".');
-}, 'no marker in input');
-
-test(() => {
assert_equals(checked_assert_selection('fo|o', 'noop', 'fo|o'),
'no exception');
}, 'no marker in output');
Index: third_party/WebKit/LayoutTests/editing/assert_selection.js
diff --git a/third_party/WebKit/LayoutTests/editing/assert_selection.js b/third_party/WebKit/LayoutTests/editing/assert_selection.js
index c615527057615aa8bb120fe1d2f4e71d7a901b91..6c506eac9586130ff48ded4b0c0c6d526efedf32 100644
--- a/third_party/WebKit/LayoutTests/editing/assert_selection.js
+++ b/third_party/WebKit/LayoutTests/editing/assert_selection.js
@@ -462,8 +462,6 @@ class Serializer {
* @param {!HTMLDocument} document
*/
serialize(document) {
- if (this.selection_.isNone)
- return document.body.firstChild.outerHTML;
this.serializeChildren(document.body);
return this.strings_.join('');
}
@@ -534,7 +532,7 @@ class Sample {
load(sampleText) {
const anchorMarker = sampleText.indexOf('^');
const focusMarker = sampleText.indexOf('|');
- if (focusMarker < 0) {
+ if (focusMarker < 0 && anchorMarker >= 0) {
throw new Error(`You should specify caret position in "${sampleText}".`);
}
if (focusMarker != sampleText.lastIndexOf('|')) {


yosin@chromium.org via codereview.chromium.org

unread,
Jul 1, 2016, 4:54:11 AM7/1/16
to yoi...@chromium.org, blink-...@chromium.org, chromium...@chromium.org

commit-bot@chromium.org via codereview.chromium.org

unread,
Jul 1, 2016, 4:54:19 AM7/1/16
to yoi...@chromium.org, yo...@chromium.org, commi...@chromium.org, blink-...@chromium.org, chromium...@chromium.org

commit-bot@chromium.org via codereview.chromium.org

unread,
Jul 1, 2016, 6:08:16 AM7/1/16
to yoi...@chromium.org, yo...@chromium.org, commi...@chromium.org, blink-...@chromium.org, chromium...@chromium.org
Committed patchset #1 (id:20001)

https://codereview.chromium.org/2114903002/

commit-bot@chromium.org via codereview.chromium.org

unread,
Jul 1, 2016, 6:10:16 AM7/1/16
to yoi...@chromium.org, yo...@chromium.org, commi...@chromium.org, blink-...@chromium.org, chromium...@chromium.org
Patchset 1 (id:??) landed as
https://crrev.com/b392dd0728db0342070faa731c3756e4c9f7fc19
Cr-Commit-Position: refs/heads/master@{#403433}

https://codereview.chromium.org/2114903002/
Reply all
Reply to author
Forward
0 new messages