Changeset 87486 in webkit


Ignore:
Timestamp:
May 27, 2011 2:11:30 AM (13 years ago)
Author:
rniwa@webkit.org
Message:

2011-05-27 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Kent Tamura.

Convert editing/pasteboard/paste-text-002.html and paste-text-003.html to dump-as-markup tests
​https://bugs.webkit.org/show_bug.cgi?id=61614

Converted paste-text-002.html and paste-text-003.html to dump-as-markup tests.
Also added some descriptions to the tests.

  • editing/pasteboard/paste-text-002-expected.txt: Added.
  • editing/pasteboard/paste-text-002.html:
  • editing/pasteboard/paste-text-003-expected.txt: Added.
  • editing/pasteboard/paste-text-003.html:
  • platform/chromium-linux/editing/pasteboard/paste-text-002-expected.png: Removed.
  • platform/chromium-linux/editing/pasteboard/paste-text-003-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/paste-text-002-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/paste-text-002-expected.txt: Removed.
  • platform/chromium-win/editing/pasteboard/paste-text-003-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/paste-text-003-expected.txt: Removed.
  • platform/gtk/editing/pasteboard/paste-text-002-expected.txt: Removed.
  • platform/gtk/editing/pasteboard/paste-text-003-expected.txt: Removed.
  • platform/mac/editing/pasteboard/paste-text-002-expected.png: Removed.
  • platform/mac/editing/pasteboard/paste-text-002-expected.txt: Removed.
  • platform/mac/editing/pasteboard/paste-text-003-expected.png: Removed.
  • platform/mac/editing/pasteboard/paste-text-003-expected.txt: Removed.
  • platform/qt/editing/pasteboard/paste-text-002-expected.png: Removed.
  • platform/qt/editing/pasteboard/paste-text-002-expected.txt: Removed.
  • platform/qt/editing/pasteboard/paste-text-003-expected.png: Removed.
  • platform/qt/editing/pasteboard/paste-text-003-expected.txt: Removed.
Location:
trunk/LayoutTests
Files:
14 deleted
3 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r87480 r87486  
     12011-05-27  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Kent Tamura.
     4
     5        Convert editing/pasteboard/paste-text-002.html and paste-text-003.html to dump-as-markup tests
     6        https://bugs.webkit.org/show_bug.cgi?id=61614
     7
     8        Converted paste-text-002.html and paste-text-003.html to dump-as-markup tests.
     9        Also added some descriptions to the tests.
     10
     11        * editing/pasteboard/paste-text-002-expected.txt: Added.
     12        * editing/pasteboard/paste-text-002.html:
     13        * editing/pasteboard/paste-text-003-expected.txt: Added.
     14        * editing/pasteboard/paste-text-003.html:
     15        * platform/chromium-linux/editing/pasteboard/paste-text-002-expected.png: Removed.
     16        * platform/chromium-linux/editing/pasteboard/paste-text-003-expected.png: Removed.
     17        * platform/chromium-win/editing/pasteboard/paste-text-002-expected.png: Removed.
     18        * platform/chromium-win/editing/pasteboard/paste-text-002-expected.txt: Removed.
     19        * platform/chromium-win/editing/pasteboard/paste-text-003-expected.png: Removed.
     20        * platform/chromium-win/editing/pasteboard/paste-text-003-expected.txt: Removed.
     21        * platform/gtk/editing/pasteboard/paste-text-002-expected.txt: Removed.
     22        * platform/gtk/editing/pasteboard/paste-text-003-expected.txt: Removed.
     23        * platform/mac/editing/pasteboard/paste-text-002-expected.png: Removed.
     24        * platform/mac/editing/pasteboard/paste-text-002-expected.txt: Removed.
     25        * platform/mac/editing/pasteboard/paste-text-003-expected.png: Removed.
     26        * platform/mac/editing/pasteboard/paste-text-003-expected.txt: Removed.
     27        * platform/qt/editing/pasteboard/paste-text-002-expected.png: Removed.
     28        * platform/qt/editing/pasteboard/paste-text-002-expected.txt: Removed.
     29        * platform/qt/editing/pasteboard/paste-text-003-expected.png: Removed.
     30        * platform/qt/editing/pasteboard/paste-text-003-expected.txt: Removed.
     31
    1322011-05-26  MORITA Hajime <morrita@google.com>
    233

  • trunk/LayoutTests/editing/pasteboard/paste-text-002-expected.txt

    r87485 r87486  
    1 EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 10 of BODY > HTML > #document
     1EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 9 of DIV > BODY > HTML > #document
    22EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
    33EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    … …  
    5252EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    5353EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    54 EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 6 of #text > DIV > BODY > HTML > #document to 11 of #text > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
     54EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 6 of #text > DIV > DIV > BODY > HTML > #document to 11 of #text > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
    5555EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    5656EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    5757EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    58 EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 11 of #text > DIV > BODY > HTML > #document toDOMRange:range from 11 of #text > DIV > BODY > HTML > #document to 11 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
     58EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > DIV > DIV > BODY > HTML > #document to 11 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 11 of #text > DIV > DIV > BODY > HTML > #document to 11 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
    5959EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    6060EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
    61 EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 11 of #text > DIV > BODY > HTML > #document to 11 of #text > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
    62 EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 11 of #text > DIV > BODY > HTML > #document to 11 of #text > DIV > BODY > HTML > #document toDOMRange:range from 11 of #text > DIV > BODY > HTML > #document to 11 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
     61EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 11 of #text > DIV > DIV > BODY > HTML > #document to 11 of #text > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
     62EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 11 of #text > DIV > DIV > BODY > HTML > #document to 11 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 11 of #text > DIV > DIV > BODY > HTML > #document to 11 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
    6363EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    6464EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
    65 layer at (0,0) size 800x600
    66   RenderView at (0,0) size 800x600
    67 layer at (0,0) size 800x600
    68   RenderBlock {HTML} at (0,0) size 800x600
    69     RenderBody {BODY} at (8,8) size 784x584
    70       RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
    71         RenderText {#text} at (14,14) size 63x28
    72           text run at (14,14) width 63: "There "
    73         RenderText {#text} at (77,14) size 285x28
    74           text run at (77,14) width 285: "is a tide in the affairs of men,"
    75       RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)]
    76         RenderText {#text} at (14,14) size 124x28
    77           text run at (14,14) width 124: "Which taken"
    78         RenderText {#text} at (138,14) size 285x28
    79           text run at (138,14) width 285: "is a tide in the affairs of men,"
    80       RenderBlock {DIV} at (0,112) size 784x56 [border: (2px solid #FF0000)]
    81         RenderText {#text} at (14,14) size 124x28
    82           text run at (14,14) width 124: "Which taken"
    83         RenderText {#text} at (138,14) size 310x28
    84           text run at (138,14) width 310: " at the flood leads on to fortune."
    85       RenderBlock {DIV} at (0,168) size 784x56 [border: (2px solid #FF0000)]
    86         RenderText {#text} at (14,14) size 351x28
    87           text run at (14,14) width 351: "Omitted, all the voyage of their life,"
    88       RenderBlock {DIV} at (0,224) size 784x56 [border: (2px solid #FF0000)]
    89         RenderText {#text} at (14,14) size 357x28
    90           text run at (14,14) width 357: "Is bound in shallows and in miseries."
    91 caret: position 11 of child 0 {#text} of child 3 {DIV} of body
     65This tests copy and pastes "is a tide in the affairs of men,\nWhich taken" twice.
     66
     67There is a tide in the affairs of men,
     68Which takenis a tide in the affairs of men,
     69Which taken at the flood leads on to fortune.
     70Omitted, all the voyage of their life,
     71Is bound in shallows and in miseries.
     72execCopyCommand: <div id="test" class="editing">There is a tide in the affairs of men,</div> <div class="editing">Which taken at the flood leads on to fortune.</div> <div class="editing">Omitted, all the voyage of their life,</div> <div class="editing">Is bound in shallows and in miseries.</div>
     73execPasteCommand: <div id="test" class="editing">There&nbsp;is a tide in the affairs of men,</div><div class="editing">Which taken&nbsp;at the flood leads on to fortune.</div> <div class="editing">Omitted, all the voyage of their life,</div> <div class="editing">Is bound in shallows and in miseries.</div>
     74execPasteCommand: <div id="test" class="editing">There&nbsp;is a tide in the affairs of men,</div><div class="editing">Which takenis a tide in the affairs of men,</div><div class="editing">Which taken&nbsp;at the flood leads on to fortune.</div> <div class="editing">Omitted, all the voyage of their life,</div> <div class="editing">Is bound in shallows and in miseries.</div>

  • trunk/LayoutTests/editing/pasteboard/paste-text-002.html

    r11995 r87486  
     1<!DOCTYPE html>
    12<html>
    23<head>
    3 
    44<style>
    55.editing {
    … …  
    99}
    1010</style>
    11 <script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
    12 
     11</head>
     12<body>
     13<p>This tests copy and pastes "is a tide in the affairs of men,\nWhich taken" twice.</p>
     14<div id="root" contenteditable>
     15<div id="test" class="editing">There is a tide in the affairs of men,</div>
     16<div class="editing">Which taken at the flood leads on to fortune.</div>
     17<div class="editing">Omitted, all the voyage of their life,</div>
     18<div class="editing">Is bound in shallows and in miseries.</div>
     19</div>
     20<script src="../editing.js"></script>
    1321<script>
    1422
    … …  
    2331}
    2432
     33runDumpAsTextEditingTest(true);
    2534</script>
    26 
    27 <title>Editing Test</title>
    28 </head>
    29 <body contenteditable id="root">
    30 <div id="test" class="editing">There is a tide in the affairs of men,</div>
    31 <div class="editing">Which taken at the flood leads on to fortune.</div>
    32 <div class="editing">Omitted, all the voyage of their life,</div>
    33 <div class="editing">Is bound in shallows and in miseries.</div>
    34  
    35 <script>
    36 runEditingTest();
    37 </script>
    38 
    3935</body>
    4036</html>

  • trunk/LayoutTests/editing/pasteboard/paste-text-003-expected.txt

    r87485 r87486  
    1 EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 4 of BODY > HTML > #document
     1EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
    22EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
    33EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    … …  
    9494EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    9595EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    96 EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 6 of #text > DIV > BODY > HTML > #document to 7 of #text > DIV > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
     96EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 6 of #text > DIV > DIV > BODY > HTML > #document to 7 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
    9797EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    9898EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    9999EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    100 EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 7 of #text > DIV > DIV > DIV > BODY > HTML > #document toDOMRange:range from 7 of #text > DIV > DIV > DIV > BODY > HTML > #document to 7 of #text > DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
     100EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > DIV > DIV > BODY > HTML > #document to 7 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document toDOMRange:range from 7 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document to 7 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
    101101EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    102102EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
    103 EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 7 of #text > DIV > DIV > DIV > BODY > HTML > #document to 7 of #text > DIV > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
    104 EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > DIV > DIV > DIV > BODY > HTML > #document to 7 of #text > DIV > DIV > DIV > BODY > HTML > #document toDOMRange:range from 7 of #text > DIV > DIV > DIV > BODY > HTML > #document to 7 of #text > DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
     103EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 7 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document to 7 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
     104EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document to 7 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document toDOMRange:range from 7 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document to 7 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
    105105EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    106106EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
    107 layer at (0,0) size 800x600
    108   RenderView at (0,0) size 800x600
    109 layer at (0,0) size 800x600
    110   RenderBlock {HTML} at (0,0) size 800x600
    111     RenderBody {BODY} at (8,8) size 784x584
    112       RenderBlock {DIV} at (0,0) size 784x364 [border: (2px solid #FF0000)]
    113         RenderBlock (anonymous) at (14,14) size 756x28
    114           RenderText {#text} at (0,0) size 63x28
    115             text run at (0,0) width 63: "There "
    116           RenderText {#text} at (63,0) size 285x28
    117             text run at (63,0) width 285: "is a tide in the affairs of men,"
    118         RenderBlock {DIV} at (14,42) size 756x56 [border: (2px solid #FF0000)]
    119           RenderText {#text} at (14,14) size 434x28
    120             text run at (14,14) width 434: "Which taken at the flood leads on to fortune."
    121         RenderBlock {DIV} at (14,98) size 756x252 [border: (2px solid #FF0000)]
    122           RenderBlock (anonymous) at (14,14) size 728x0
    123           RenderBlock {DIV} at (14,14) size 728x56 [border: (2px solid #FF0000)]
    124             RenderText {#text} at (14,14) size 80x28
    125               text run at (14,14) width 80: "Omitted"
    126             RenderText {#text} at (94,14) size 285x28
    127               text run at (94,14) width 285: "is a tide in the affairs of men,"
    128           RenderBlock (anonymous) at (14,70) size 728x0
    129           RenderBlock {DIV} at (14,70) size 728x56 [border: (2px solid #FF0000)]
    130             RenderText {#text} at (14,14) size 434x28
    131               text run at (14,14) width 434: "Which taken at the flood leads on to fortune."
    132           RenderBlock {DIV} at (14,126) size 728x112 [border: (2px solid #FF0000)]
    133             RenderBlock (anonymous) at (14,14) size 700x28
    134               RenderText {#text} at (0,0) size 80x28
    135                 text run at (0,0) width 80: "Omitted"
    136               RenderText {#text} at (80,0) size 271x28
    137                 text run at (80,0) width 271: ", all the voyage of their life,"
    138             RenderBlock {DIV} at (14,42) size 700x56 [border: (2px solid #FF0000)]
    139               RenderText {#text} at (14,14) size 357x28
    140                 text run at (14,14) width 357: "Is bound in shallows and in miseries."
    141 caret: position 7 of child 0 {#text} of child 2 {DIV} of child 3 {DIV} of child 1 {DIV} of body
     107This test copies and pastes "is a tide in the affairs of men,\nWhich taken at the flood leads on to fortune.\nOmitted" twice.
     108
     109There is a tide in the affairs of men,
     110Which taken at the flood leads on to fortune.
     111Omittedis a tide in the affairs of men,
     112Which taken at the flood leads on to fortune.
     113Omitted, all the voyage of their life,
     114Is bound in shallows and in miseries.
     115execCopyCommand: <div id="test" class="editing">There is a tide in the affairs of men, <div class="editing">Which taken at the flood leads on to fortune. <div class="editing">Omitted, all the voyage of their life, <div class="editing">Is bound in shallows and in miseries. </div> </div> </div> </div>
     116execPasteCommand: <div id="test" class="editing">There&nbsp;is a tide in the affairs of men,<div class="editing">Which taken at the flood leads on to fortune.</div><div class="editing"><div class="editing">Omitted, all the voyage of their life, <div class="editing">Is bound in shallows and in miseries. </div> </div> </div> </div>
     117execPasteCommand: <div id="test" class="editing">There&nbsp;is a tide in the affairs of men,<div class="editing">Which taken at the flood leads on to fortune.</div><div class="editing"><div class="editing">Omittedis a tide in the affairs of men,</div><div class="editing">Which taken at the flood leads on to fortune.</div><div class="editing">Omitted, all the voyage of their life, <div class="editing">Is bound in shallows and in miseries. </div> </div> </div> </div>

  • trunk/LayoutTests/editing/pasteboard/paste-text-003.html

    r11995 r87486  
     1<!DOCTYPE html>
    12<html>
    23<head>
    3 
     4<script src="../../../resources/dump-as-markup.js"></script>
    45<style>
    56.editing {
    … …  
    910}
    1011</style>
    11 <script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
    12 
     12</head>
     13<body>
     14<p>This test copies and pastes "is a tide in the affairs of men,\nWhich taken at the flood leads on to fortune.\nOmitted" twice.</p>
     15<div contenteditable id="root">
     16<div id="test" class="editing">There is a tide in the affairs of men,
     17<div class="editing">Which taken at the flood leads on to fortune.
     18<div class="editing">Omitted, all the voyage of their life,
     19<div class="editing">Is bound in shallows and in miseries.
     20</div>
     21</div>
     22</div>
     23</div>
     24</div>
     25<script src="../editing.js"></script>
    1326<script>
    1427
    … …  
    2336}
    2437
     38runDumpAsTextEditingTest(true);
    2539</script>
    26 
    27 <title>Editing Test</title>
    28 </head>
    29 <body contenteditable id="root">
    30 <div id="test" class="editing">There is a tide in the affairs of men,
    31 <div class="editing">Which taken at the flood leads on to fortune.
    32 <div class="editing">Omitted, all the voyage of their life,
    33 <div class="editing">Is bound in shallows and in miseries.
    34 </div>
    35 </div>
    36 </div>
    37 </div>
    38  
    39 <script>
    40 runEditingTest();
    41 </script>
    42 
    4340</body>
    4441</html>
Note: See TracChangeset for help on using the changeset viewer.