Convert editing/style/style-3681552-fix-001.html to use w3c test harness

This patch converts "editing/style/style-3681552-fix-001.html" to use w3c test harness and integrates into "typing_style.html", since both test cases are very similar, to simplify test script for improving readability. BUG=n/a TEST=n/a; no behavior changes Review-Url: https://codereview.chromium.org/2250653003 Cr-Commit-Position: refs/heads/master@{#412469}

Convert editing/style/style-3681552-fix-001.html to use w3c test harness
This patch converts "editing/style/style-3681552-fix-001.html" to use w3c test harness and integrates into "typing_style.html", since both test cases are very similar, to simplify test script for improving readability. BUG=n/a TEST=n/a; no behavior changes Review-Url: https://codereview.chromium.org/2250653003 Cr-Commit-Position: refs/heads/master@{#412469}
572ae906 · yosin · Commit bot · 922c87eb · 922c87eb · 572ae906
Commit 572ae906 authored Aug 17, 2016 by yosin Committed by Commit bot Aug 17, 2016
8 changed files
--- a/third_party/WebKit/LayoutTests/editing/style/style-3681552-fix-001.html
+++ b/third_party/WebKit/LayoutTests/editing/style/style-3681552-fix-001.html
-<html> 
-<head>
-<style>
-.editing { 
-    border: 2px solid red; 
-    padding: 12px; 
-    font-size: 24px; 
-}
-</style>
-<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
-<script>
-function editingTest() {
-    for (i = 0; i < 8; i++)
-        moveSelectionForwardByCharacterCommand();
-    for (i = 0; i < 4; i++)
-        extendSelectionForwardByCharacterCommand();
-    for (i = 0; i < 4; i++)
-        typeCharacterCommand();
-}
-</script>
-<title>Editing Test</title> 
-</head> 
-<body>
-<div contenteditable id="root" class="editing">
-<span id="test">here is <i>some</i> text</span>
-</div>
-<script>
-runEditingTest();
-</script>
-</body>
-</html>
--- a/third_party/WebKit/LayoutTests/editing/style/typing_style.html
+++ b/third_party/WebKit/LayoutTests/editing/style/typing_style.html
@@ -44,4 +44,10 @@
        },
        '<div contenteditable>abc<b>def</b><i><b>ghi</b>jkl</i>mno|</div>'),
        'Nested styles and disabling styles');
+    test(() => assert_selection(
+        '<div contenteditable>here is <i>^some|</i> text</div>',
+        'insertText abcd',
+        '<div contenteditable>here is <i>abcd|</i> text</div>'),
+        'Replace selection keeps style');
 </script>
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/style/style-3681552-fix-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/style/style-3681552-fix-001-expected.png
--- a/third_party/WebKit/LayoutTests/platform/linux/editing/style/style-3681552-fix-001-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/linux/editing/style/style-3681552-fix-001-expected.txt
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  LayoutBlockFlow {HTML} at (0,0) size 800x600
-    LayoutBlockFlow {BODY} at (8,8) size 784x584
-      LayoutBlockFlow {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
-        LayoutInline {SPAN} at (0,0) size 156x27
-          LayoutText {#text} at (14,14) size 69x27
-            text run at (14,14) width 69: "here is "
-          LayoutInline {I} at (0,0) size 44x27
-            LayoutText {#text} at (83,14) size 44x27
-              text run at (83,14) width 44: "xxxx"
-          LayoutText {#text} at (127,14) size 43x27
-            text run at (127,14) width 43: " text"
-        LayoutText {#text} at (0,0) size 0x0
-caret: position 4 of child 0 {#text} of child 1 {I} of child 1 {SPAN} of child 1 {DIV} of body
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/style/style-3681552-fix-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/style/style-3681552-fix-001-expected.png
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/style/style-3681552-fix-001-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/editing/style/style-3681552-fix-001-expected.txt
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  LayoutBlockFlow {HTML} at (0,0) size 800x600
-    LayoutBlockFlow {BODY} at (8,8) size 784x584
-      LayoutBlockFlow {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
-        LayoutInline {SPAN} at (0,0) size 154x28
-          LayoutText {#text} at (14,14) size 70x28
-            text run at (14,14) width 70: "here is "
-          LayoutInline {I} at (0,0) size 43x28
-            LayoutText {#text} at (83,14) size 43x28
-              text run at (83,14) width 43: "xxxx"
-          LayoutText {#text} at (125,14) size 43x28
-            text run at (125,14) width 43: " text"
-        LayoutText {#text} at (0,0) size 0x0
-caret: position 4 of child 0 {#text} of child 1 {I} of child 1 {SPAN} of child 1 {DIV} of body
--- a/third_party/WebKit/LayoutTests/platform/win/editing/style/style-3681552-fix-001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/style/style-3681552-fix-001-expected.png
--- a/third_party/WebKit/LayoutTests/platform/win/editing/style/style-3681552-fix-001-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/win/editing/style/style-3681552-fix-001-expected.txt
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  LayoutBlockFlow {HTML} at (0,0) size 800x600
-    LayoutBlockFlow {BODY} at (8,8) size 784x584
-      LayoutBlockFlow {DIV} at (0,0) size 784x55 [border: (2px solid #FF0000)]
-        LayoutInline {SPAN} at (0,0) size 154x26
-          LayoutText {#text} at (14,14) size 70x26
-            text run at (14,14) width 70: "here is "
-          LayoutInline {I} at (0,0) size 43x26
-            LayoutText {#text} at (83,14) size 43x26
-              text run at (83,14) width 43: "xxxx"
-          LayoutText {#text} at (125,14) size 43x26
-            text run at (125,14) width 43: " text"
-        LayoutText {#text} at (0,0) size 0x0
-caret: position 4 of child 0 {#text} of child 1 {I} of child 1 {SPAN} of child 1 {DIV} of body