Diff
Modified: trunk/LayoutTests/ChangeLog (86715 => 86716)
--- trunk/LayoutTests/ChangeLog 2011-05-17 23:03:43 UTC (rev 86715)
+++ trunk/LayoutTests/ChangeLog 2011-05-17 23:10:14 UTC (rev 86716)
@@ -2,6 +2,39 @@
Reviewed by Enrica Casucci.
+ editing/pasteboard/paste-blockquote-2.html and paste-blockquote-3.html should be dump-as-markup tests
+ https://bugs.webkit.org/show_bug.cgi?id=60998
+
+ Converted the tests.
+
+ * editing/pasteboard/paste-blockquote-2-expected.txt: Added.
+ * editing/pasteboard/paste-blockquote-2.html:
+ * editing/pasteboard/paste-blockquote-3-expected.txt: Added.
+ * editing/pasteboard/paste-blockquote-3.html:
+ * platform/chromium-linux/editing/pasteboard/paste-blockquote-2-expected.png: Removed.
+ * platform/chromium-linux/editing/pasteboard/paste-blockquote-3-expected.png: Removed.
+ * platform/chromium-mac-leopard/editing/pasteboard/paste-blockquote-2-expected.png: Removed.
+ * platform/chromium-mac-leopard/editing/pasteboard/paste-blockquote-3-expected.png: Removed.
+ * platform/chromium-mac/editing/pasteboard/paste-blockquote-2-expected.png: Removed.
+ * platform/chromium-mac/editing/pasteboard/paste-blockquote-3-expected.png: Removed.
+ * platform/chromium-win/editing/pasteboard/paste-blockquote-2-expected.png: Removed.
+ * platform/chromium-win/editing/pasteboard/paste-blockquote-2-expected.txt: Removed.
+ * platform/chromium-win/editing/pasteboard/paste-blockquote-3-expected.png: Removed.
+ * platform/chromium-win/editing/pasteboard/paste-blockquote-3-expected.txt: Removed.
+ * platform/gtk/editing/pasteboard/paste-blockquote-2-expected.txt: Removed.
+ * platform/gtk/editing/pasteboard/paste-blockquote-3-expected.txt: Removed.
+ * platform/mac-leopard/editing/pasteboard/paste-blockquote-3-expected.png: Removed.
+ * platform/mac/editing/pasteboard/paste-blockquote-2-expected.png: Removed.
+ * platform/mac/editing/pasteboard/paste-blockquote-2-expected.txt: Removed.
+ * platform/mac/editing/pasteboard/paste-blockquote-3-expected.png: Removed.
+ * platform/mac/editing/pasteboard/paste-blockquote-3-expected.txt: Removed.
+ * platform/qt/editing/pasteboard/paste-blockquote-2-expected.txt: Removed.
+ * platform/qt/editing/pasteboard/paste-blockquote-3-expected.txt: Removed.
+
+2011-05-17 Ryosuke Niwa <[email protected]>
+
+ Reviewed by Enrica Casucci.
+
editing/pasteboard/paste-text-012.html should be a dump-as-markup test
https://bugs.webkit.org/show_bug.cgi?id=60996
Added: trunk/LayoutTests/editing/pasteboard/paste-blockquote-2-expected.txt (0 => 86716)
--- trunk/LayoutTests/editing/pasteboard/paste-blockquote-2-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/paste-blockquote-2-expected.txt 2011-05-17 23:10:14 UTC (rev 86716)
@@ -0,0 +1,3 @@
+This tests pasting a blockquote at the start of a paragraph.
+| "This should not be blockquoted.<#selection-caret>"
+| " This should not be blockquoted."
Modified: trunk/LayoutTests/editing/pasteboard/paste-blockquote-2.html (86715 => 86716)
--- trunk/LayoutTests/editing/pasteboard/paste-blockquote-2.html 2011-05-17 23:03:43 UTC (rev 86715)
+++ trunk/LayoutTests/editing/pasteboard/paste-blockquote-2.html 2011-05-17 23:10:14 UTC (rev 86716)
@@ -1,3 +1,6 @@
+<!DOCYTPE html>
+<html>
+<head>
<style>
blockquote {
color: blue;
@@ -6,14 +9,21 @@
padding: 0 0 0 20px;
}
</style>
-
-<p>This tests pasting a blockquote at the start of a paragraph.</p>
+</head>
+<body>
<div id="div" contenteditable="true"> This should not be blockquoted.</div>
+<script src=""
+<script>
+Markup.description("This tests pasting a blockquote at the start of a paragraph.");
-<script>
var sel = window.getSelection();
var div = document.getElementById("div");
sel.setPosition(div, 0);
document.execCommand("InsertHTML", false, "<blockquote type='cite'>This should not be blockquoted.</blockquote>");
+
+Markup.dump('div');
+
</script>
+</body>
+</html>
Added: trunk/LayoutTests/editing/pasteboard/paste-blockquote-3-expected.txt (0 => 86716)
--- trunk/LayoutTests/editing/pasteboard/paste-blockquote-3-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/paste-blockquote-3-expected.txt 2011-05-17 23:10:14 UTC (rev 86716)
@@ -0,0 +1,9 @@
+This tests pasting a blockquote into the middle of a paragraph.
+| "This should not be blockquoted."
+| " This should not be blockquoted."
+| <blockquote>
+| type="cite"
+| "This should be blockquoted."
+| <br>
+| "This should not be blockquoted.<#selection-caret>"
+| " This should not be blockquoted."
Modified: trunk/LayoutTests/editing/pasteboard/paste-blockquote-3.html (86715 => 86716)
--- trunk/LayoutTests/editing/pasteboard/paste-blockquote-3.html 2011-05-17 23:03:43 UTC (rev 86715)
+++ trunk/LayoutTests/editing/pasteboard/paste-blockquote-3.html 2011-05-17 23:10:14 UTC (rev 86716)
@@ -1,3 +1,6 @@
+<!DOCTYPE html>
+<html>
+<head>
<style>
blockquote {
color: blue;
@@ -6,11 +9,14 @@
padding: 0 0 0 20px;
}
</style>
-
-<p>This tests pasting a blockquote into the middle of a paragraph.</p>
+</head>
+<body>
<div id="div" contenteditable="true">This should not be blockquoted. This should not be blockquoted.</div>
+<script src=""
+<script>
-<script>
+Markup.description("This tests pasting a blockquote into the middle of a paragraph.");
+
var sel = window.getSelection();
var div = document.getElementById("div");
@@ -22,4 +28,8 @@
sel.modify("move", "forward", "word");
sel.modify("move", "forward", "character");
document.execCommand("InsertHTML", false, "<blockquote type='cite'> This should not be blockquoted.<br>This should be blockquoted.<br>This should not be blockquoted.</blockquote>");
+
+Markup.dump('div');
</script>
+</body>
+</html>
Deleted: trunk/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-blockquote-2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-blockquote-3-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-mac/editing/pasteboard/paste-blockquote-2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-mac/editing/pasteboard/paste-blockquote-3-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-mac-leopard/editing/pasteboard/paste-blockquote-2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-mac-leopard/editing/pasteboard/paste-blockquote-3-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-2-expected.txt (86715 => 86716)
--- trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-2-expected.txt 2011-05-17 23:03:43 UTC (rev 86715)
+++ trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-2-expected.txt 2011-05-17 23:10:14 UTC (rev 86716)
@@ -1,14 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x20
- RenderText {#text} at (0,0) size 348x19
- text run at (0,0) width 348: "This tests pasting a blockquote at the start of a paragraph."
- RenderBlock {DIV} at (0,36) size 784x20
- RenderText {#text} at (0,0) size 194x19
- text run at (0,0) width 194: "This should not be blockquoted."
- RenderText {#text} at (194,0) size 198x19
- text run at (194,0) width 198: " This should not be blockquoted."
-caret: position 31 of child 0 {#text} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-3-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-3-expected.txt (86715 => 86716)
--- trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-3-expected.txt 2011-05-17 23:03:43 UTC (rev 86715)
+++ trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-3-expected.txt 2011-05-17 23:10:14 UTC (rev 86716)
@@ -1,24 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x20
- RenderText {#text} at (0,0) size 373x19
- text run at (0,0) width 373: "This tests pasting a blockquote into the middle of a paragraph."
- RenderBlock {DIV} at (0,36) size 784x60
- RenderBlock (anonymous) at (0,0) size 784x20
- RenderText {#text} at (0,0) size 194x19
- text run at (0,0) width 194: "This should not be blockquoted."
- RenderText {#text} at (194,0) size 198x19
- text run at (194,0) width 198: " This should not be blockquoted."
- RenderBlock {BLOCKQUOTE} at (0,20) size 784x20 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (22,0) size 171x19
- text run at (22,0) width 171: "This should be blockquoted."
- RenderBR {BR} at (193,15) size 0x0
- RenderBlock (anonymous) at (0,40) size 784x20
- RenderText {#text} at (0,0) size 194x19
- text run at (0,0) width 194: "This should not be blockquoted."
- RenderText {#text} at (194,0) size 198x19
- text run at (194,0) width 198: " This should not be blockquoted."
-caret: position 31 of child 3 {#text} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-blockquote-2-expected.txt (86715 => 86716)
--- trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-blockquote-2-expected.txt 2011-05-17 23:03:43 UTC (rev 86715)
+++ trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-blockquote-2-expected.txt 2011-05-17 23:10:14 UTC (rev 86716)
@@ -1,14 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 360x19
- text run at (0,0) width 360: "This tests pasting a blockquote at the start of a paragraph."
- RenderBlock {DIV} at (0,35) size 784x19
- RenderText {#text} at (0,0) size 203x19
- text run at (0,0) width 203: "This should not be blockquoted."
- RenderText {#text} at (203,0) size 207x19
- text run at (203,0) width 207: " This should not be blockquoted."
-caret: position 31 of child 0 {#text} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-blockquote-3-expected.txt (86715 => 86716)
--- trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-blockquote-3-expected.txt 2011-05-17 23:03:43 UTC (rev 86715)
+++ trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-blockquote-3-expected.txt 2011-05-17 23:10:14 UTC (rev 86716)
@@ -1,24 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 390x19
- text run at (0,0) width 390: "This tests pasting a blockquote into the middle of a paragraph."
- RenderBlock {DIV} at (0,35) size 784x57
- RenderBlock (anonymous) at (0,0) size 784x19
- RenderText {#text} at (0,0) size 203x19
- text run at (0,0) width 203: "This should not be blockquoted."
- RenderText {#text} at (203,0) size 207x19
- text run at (203,0) width 207: " This should not be blockquoted."
- RenderBlock {BLOCKQUOTE} at (0,19) size 784x19 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (22,0) size 179x19
- text run at (22,0) width 179: "This should be blockquoted."
- RenderBR {BR} at (201,15) size 0x0
- RenderBlock (anonymous) at (0,38) size 784x19
- RenderText {#text} at (0,0) size 203x19
- text run at (0,0) width 203: "This should not be blockquoted."
- RenderText {#text} at (203,0) size 207x19
- text run at (203,0) width 207: " This should not be blockquoted."
-caret: position 31 of child 3 {#text} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-2-expected.txt (86715 => 86716)
--- trunk/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-2-expected.txt 2011-05-17 23:03:43 UTC (rev 86715)
+++ trunk/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-2-expected.txt 2011-05-17 23:10:14 UTC (rev 86716)
@@ -1,14 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 360x18
- text run at (0,0) width 360: "This tests pasting a blockquote at the start of a paragraph."
- RenderBlock {DIV} at (0,34) size 784x18
- RenderText {#text} at (0,0) size 203x18
- text run at (0,0) width 203: "This should not be blockquoted."
- RenderText {#text} at (203,0) size 207x18
- text run at (203,0) width 207: " This should not be blockquoted."
-caret: position 31 of child 0 {#text} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-3-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-3-expected.txt (86715 => 86716)
--- trunk/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-3-expected.txt 2011-05-17 23:03:43 UTC (rev 86715)
+++ trunk/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-3-expected.txt 2011-05-17 23:10:14 UTC (rev 86716)
@@ -1,24 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 390x18
- text run at (0,0) width 390: "This tests pasting a blockquote into the middle of a paragraph."
- RenderBlock {DIV} at (0,34) size 784x54
- RenderBlock (anonymous) at (0,0) size 784x18
- RenderText {#text} at (0,0) size 203x18
- text run at (0,0) width 203: "This should not be blockquoted."
- RenderText {#text} at (203,0) size 207x18
- text run at (203,0) width 207: " This should not be blockquoted."
- RenderBlock {BLOCKQUOTE} at (0,18) size 784x18 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (22,0) size 179x18
- text run at (22,0) width 179: "This should be blockquoted."
- RenderBR {BR} at (201,14) size 0x0
- RenderBlock (anonymous) at (0,36) size 784x18
- RenderText {#text} at (0,0) size 203x18
- text run at (0,0) width 203: "This should not be blockquoted."
- RenderText {#text} at (203,0) size 207x18
- text run at (203,0) width 207: " This should not be blockquoted."
-caret: position 31 of child 3 {#text} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac-leopard/editing/pasteboard/paste-blockquote-3-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/pasteboard/paste-blockquote-2-expected.txt (86715 => 86716)
--- trunk/LayoutTests/platform/qt/editing/pasteboard/paste-blockquote-2-expected.txt 2011-05-17 23:03:43 UTC (rev 86715)
+++ trunk/LayoutTests/platform/qt/editing/pasteboard/paste-blockquote-2-expected.txt 2011-05-17 23:10:14 UTC (rev 86716)
@@ -1,14 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x22
- RenderText {#text} at (0,0) size 394x22
- text run at (0,0) width 394: "This tests pasting a blockquote at the start of a paragraph."
- RenderBlock {DIV} at (0,38) size 784x22
- RenderText {#text} at (0,0) size 217x22
- text run at (0,0) width 217: "This should not be blockquoted."
- RenderText {#text} at (217,0) size 221x22
- text run at (217,0) width 221: " This should not be blockquoted."
-caret: position 31 of child 0 {#text} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/qt/editing/pasteboard/paste-blockquote-3-expected.txt (86715 => 86716)
--- trunk/LayoutTests/platform/qt/editing/pasteboard/paste-blockquote-3-expected.txt 2011-05-17 23:03:43 UTC (rev 86715)
+++ trunk/LayoutTests/platform/qt/editing/pasteboard/paste-blockquote-3-expected.txt 2011-05-17 23:10:14 UTC (rev 86716)
@@ -1,24 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x22
- RenderText {#text} at (0,0) size 422x22
- text run at (0,0) width 422: "This tests pasting a blockquote into the middle of a paragraph."
- RenderBlock {DIV} at (0,38) size 784x66
- RenderBlock (anonymous) at (0,0) size 784x22
- RenderText {#text} at (0,0) size 217x22
- text run at (0,0) width 217: "This should not be blockquoted."
- RenderText {#text} at (217,0) size 221x22
- text run at (217,0) width 221: " This should not be blockquoted."
- RenderBlock {BLOCKQUOTE} at (0,22) size 784x22 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (22,0) size 191x22
- text run at (22,0) width 191: "This should be blockquoted."
- RenderBR {BR} at (213,16) size 0x0
- RenderBlock (anonymous) at (0,44) size 784x22
- RenderText {#text} at (0,0) size 217x22
- text run at (0,0) width 217: "This should not be blockquoted."
- RenderText {#text} at (217,0) size 221x22
- text run at (217,0) width 221: " This should not be blockquoted."
-caret: position 31 of child 3 {#text} of child 2 {DIV} of body
