Changeset 96125 in webkit


Ignore:
Timestamp:
Sep 27, 2011 10:26:23 AM (13 years ago)
Author:
rniwa@webkit.org
Message:

dump-as-markup conversion: editing/pasteboard/merge-end-list.html and merge-end-table.html
​https://bugs.webkit.org/show_bug.cgi?id=68857

Reviewed by Kent Tamura.

Converted the tests into dump-as-markup tests. Also split each test into two tests.

  • editing/pasteboard/merge-end-list-2-expected.txt: Added.
  • editing/pasteboard/merge-end-list-2.html: Added.
  • editing/pasteboard/merge-end-list-expected.txt: Added.
  • editing/pasteboard/merge-end-list.html:
  • editing/pasteboard/merge-end-table-2-expected.txt: Added.
  • editing/pasteboard/merge-end-table-2.html: Added.
  • editing/pasteboard/merge-end-table-expected.txt: Added.
  • editing/pasteboard/merge-end-table.html:
  • platform/chromium-cg-mac-leopard/editing/pasteboard/merge-end-list-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/editing/pasteboard/merge-end-table-expected.png: Removed.
  • platform/chromium-cg-mac/editing/pasteboard/merge-end-list-expected.png: Removed.
  • platform/chromium-cg-mac/editing/pasteboard/merge-end-table-expected.png: Removed.
  • platform/chromium-linux/editing/pasteboard/merge-end-list-expected.png: Removed.
  • platform/chromium-linux/editing/pasteboard/merge-end-table-expected.png: Removed.
  • platform/chromium-mac/editing/pasteboard/merge-end-list-expected.png: Removed.
  • platform/chromium-mac/editing/pasteboard/merge-end-table-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/merge-end-list-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/merge-end-list-expected.txt: Removed.
  • platform/chromium-win/editing/pasteboard/merge-end-table-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/merge-end-table-expected.txt: Removed.
  • platform/gtk/editing/pasteboard/merge-end-list-expected.png: Removed.
  • platform/gtk/editing/pasteboard/merge-end-list-expected.txt: Removed.
  • platform/gtk/editing/pasteboard/merge-end-table-expected.png: Removed.
  • platform/gtk/editing/pasteboard/merge-end-table-expected.txt: Removed.
  • platform/mac-leopard/editing/pasteboard/merge-end-list-expected.png: Removed.
  • platform/mac-leopard/editing/pasteboard/merge-end-table-expected.png: Removed.
  • platform/mac/editing/pasteboard/merge-end-list-expected.png: Removed.
  • platform/mac/editing/pasteboard/merge-end-list-expected.txt: Removed.
  • platform/mac/editing/pasteboard/merge-end-table-expected.png: Removed.
  • platform/mac/editing/pasteboard/merge-end-table-expected.txt: Removed.
  • platform/qt/editing/pasteboard/merge-end-list-expected.png: Removed.
  • platform/qt/editing/pasteboard/merge-end-list-expected.txt: Removed.
  • platform/qt/editing/pasteboard/merge-end-table-expected.png: Removed.
  • platform/qt/editing/pasteboard/merge-end-table-expected.txt: Removed.
Location:
trunk/LayoutTests
Files:
6 added
26 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r96124 r96125  
     12011-09-26  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        dump-as-markup conversion: editing/pasteboard/merge-end-list.html and merge-end-table.html
     4        https://bugs.webkit.org/show_bug.cgi?id=68857
     5
     6        Reviewed by Kent Tamura.
     7
     8        Converted the tests into dump-as-markup tests. Also split each test into two tests.
     9
     10        * editing/pasteboard/merge-end-list-2-expected.txt: Added.
     11        * editing/pasteboard/merge-end-list-2.html: Added.
     12        * editing/pasteboard/merge-end-list-expected.txt: Added.
     13        * editing/pasteboard/merge-end-list.html:
     14        * editing/pasteboard/merge-end-table-2-expected.txt: Added.
     15        * editing/pasteboard/merge-end-table-2.html: Added.
     16        * editing/pasteboard/merge-end-table-expected.txt: Added.
     17        * editing/pasteboard/merge-end-table.html:
     18        * platform/chromium-cg-mac-leopard/editing/pasteboard/merge-end-list-expected.png: Removed.
     19        * platform/chromium-cg-mac-leopard/editing/pasteboard/merge-end-table-expected.png: Removed.
     20        * platform/chromium-cg-mac/editing/pasteboard/merge-end-list-expected.png: Removed.
     21        * platform/chromium-cg-mac/editing/pasteboard/merge-end-table-expected.png: Removed.
     22        * platform/chromium-linux/editing/pasteboard/merge-end-list-expected.png: Removed.
     23        * platform/chromium-linux/editing/pasteboard/merge-end-table-expected.png: Removed.
     24        * platform/chromium-mac/editing/pasteboard/merge-end-list-expected.png: Removed.
     25        * platform/chromium-mac/editing/pasteboard/merge-end-table-expected.png: Removed.
     26        * platform/chromium-win/editing/pasteboard/merge-end-list-expected.png: Removed.
     27        * platform/chromium-win/editing/pasteboard/merge-end-list-expected.txt: Removed.
     28        * platform/chromium-win/editing/pasteboard/merge-end-table-expected.png: Removed.
     29        * platform/chromium-win/editing/pasteboard/merge-end-table-expected.txt: Removed.
     30        * platform/gtk/editing/pasteboard/merge-end-list-expected.png: Removed.
     31        * platform/gtk/editing/pasteboard/merge-end-list-expected.txt: Removed.
     32        * platform/gtk/editing/pasteboard/merge-end-table-expected.png: Removed.
     33        * platform/gtk/editing/pasteboard/merge-end-table-expected.txt: Removed.
     34        * platform/mac-leopard/editing/pasteboard/merge-end-list-expected.png: Removed.
     35        * platform/mac-leopard/editing/pasteboard/merge-end-table-expected.png: Removed.
     36        * platform/mac/editing/pasteboard/merge-end-list-expected.png: Removed.
     37        * platform/mac/editing/pasteboard/merge-end-list-expected.txt: Removed.
     38        * platform/mac/editing/pasteboard/merge-end-table-expected.png: Removed.
     39        * platform/mac/editing/pasteboard/merge-end-table-expected.txt: Removed.
     40        * platform/qt/editing/pasteboard/merge-end-list-expected.png: Removed.
     41        * platform/qt/editing/pasteboard/merge-end-list-expected.txt: Removed.
     42        * platform/qt/editing/pasteboard/merge-end-table-expected.png: Removed.
     43        * platform/qt/editing/pasteboard/merge-end-table-expected.txt: Removed.
     44
    1452011-09-27  Julien Chaffraix  <jchaffraix@webkit.org>
    246

  • trunk/LayoutTests/editing/pasteboard/merge-end-list.html

    r17562 r96125  
     1<!DOCTYPE html>
     2<html>
     3<body>
     4<p>This tests pasting a list ('Item 1') into a position that would normally result in an end merge.</p>
     5<div id="test1" contenteditable="true">xx</div>
     6<script src="../../resources/dump-as-markup.js"></script>
     7<script src="../editing.js"></script>
    18<script>
    29if (window.layoutTestController)
    3      layoutTestController.dumpEditingCallbacks();
    4 </script>
    5 <p>This tests pasting a list into a position that would normally result in an end merge.</p>
    6 <div id="test1" contenteditable="true">xx</div>
     10    layoutTestController.dumpEditingCallbacks();
    711
    8 <script type="text/javascript" src="../editing.js"></script>
    9 <script>
    1012var e = document.getElementById("test1");
    1113var s = window.getSelection();
     14
     15Markup.description(document.querySelector('p').textContent);
     16Markup.dump(e, 'Before insertion');
    1217
    1318setSelectionCommand(e, 0, e, 0);
    1419moveSelectionForwardByCharacterCommand();
    1520insertHTMLCommand("<ul><li><div>Item 1</div></li></ul>");
     21
     22Markup.dump(e, 'After insertion');
    1623</script>
    17 
    18 <p>This tests pasting text into a list item.  The last bit of content in the incoming fragment should be merged with the paragraph after the position being pasted into.</p>
    19 <div id="test2" contenteditable="true"><ul><li><div>Item 1</div></li></ul></div>
    20 
    21 <script>
    22 var e = document.getElementById("test2");
    23 var s = window.getSelection();
    24 
    25 setSelectionCommand(e, 0, e, 0);
    26 moveSelectionForwardByWordCommand();
    27 insertHTMLCommand("<div>foo</div><div>bar</div>");
    28 </script>
     24</body>
     25</html>

  • trunk/LayoutTests/editing/pasteboard/merge-end-table.html

    r17562 r96125  
     1<!DOCTYPE html>
     2<html>
     3<body>
     4<p>This tests pasting a table into a position that would normally result in an end merge.</p>
     5<div id="test1" contenteditable="true">xx</div>
     6<script src="../../resources/dump-as-markup.js"></script>
     7<script src="../editing.js"></script>
    18<script>
    29if (window.layoutTestController)
    3      layoutTestController.dumpEditingCallbacks();
    4 </script>
    5 <p>This tests pasting a table into a position that would normally result in an end merge.</p>
    6 <div id="test1" contenteditable="true">xx</div>
     10    layoutTestController.dumpEditingCallbacks();
    711
    8 <script type="text/javascript" src="../editing.js"></script>
    9 <script>
    1012var e = document.getElementById("test1");
    1113var s = window.getSelection();
     14
     15Markup.description(document.querySelector('p').textContent);
     16Markup.dump(e, 'Before insertion');
    1217
    1318setSelectionCommand(e, 0, e, 0);
    1419moveSelectionForwardByCharacterCommand();
    1520insertHTMLCommand("<table border='1'><tr><td>1</td><td>2</td></tr></table>");
     21
     22Markup.dump(e, 'After insertion');
    1623</script>
    17 
    18 <p>This tests pasting text into a table cell.  The last bit of content in the incoming fragment should be merged with the paragraph after the position being pasted into.</p>
    19 <div contenteditable="true"><table border='1'><tr><td><div id="test2">Item 1</div></td><td>Item 2</td></tr></table></div>
    20 
    21 <script>
    22 var e = document.getElementById("test2");
    23 var s = window.getSelection();
    24 
    25 setSelectionCommand(e, 0, e, 0);
    26 moveSelectionForwardByWordCommand();
    27 insertHTMLCommand("<div>foo</div><div>bar</div>");
    28 </script>
     24</body>
     25</html>
Note: See TracChangeset for help on using the changeset viewer.