Changeset 92580 in webkit


Ignore:
Timestamp:
Aug 7, 2011 8:46:21 PM (13 years ago)
Author:
rniwa@webkit.org
Message:

Dump-as-markup conversion: paste-blockquote-into-blockquote.html and prevent-block-nesting-01.html
https://bugs.webkit.org/show_bug.cgi?id=65837

Reviewed by Kent Tamura.

Converted the tests to dump-as-markup tests to improve the readability of the expected results.

  • editing/pasteboard/paste-blockquote-into-blockquote-expected.txt: Added.
  • editing/pasteboard/paste-blockquote-into-blockquote.html:
  • editing/pasteboard/prevent-block-nesting-01-expected.txt: Added.
  • editing/pasteboard/prevent-block-nesting-01.html:
  • platform/chromium-linux/editing/pasteboard/paste-blockquote-into-blockquote-expected.png: Removed.
  • platform/chromium-linux/editing/pasteboard/prevent-block-nesting-01-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/paste-blockquote-into-blockquote-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/paste-blockquote-into-blockquote-expected.txt: Removed.
  • platform/chromium-win/editing/pasteboard/prevent-block-nesting-01-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/prevent-block-nesting-01-expected.txt: Removed.
  • platform/gtk/editing/pasteboard/paste-blockquote-into-blockquote-expected.txt: Removed.
  • platform/gtk/editing/pasteboard/prevent-block-nesting-01-expected.png: Removed.
  • platform/gtk/editing/pasteboard/prevent-block-nesting-01-expected.txt: Removed.
  • platform/mac-leopard/editing/pasteboard/paste-blockquote-into-blockquote-expected.png: Removed.
  • platform/mac-leopard/editing/pasteboard/prevent-block-nesting-01-expected.png: Removed.
  • platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-expected.png: Removed.
  • platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-expected.txt: Removed.
  • platform/mac/editing/pasteboard/prevent-block-nesting-01-expected.png: Removed.
  • platform/mac/editing/pasteboard/prevent-block-nesting-01-expected.txt: Removed.
  • platform/qt/editing/pasteboard/paste-blockquote-into-blockquote-expected.txt: Removed.
  • platform/qt/editing/pasteboard/prevent-block-nesting-01-expected.txt: Removed.
Location:
trunk/LayoutTests
Files:
2 added
17 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r92579 r92580  
     12011-08-07  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Dump-as-markup conversion: paste-blockquote-into-blockquote.html and prevent-block-nesting-01.html
     4        https://bugs.webkit.org/show_bug.cgi?id=65837
     5
     6        Reviewed by Kent Tamura.
     7
     8        Converted the tests to dump-as-markup tests to improve the readability of the expected results.
     9
     10        * editing/pasteboard/paste-blockquote-into-blockquote-expected.txt: Added.
     11        * editing/pasteboard/paste-blockquote-into-blockquote.html:
     12        * editing/pasteboard/prevent-block-nesting-01-expected.txt: Added.
     13        * editing/pasteboard/prevent-block-nesting-01.html:
     14        * platform/chromium-linux/editing/pasteboard/paste-blockquote-into-blockquote-expected.png: Removed.
     15        * platform/chromium-linux/editing/pasteboard/prevent-block-nesting-01-expected.png: Removed.
     16        * platform/chromium-win/editing/pasteboard/paste-blockquote-into-blockquote-expected.png: Removed.
     17        * platform/chromium-win/editing/pasteboard/paste-blockquote-into-blockquote-expected.txt: Removed.
     18        * platform/chromium-win/editing/pasteboard/prevent-block-nesting-01-expected.png: Removed.
     19        * platform/chromium-win/editing/pasteboard/prevent-block-nesting-01-expected.txt: Removed.
     20        * platform/gtk/editing/pasteboard/paste-blockquote-into-blockquote-expected.txt: Removed.
     21        * platform/gtk/editing/pasteboard/prevent-block-nesting-01-expected.png: Removed.
     22        * platform/gtk/editing/pasteboard/prevent-block-nesting-01-expected.txt: Removed.
     23        * platform/mac-leopard/editing/pasteboard/paste-blockquote-into-blockquote-expected.png: Removed.
     24        * platform/mac-leopard/editing/pasteboard/prevent-block-nesting-01-expected.png: Removed.
     25        * platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-expected.png: Removed.
     26        * platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-expected.txt: Removed.
     27        * platform/mac/editing/pasteboard/prevent-block-nesting-01-expected.png: Removed.
     28        * platform/mac/editing/pasteboard/prevent-block-nesting-01-expected.txt: Removed.
     29        * platform/qt/editing/pasteboard/paste-blockquote-into-blockquote-expected.txt: Removed.
     30        * platform/qt/editing/pasteboard/prevent-block-nesting-01-expected.txt: Removed.
     31
    1322011-08-07  Noel Gordon  <noel.gordon@gmail.com>
    233
  • trunk/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote.html

    r38273 r92580  
    11<html>
    22<head>
     3<script src="../../resources/dump-as-markup.js"></script>
    34<style>
    45blockquote {
     
    1011</style>
    1112</head>
    12 
    1313<body>
    14 <p>This tests pasting a blockquote into a blockquote. Nothing below should be double-blockquoted.</p>
    15 <div contenteditable="true"><blockquote type='cite' id="block">One</blockquote></div>
    16 
     14<p id="description">This tests pasting a blockquote into a blockquote. Nothing below should be double-blockquoted.</p>
     15<div id="test" contenteditable="true"><blockquote type='cite' id="block">One</blockquote></div>
    1716<script>
    1817var sel = window.getSelection();
     
    2120sel.setPosition(block, 3);
    2221document.execCommand("InsertHTML", false, "<span><blockquote type='cite'><div>Two</div><div>Three</div></blockquote></span>");
     22
     23Markup.description(document.getElementById('description').textContent);
     24Markup.dump('test');
     25
    2326</script>
    2427</body>
  • trunk/LayoutTests/editing/pasteboard/prevent-block-nesting-01.html

    r17562 r92580  
    1 <script>
    2 if (window.layoutTestController)
    3      layoutTestController.dumpEditingCallbacks();
    4 </script>
     1<script src="../../resources/dump-as-markup.js"></script>
    52<style>
    63div {
     
    96}
    107</style>
    11 <p>The code in paste that prevents block nesting had a bug where the order of pasted paragraphs could be reversed.</p>
     8<p id="description">The code in paste that prevents block nesting had a bug where the order of pasted paragraphs could be reversed.</p>
    129<div id="test" contenteditable="true"><br></div>
    1310
    1411<script>
     12if (window.layoutTestController)
     13    layoutTestController.dumpEditingCallbacks();
     14
    1515var s = window.getSelection();
    1616var e = document.getElementById("test");
     
    1818s.setPosition(e, 0);
    1919document.execCommand("InsertHTML", false, "There should be an empty line between these two paragraphs.<span><div><br></div></span><div>This paragraph and the empty line should have be in their own divs with a red border.</div>");
     20
     21Markup.description(document.getElementById('description').textContent);
     22Markup.dump(e);
     23
    2024</script>
Note: See TracChangeset for help on using the changeset viewer.