Changeset 87477 in webkit


Ignore:
Timestamp:
May 26, 2011 11:42:19 PM (13 years ago)
Author:
rniwa@webkit.org
Message:

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

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

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r87476 r87477  
     12011-05-26  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Convert editing/pasteboard/merge-end-*.html to dump-as-markup tests
     6        https://bugs.webkit.org/show_bug.cgi?id=61607
     7
     8        * editing/pasteboard/merge-end-1-expected.txt: Added.
     9        * editing/pasteboard/merge-end-1.html:
     10        * editing/pasteboard/merge-end-2-expected.txt: Added.
     11        * editing/pasteboard/merge-end-2.html:
     12        * editing/pasteboard/merge-end-3-expected.txt: Added.
     13        * editing/pasteboard/merge-end-3.html:
     14        * editing/pasteboard/merge-end-4-expected.txt: Added.
     15        * editing/pasteboard/merge-end-4.html:
     16        * editing/pasteboard/merge-end-5-expected.txt: Added.
     17        * editing/pasteboard/merge-end-5.html:
     18        * platform/chromium-linux/editing/pasteboard/merge-end-1-expected.png: Removed.
     19        * platform/chromium-linux/editing/pasteboard/merge-end-2-expected.png: Removed.
     20        * platform/chromium-linux/editing/pasteboard/merge-end-3-expected.png: Removed.
     21        * platform/chromium-linux/editing/pasteboard/merge-end-4-expected.png: Removed.
     22        * platform/chromium-linux/editing/pasteboard/merge-end-5-expected.png: Removed.
     23        * platform/chromium-mac-leopard/editing/pasteboard/merge-end-4-expected.png: Removed.
     24        * platform/chromium-mac/editing/pasteboard/merge-end-4-expected.png: Removed.
     25        * platform/chromium-win/editing/pasteboard/merge-end-1-expected.png: Removed.
     26        * platform/chromium-win/editing/pasteboard/merge-end-1-expected.txt: Removed.
     27        * platform/chromium-win/editing/pasteboard/merge-end-2-expected.png: Removed.
     28        * platform/chromium-win/editing/pasteboard/merge-end-2-expected.txt: Removed.
     29        * platform/chromium-win/editing/pasteboard/merge-end-3-expected.png: Removed.
     30        * platform/chromium-win/editing/pasteboard/merge-end-3-expected.txt: Removed.
     31        * platform/chromium-win/editing/pasteboard/merge-end-4-expected.png: Removed.
     32        * platform/chromium-win/editing/pasteboard/merge-end-4-expected.txt: Removed.
     33        * platform/chromium-win/editing/pasteboard/merge-end-5-expected.png: Removed.
     34        * platform/chromium-win/editing/pasteboard/merge-end-5-expected.txt: Removed.
     35        * platform/gtk/editing/pasteboard/merge-end-1-expected.png: Removed.
     36        * platform/gtk/editing/pasteboard/merge-end-1-expected.txt: Removed.
     37        * platform/gtk/editing/pasteboard/merge-end-2-expected.png: Removed.
     38        * platform/gtk/editing/pasteboard/merge-end-2-expected.txt: Removed.
     39        * platform/gtk/editing/pasteboard/merge-end-3-expected.png: Removed.
     40        * platform/gtk/editing/pasteboard/merge-end-3-expected.txt: Removed.
     41        * platform/gtk/editing/pasteboard/merge-end-4-expected.png: Removed.
     42        * platform/gtk/editing/pasteboard/merge-end-4-expected.txt: Removed.
     43        * platform/gtk/editing/pasteboard/merge-end-5-expected.png: Removed.
     44        * platform/gtk/editing/pasteboard/merge-end-5-expected.txt: Removed.
     45        * platform/mac-leopard/editing/pasteboard/merge-end-1-expected.png: Removed.
     46        * platform/mac-leopard/editing/pasteboard/merge-end-2-expected.png: Removed.
     47        * platform/mac-leopard/editing/pasteboard/merge-end-3-expected.png: Removed.
     48        * platform/mac-leopard/editing/pasteboard/merge-end-5-expected.png: Removed.
     49        * platform/mac/editing/pasteboard/merge-end-1-expected.png: Removed.
     50        * platform/mac/editing/pasteboard/merge-end-1-expected.txt: Removed.
     51        * platform/mac/editing/pasteboard/merge-end-2-expected.png: Removed.
     52        * platform/mac/editing/pasteboard/merge-end-2-expected.txt: Removed.
     53        * platform/mac/editing/pasteboard/merge-end-3-expected.png: Removed.
     54        * platform/mac/editing/pasteboard/merge-end-3-expected.txt: Removed.
     55        * platform/mac/editing/pasteboard/merge-end-4-expected.png: Removed.
     56        * platform/mac/editing/pasteboard/merge-end-4-expected.txt: Removed.
     57        * platform/mac/editing/pasteboard/merge-end-5-expected.png: Removed.
     58        * platform/mac/editing/pasteboard/merge-end-5-expected.txt: Removed.
     59        * platform/qt/editing/pasteboard/merge-end-1-expected.png: Removed.
     60        * platform/qt/editing/pasteboard/merge-end-1-expected.txt: Removed.
     61        * platform/qt/editing/pasteboard/merge-end-2-expected.png: Removed.
     62        * platform/qt/editing/pasteboard/merge-end-2-expected.txt: Removed.
     63        * platform/qt/editing/pasteboard/merge-end-3-expected.png: Removed.
     64        * platform/qt/editing/pasteboard/merge-end-3-expected.txt: Removed.
     65        * platform/qt/editing/pasteboard/merge-end-4-expected.png: Removed.
     66        * platform/qt/editing/pasteboard/merge-end-4-expected.txt: Removed.
     67        * platform/qt/editing/pasteboard/merge-end-5-expected.png: Removed.
     68        * platform/qt/editing/pasteboard/merge-end-5-expected.txt: Removed.
     69
    1702011-05-26  Ryosuke Niwa  <rniwa@webkit.org>
    271
  • trunk/LayoutTests/editing/pasteboard/merge-end-1.html

    r64488 r87477  
    1 <script>
    2 if (window.layoutTestController)
    3      layoutTestController.dumpEditingCallbacks();
    4 </script>
    5 <p>This tests one of the cases where it is necessary for paste to merge the last paragraph in the fragment being pasted with the content after the position where the paste will occur.</p>
     1<script src="../../../resources/dump-as-markup.js"></script>
     2<!DOCTYPE html>
     3<html>
     4<body>
    65<div id="test" contenteditable="true"><span>foo</span></div>
    76
    8 <script type="text/javascript" src="../editing.js"></script>
     7<script src="../editing.js"></script>
     8<script src="../../resources/dump-as-markup.js"></script>
    99<script>
    1010var s = window.getSelection();
     
    1414moveSelectionForwardByCharacterCommand();
    1515insertHTMLCommand("<div>bar</div>baz");
     16
     17Markup.description('This tests the last paragraph in the pasted fragment is merged with the content after the insertion position.\n'
     18+ '"baz" and "oo" should be in the same paragraph below.');
     19Markup.dump('test');
     20
    1621</script>
     22</body>
     23</html>
  • trunk/LayoutTests/editing/pasteboard/merge-end-2.html

    r64488 r87477  
     1<!DOCTYPE html>
     2<html>
     3<body>
     4<div id="test" contenteditable="true"><span>foo</span>bar</div>
     5
     6<script src="../editing.js"></script>
     7<script src="../../resources/dump-as-markup.js"></script>
    18<script>
    29if (window.layoutTestController)
    3      layoutTestController.dumpEditingCallbacks();
    4 </script>
    5 <p>This tests one of the cases where it is necessary for paste to merge the last paragraph in the fragment being pasted with the content after the position where the paste will occur.</p>
    6 <div id="test" contenteditable="true"><span>foo</span>bar</div>
     10    layoutTestController.dumpEditingCallbacks();
    711
    8 <script type="text/javascript" src="../editing.js"></script>
    9 <script>
     12Markup.description('This tests the last paragraph in the pasted fragment is merged with the content after the insertion position\n'
     13+ '"baz" and "oobar" should be in the same paragraph below');
     14
    1015var s = window.getSelection();
    1116var e = document.getElementById("test");
     
    1419moveSelectionForwardByCharacterCommand();
    1520insertHTMLCommand("<div>bar</div>baz");
     21
     22Markup.dump('test');
    1623</script>
     24</body>
     25</html>
  • trunk/LayoutTests/editing/pasteboard/merge-end-3.html

    r17562 r87477  
     1<!DOCTYPE html>
     2<html>
     3<body>
     4<div id="test" contenteditable="true">one three</div>
     5
     6<script src="../../resources/dump-as-markup.js"></script>
    17<script>
    28if (window.layoutTestController)
    3      layoutTestController.dumpEditingCallbacks();
    4 </script>
    5 <p>The last paragraph of the incoming fragment should be in the same paragraph as 'three'.</p>
    6 <div id="test" contenteditable="true">one three</div>
     9    layoutTestController.dumpEditingCallbacks();
    710
    8 <script>
     11Markup.description("The last paragraph of the incoming fragment should be in the same paragraph as 'three'.");
     12
    913var s = window.getSelection();
    1014var e = document.getElementById("test");
     
    1620document.execCommand("InsertHTML", false , "<br class='Apple-interchange-newline'><div>two</div>");
    1721
     22Markup.dump('test');
     23
    1824</script>
     25</body>
     26</html>
  • trunk/LayoutTests/editing/pasteboard/merge-end-4.html

    r17562 r87477  
     1<script src="../../../resources/dump-as-markup.js"></script>
     2<!DOCTYPE html>
     3<html>
     4<body>
     5<div id="test" contenteditable="true">xx</div>
     6
     7<script src="../editing.js"></script>
     8<script src="../../resources/dump-as-markup.js"></script>
    19<script>
    210if (window.layoutTestController)
    3      layoutTestController.dumpEditingCallbacks();
    4 </script>
    5 <p>Tests for a case where paste's end merge was failing.  You should see xfoo\nbar\nbazx.</p>
    6 <div id="test" contenteditable="true">xx</div>
     11    layoutTestController.dumpEditingCallbacks();
    712
    8 <script type="text/javascript" src="../editing.js"></script>
    9 <script>
     13Markup.description("Tests for a case where paste's end merge was failing. You should see xfoo\nbar\nbazx.");
     14
    1015var e = document.getElementById("test");
    1116var s = window.getSelection();
     
    1419moveSelectionForwardByCharacterCommand();
    1520insertHTMLCommand("<div>foo</div><div>bar</div>baz");
     21
     22Markup.dump('test');
     23
    1624</script>
     25</body>
     26</html>
  • trunk/LayoutTests/editing/pasteboard/merge-end-5.html

    r17562 r87477  
     1<!DOCTYPE html>
     2<html>
     3<body>
     4<div id="test" contenteditable="true"><div style="border: 1px solid red;">This x</div><div style="border: 1px solid blue;">x it.</div></div>
     5
     6<script src="../../resources/dump-as-markup.js"></script>
    17<script>
    28if (window.layoutTestController)
    3      layoutTestController.dumpEditingCallbacks();
    4 </script>
    5 <p>Pasting a paragraph or less into a selection that spans multiple blocks should insert content into the block containing the start of the selection.</p>
    6 <div id="test" contenteditable="true"><div style="border: 1px solid red;">This x</div><div style="border: 1px solid blue;">x it.</div></div>
     9    layoutTestController.dumpEditingCallbacks();
    710
    8 <script>
     11Markup.description('Pasting a paragraph or less into a selection that spans multiple blocks should insert content into the block containing the start of the selection.');
     12
    913var s = window.getSelection();
    1014var e = document.getElementById("test");
     
    1822
    1923document.execCommand("InsertHTML", false, "<div><div>text should have a red border around</div></div>");
     24
     25Markup.dump('test');
     26
    2027</script>
     28</body>
     29</html>
Note: See TracChangeset for help on using the changeset viewer.