2011-05-26 Ryosuke Niwa <rniwa@webkit.org>
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 May 2011 06:43:29 +0000 (06:43 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 May 2011 06:43:29 +0000 (06:43 +0000)
        Reviewed by Adam Barth.

        Convert editing/pasteboard/paste-blockquote-1.html to a dump-as-markup test
        https://bugs.webkit.org/show_bug.cgi?id=61608

        Converted paste-blockquote-1.html to a dump-as-markup test.

        * editing/pasteboard/paste-blockquote-1-expected.txt: Added.
        * editing/pasteboard/paste-blockquote-1.html:
        * platform/chromium-linux/editing/pasteboard/paste-blockquote-1-expected.png: Removed.
        * platform/chromium-win/editing/pasteboard/paste-blockquote-1-expected.png: Removed.
        * platform/chromium-win/editing/pasteboard/paste-blockquote-1-expected.txt: Removed.
        * platform/gtk/editing/pasteboard/paste-blockquote-1-expected.txt: Removed.
        * platform/mac-leopard/editing/pasteboard/paste-blockquote-1-expected.png: Removed.
        * platform/mac/editing/pasteboard/paste-blockquote-1-expected.png: Removed.
        * platform/mac/editing/pasteboard/paste-blockquote-1-expected.txt: Removed.
        * platform/qt/editing/pasteboard/paste-blockquote-1-expected.txt: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@87478 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/editing/pasteboard/paste-blockquote-1-expected.txt [new file with mode: 0644]
LayoutTests/editing/pasteboard/paste-blockquote-1.html
LayoutTests/platform/chromium-linux/editing/pasteboard/paste-blockquote-1-expected.png [deleted file]
LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-1-expected.png [deleted file]
LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-1-expected.txt [deleted file]
LayoutTests/platform/gtk/editing/pasteboard/paste-blockquote-1-expected.txt [deleted file]
LayoutTests/platform/mac-leopard/editing/pasteboard/paste-blockquote-1-expected.png [deleted file]
LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-1-expected.png [deleted file]
LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-1-expected.txt [deleted file]
LayoutTests/platform/qt/editing/pasteboard/paste-blockquote-1-expected.txt [deleted file]

index c928827..04d6ae5 100644 (file)
@@ -2,6 +2,26 @@
 
         Reviewed by Adam Barth.
 
+        Convert editing/pasteboard/paste-blockquote-1.html to a dump-as-markup test
+        https://bugs.webkit.org/show_bug.cgi?id=61608
+
+        Converted paste-blockquote-1.html to a dump-as-markup test.
+
+        * editing/pasteboard/paste-blockquote-1-expected.txt: Added.
+        * editing/pasteboard/paste-blockquote-1.html:
+        * platform/chromium-linux/editing/pasteboard/paste-blockquote-1-expected.png: Removed.
+        * platform/chromium-win/editing/pasteboard/paste-blockquote-1-expected.png: Removed.
+        * platform/chromium-win/editing/pasteboard/paste-blockquote-1-expected.txt: Removed.
+        * platform/gtk/editing/pasteboard/paste-blockquote-1-expected.txt: Removed.
+        * platform/mac-leopard/editing/pasteboard/paste-blockquote-1-expected.png: Removed.
+        * platform/mac/editing/pasteboard/paste-blockquote-1-expected.png: Removed.
+        * platform/mac/editing/pasteboard/paste-blockquote-1-expected.txt: Removed.
+        * platform/qt/editing/pasteboard/paste-blockquote-1-expected.txt: Removed.
+
+2011-05-26  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Adam Barth.
+
         Convert editing/pasteboard/merge-end-*.html to dump-as-markup tests
         https://bugs.webkit.org/show_bug.cgi?id=61607
 
diff --git a/LayoutTests/editing/pasteboard/paste-blockquote-1-expected.txt b/LayoutTests/editing/pasteboard/paste-blockquote-1-expected.txt
new file mode 100644 (file)
index 0000000..8b7ee2b
--- /dev/null
@@ -0,0 +1,4 @@
+This tests pasting a blockquote into an empty paragraph.
+| <blockquote>
+|   type="cite"
+|   "This should be blockquoted.<#selection-caret>"
index 5690fed..bdcdc0c 100644 (file)
@@ -1,3 +1,7 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../../resources/dump-as-markup.js"></script>
 <style>
 blockquote {
     color: blue;
@@ -6,14 +10,20 @@ blockquote {
     padding: 0 0 0 20px;
 }
 </style>
-
-<p>This tests pasting a blockquote into an empty paragraph.</p>
+</head>
+<body>
 <div id="div" contenteditable="true"></div>
-
+<script src="../../resources/dump-as-markup.js"></script>
 <script>
 var sel = window.getSelection();
 var div = document.getElementById("div");
 
 sel.setPosition(div, 0);
 document.execCommand("InsertHTML", false, "<blockquote type='cite'>This should be blockquoted.</blockquote>");
+
+Markup.description('This tests pasting a blockquote into an empty paragraph.');
+Markup.dump('div');
+
 </script>
+</body>
+</html>
diff --git a/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-blockquote-1-expected.png b/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-blockquote-1-expected.png
deleted file mode 100644 (file)
index 1200b1f..0000000
Binary files a/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-blockquote-1-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-1-expected.png b/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-1-expected.png
deleted file mode 100644 (file)
index 1b43da8..0000000
Binary files a/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-1-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-1-expected.txt b/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-1-expected.txt
deleted file mode 100644 (file)
index 8e10031..0000000
+++ /dev/null
@@ -1,13 +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 339x19
-          text run at (0,0) width 339: "This tests pasting a blockquote into an empty paragraph."
-      RenderBlock {DIV} at (0,36) size 784x20
-        RenderBlock {BLOCKQUOTE} at (0,0) 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."
-caret: position 27 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of body
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/paste-blockquote-1-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/paste-blockquote-1-expected.txt
deleted file mode 100644 (file)
index b6f2b6b..0000000
+++ /dev/null
@@ -1,13 +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 354x19
-          text run at (0,0) width 354: "This tests pasting a blockquote into an empty paragraph."
-      RenderBlock {DIV} at (0,35) size 784x19
-        RenderBlock {BLOCKQUOTE} at (0,0) 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."
-caret: position 27 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of body
diff --git a/LayoutTests/platform/mac-leopard/editing/pasteboard/paste-blockquote-1-expected.png b/LayoutTests/platform/mac-leopard/editing/pasteboard/paste-blockquote-1-expected.png
deleted file mode 100644 (file)
index ebdd7fc..0000000
Binary files a/LayoutTests/platform/mac-leopard/editing/pasteboard/paste-blockquote-1-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-1-expected.png b/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-1-expected.png
deleted file mode 100644 (file)
index a1f5a6c..0000000
Binary files a/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-1-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-1-expected.txt b/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-1-expected.txt
deleted file mode 100644 (file)
index 73334bd..0000000
+++ /dev/null
@@ -1,13 +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 354x18
-          text run at (0,0) width 354: "This tests pasting a blockquote into an empty paragraph."
-      RenderBlock {DIV} at (0,34) size 784x18
-        RenderBlock {BLOCKQUOTE} at (0,0) 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."
-caret: position 27 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of body
diff --git a/LayoutTests/platform/qt/editing/pasteboard/paste-blockquote-1-expected.txt b/LayoutTests/platform/qt/editing/pasteboard/paste-blockquote-1-expected.txt
deleted file mode 100644 (file)
index 74ad97f..0000000
+++ /dev/null
@@ -1,13 +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 385x22
-          text run at (0,0) width 385: "This tests pasting a blockquote into an empty paragraph."
-      RenderBlock {DIV} at (0,38) size 784x22
-        RenderBlock {BLOCKQUOTE} at (0,0) 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."
-caret: position 27 of child 0 {#text} of child 0 {BLOCKQUOTE} of child 2 {DIV} of body