Changeset 68536 in webkit


Ignore:
Timestamp:
Sep 28, 2010 10:33:18 AM (14 years ago)
Author:
rniwa@webkit.org
Message:

2010-09-28 Ryosuke Niwa <rniwa@webkit.org>

Reviewed by Kent Tamura.

dump-as-markup conversion: editing/pasteboard/paste-4039777-fix.html, paste-list-001.html, and paste-table-001.html
https://bugs.webkit.org/show_bug.cgi?id=46545

Converted the following tests to dump-as-markup tests:
editing/pasteboard/paste-4039777-fix.html
editing/pasteboard/paste-list-001.html
editing/pasteboard/paste-table-001.html

  • editing/pasteboard/paste-4039777-fix-expected.txt: Added.
  • editing/pasteboard/paste-4039777-fix.html:
  • editing/pasteboard/paste-list-001-expected.txt: Added.
  • editing/pasteboard/paste-list-001.html:
  • editing/pasteboard/paste-table-001-expected.txt: Added.
  • editing/pasteboard/paste-table-001.html:
  • platform/chromium-linux/editing/pasteboard/paste-4039777-fix-expected.checksum: Removed.
  • platform/chromium-linux/editing/pasteboard/paste-4039777-fix-expected.png: Removed.
  • platform/chromium-linux/editing/pasteboard/paste-list-001-expected.checksum: Removed.
  • platform/chromium-linux/editing/pasteboard/paste-list-001-expected.png: Removed.
  • platform/chromium-linux/editing/pasteboard/paste-table-001-expected.checksum: Removed.
  • platform/chromium-linux/editing/pasteboard/paste-table-001-expected.png: Removed.
  • platform/chromium-mac/editing/pasteboard/paste-4039777-fix-expected.checksum: Removed.
  • platform/chromium-mac/editing/pasteboard/paste-table-001-expected.checksum: Removed.
  • platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.checksum: Removed.
  • platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.txt: Removed.
  • platform/chromium-win/editing/pasteboard/paste-list-001-expected.checksum: Removed.
  • platform/chromium-win/editing/pasteboard/paste-list-001-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/paste-list-001-expected.txt: Removed.
  • platform/chromium-win/editing/pasteboard/paste-table-001-expected.checksum: Removed.
  • platform/chromium-win/editing/pasteboard/paste-table-001-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/paste-table-001-expected.txt: Removed.
  • platform/gtk/editing/pasteboard/paste-table-001-expected.txt: Removed.
  • platform/mac/editing/pasteboard/paste-4039777-fix-expected.checksum: Removed.
  • platform/mac/editing/pasteboard/paste-4039777-fix-expected.png: Removed.
  • platform/mac/editing/pasteboard/paste-4039777-fix-expected.txt: Removed.
  • platform/mac/editing/pasteboard/paste-list-001-expected.checksum: Removed.
  • platform/mac/editing/pasteboard/paste-list-001-expected.png: Removed.
  • platform/mac/editing/pasteboard/paste-list-001-expected.txt: Removed.
  • platform/mac/editing/pasteboard/paste-table-001-expected.checksum: Removed.
  • platform/mac/editing/pasteboard/paste-table-001-expected.png: Removed.
  • platform/mac/editing/pasteboard/paste-table-001-expected.txt: Removed.
  • platform/qt/editing/pasteboard/paste-4039777-fix-expected.txt: Removed.
  • platform/qt/editing/pasteboard/paste-list-001-expected.txt: Removed.
  • platform/qt/editing/pasteboard/paste-table-001-expected.txt: Removed.
Location:
trunk/LayoutTests
Files:
3 added
30 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r68527 r68536  
     12010-09-28  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Kent Tamura.
     4
     5        dump-as-markup conversion: editing/pasteboard/paste-4039777-fix.html, paste-list-001.html, and paste-table-001.html
     6        https://bugs.webkit.org/show_bug.cgi?id=46545
     7
     8        Converted the following tests to dump-as-markup tests:
     9        editing/pasteboard/paste-4039777-fix.html
     10        editing/pasteboard/paste-list-001.html
     11        editing/pasteboard/paste-table-001.html
     12
     13        * editing/pasteboard/paste-4039777-fix-expected.txt: Added.
     14        * editing/pasteboard/paste-4039777-fix.html:
     15        * editing/pasteboard/paste-list-001-expected.txt: Added.
     16        * editing/pasteboard/paste-list-001.html:
     17        * editing/pasteboard/paste-table-001-expected.txt: Added.
     18        * editing/pasteboard/paste-table-001.html:
     19        * platform/chromium-linux/editing/pasteboard/paste-4039777-fix-expected.checksum: Removed.
     20        * platform/chromium-linux/editing/pasteboard/paste-4039777-fix-expected.png: Removed.
     21        * platform/chromium-linux/editing/pasteboard/paste-list-001-expected.checksum: Removed.
     22        * platform/chromium-linux/editing/pasteboard/paste-list-001-expected.png: Removed.
     23        * platform/chromium-linux/editing/pasteboard/paste-table-001-expected.checksum: Removed.
     24        * platform/chromium-linux/editing/pasteboard/paste-table-001-expected.png: Removed.
     25        * platform/chromium-mac/editing/pasteboard/paste-4039777-fix-expected.checksum: Removed.
     26        * platform/chromium-mac/editing/pasteboard/paste-table-001-expected.checksum: Removed.
     27        * platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.checksum: Removed.
     28        * platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.png: Removed.
     29        * platform/chromium-win/editing/pasteboard/paste-4039777-fix-expected.txt: Removed.
     30        * platform/chromium-win/editing/pasteboard/paste-list-001-expected.checksum: Removed.
     31        * platform/chromium-win/editing/pasteboard/paste-list-001-expected.png: Removed.
     32        * platform/chromium-win/editing/pasteboard/paste-list-001-expected.txt: Removed.
     33        * platform/chromium-win/editing/pasteboard/paste-table-001-expected.checksum: Removed.
     34        * platform/chromium-win/editing/pasteboard/paste-table-001-expected.png: Removed.
     35        * platform/chromium-win/editing/pasteboard/paste-table-001-expected.txt: Removed.
     36        * platform/gtk/editing/pasteboard/paste-table-001-expected.txt: Removed.
     37        * platform/mac/editing/pasteboard/paste-4039777-fix-expected.checksum: Removed.
     38        * platform/mac/editing/pasteboard/paste-4039777-fix-expected.png: Removed.
     39        * platform/mac/editing/pasteboard/paste-4039777-fix-expected.txt: Removed.
     40        * platform/mac/editing/pasteboard/paste-list-001-expected.checksum: Removed.
     41        * platform/mac/editing/pasteboard/paste-list-001-expected.png: Removed.
     42        * platform/mac/editing/pasteboard/paste-list-001-expected.txt: Removed.
     43        * platform/mac/editing/pasteboard/paste-table-001-expected.checksum: Removed.
     44        * platform/mac/editing/pasteboard/paste-table-001-expected.png: Removed.
     45        * platform/mac/editing/pasteboard/paste-table-001-expected.txt: Removed.
     46        * platform/qt/editing/pasteboard/paste-4039777-fix-expected.txt: Removed.
     47        * platform/qt/editing/pasteboard/paste-list-001-expected.txt: Removed.
     48        * platform/qt/editing/pasteboard/paste-table-001-expected.txt: Removed.
     49
    1502010-09-28  Stephen White  <senorblanco@chromium.org>
    251
  • trunk/LayoutTests/editing/pasteboard/paste-4039777-fix.html

    r12312 r68536  
    11<html>
    22<head>
    3 
    43<style>
    54.editing {
     
    1817</style>
    1918<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
     19<script src="../../resources/dump-as-markup.js"></script>
     20<title>Editing Test</title>
     21</head>
     22<body>
    2023
     24<div id="expected" class="expected-results">
     25<ul style="text-align:right;"><li>A</li></ul>
     26<div>
     27    <ul>
     28        <li>
     29            <a href="">B</a>
     30            <br>
     31            C
     32        </li>
     33    </ul>
     34</div>
     35</div>
     36
     37<div contenteditable id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;">
     38<div id="test" class="editing">
     39<ul style="text-align:right;"><li>A</li></ul>
     40<div>
     41    <ul>
     42        <li>
     43            <a href="">B</a>
     44            <br>
     45            C
     46        </li>
     47    </ul>
     48</div>
     49</div>
     50</div>
    2151<script>
    2252
     
    2656    copyCommand();
    2757    pasteCommand();
     58    Markup.description('Bug fix for <a href="rdar://problem/4039777">&lt;rdar://problem/4039777&gt;</a> Pasting particular snippet of HTML containing list items and a link creates too many list items');
     59    Markup.dump('expected', 'Expected result');
     60    Markup.dump('test', 'Actual result');
    2861}
    2962
    30 </script>
     63runDumpAsTextEditingTest(true);
    3164
    32 <title>Editing Test</title>
    33 </head>
    34 <body>
    35 
    36 <div class="explanation">
    37 <div class="scenario">
    38 Tests:
    39 <br>
    40 Bug fix for <a href="rdar://problem/4039777">&lt;rdar://problem/4039777&gt;</a> Pasting particular snippet of HTML containing list items and a link creates too many list items
    41 </div>
    42 <div class="expected-results">
    43 Expected Results:
    44 <br>
    45 Should match:
    46 <BR>
    47 <ul style="text-align:right;"><li>A</li></ul>
    48 <div>
    49         <ul>
    50                 <li>
    51                         <a href="">B</a>
    52                         <br>
    53                         C
    54                 </li>
    55         </ul>
    56 </div>
    57 </div>
    58 </div>
    59 
    60 <div contenteditable id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;">
    61 <div id="test" class="editing">
    62 <ul style="text-align:right;"><li>A</li></ul>
    63 <div>
    64         <ul>
    65                 <li>
    66                         <a href="">B</a>
    67                         <br>
    68                         C
    69                 </li>
    70         </ul>
    71 </div>
    72 </div>
    73 </div>
    74 
    75 <script>
    76 runEditingTest();
    7765</script>
    7866
  • trunk/LayoutTests/editing/pasteboard/paste-list-001.html

    r11995 r68536  
    11<html>
    22<head>
    3 
    43<style>
    54.editing {
     
    109</style>
    1110<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
    12 
    13 <script>
    14 
    15 function editingTest() {
    16         moveSelectionForwardByLineCommand()
    17     for (i = 0; i < 3; i++)
    18         extendSelectionForwardByLineCommand();
    19     copyCommand();
    20     moveSelectionForwardByLineCommand();
    21     pasteCommand();
    22 }
    23 
    24 </script>
    25 
     11<script src="../../resources/dump-as-markup.js"></script>
    2612<title>Editing Test</title>
    2713</head>
     
    3622</ol>
    3723</div>
     24<script>
    3825
    39 <script>
    40 runEditingTest();
     26function editingTest() {
     27    moveSelectionForwardByLineCommand()
     28    for (i = 0; i < 3; i++)
     29        extendSelectionForwardByLineCommand();
     30    copyCommand();
     31    moveSelectionForwardByLineCommand();
     32    pasteCommand();
     33    Markup.dump('root');
     34}
     35
     36runDumpAsTextEditingTest(true);
     37
    4138</script>
    42 
    4339</body>
    4440</html>
  • trunk/LayoutTests/editing/pasteboard/paste-table-001.html

    r12359 r68536  
    11<html>
    22<head>
    3 
    43<style>
    54.editing {
     
    109</style>
    1110<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
    12 
    13 <script>
    14 
    15 function editingTest() {
    16     moveSelectionForwardByLineCommand();
    17     for (i = 0; i < 3; i++)
    18         extendSelectionForwardByLineCommand();
    19     for (i = 0; i < 32; i++)
    20         extendSelectionForwardByCharacterCommand();
    21     copyCommand();
    22     moveSelectionForwardByLineCommand();
    23     pasteCommand();
    24 }
    25 
    26 </script>
    27 
     11<script src="../../resources/dump-as-markup.js"></script>
    2812<title>Editing Test</title>
    2913</head>
     
    4327</table>
    4428</div>
     29<script>
    4530
    46 <script>
    47 runEditingTest();
     31function editingTest() {
     32    moveSelectionForwardByLineCommand();
     33    for (i = 0; i < 3; i++)
     34        extendSelectionForwardByLineCommand();
     35    for (i = 0; i < 32; i++)
     36        extendSelectionForwardByCharacterCommand();
     37    copyCommand();
     38    moveSelectionForwardByLineCommand();
     39    pasteCommand();
     40    Markup.dump('root');
     41}
     42
     43runDumpAsTextEditingTest(true);
     44
    4845</script>
    49 
    5046</body>
    5147</html>
Note: See TracChangeset for help on using the changeset viewer.