Changeset 87496 in webkit


Ignore:
Timestamp:
May 27, 2011 4:44:07 AM (13 years ago)
Author:
rniwa@webkit.org
Message:

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

Reviewed by Kent Tamura.

Convert smart-paste-004.html through smart-paste-006.html to dumpAsText tests
​https://bugs.webkit.org/show_bug.cgi?id=61618

Converted smart-paste-004.html, smart-paste-005.html, and smart-paste-005.html to dumpAsText tests.

  • editing/pasteboard/smart-paste-004-expected.txt: Added.
  • editing/pasteboard/smart-paste-004.html:
  • editing/pasteboard/smart-paste-005-expected.txt: Added.
  • editing/pasteboard/smart-paste-005.html:
  • editing/pasteboard/smart-paste-006-expected.txt: Added.
  • editing/pasteboard/smart-paste-006.html:
  • platform/chromium-linux/editing/pasteboard/smart-paste-004-expected.png: Removed.
  • platform/chromium-linux/editing/pasteboard/smart-paste-004-expected.txt: Removed.
  • platform/chromium-linux/editing/pasteboard/smart-paste-005-expected.png: Removed.
  • platform/chromium-linux/editing/pasteboard/smart-paste-006-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/smart-paste-004-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/smart-paste-004-expected.txt: Removed.
  • platform/chromium-win/editing/pasteboard/smart-paste-005-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/smart-paste-005-expected.txt: Removed.
  • platform/chromium-win/editing/pasteboard/smart-paste-006-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/smart-paste-006-expected.txt: Removed.
  • platform/gtk/editing/pasteboard/smart-paste-004-expected.png: Removed.
  • platform/gtk/editing/pasteboard/smart-paste-004-expected.txt: Removed.
  • platform/gtk/editing/pasteboard/smart-paste-005-expected.png: Removed.
  • platform/gtk/editing/pasteboard/smart-paste-005-expected.txt: Removed.
  • platform/gtk/editing/pasteboard/smart-paste-006-expected.png: Removed.
  • platform/gtk/editing/pasteboard/smart-paste-006-expected.txt: Removed.
  • platform/mac/editing/pasteboard/smart-paste-004-expected.png: Removed.
  • platform/mac/editing/pasteboard/smart-paste-004-expected.txt: Removed.
  • platform/mac/editing/pasteboard/smart-paste-005-expected.png: Removed.
  • platform/mac/editing/pasteboard/smart-paste-005-expected.txt: Removed.
  • platform/mac/editing/pasteboard/smart-paste-006-expected.png: Removed.
  • platform/mac/editing/pasteboard/smart-paste-006-expected.txt: Removed.
  • platform/qt/editing/pasteboard/smart-paste-004-expected.png: Removed.
  • platform/qt/editing/pasteboard/smart-paste-004-expected.txt: Removed.
  • platform/qt/editing/pasteboard/smart-paste-005-expected.png: Removed.
  • platform/qt/editing/pasteboard/smart-paste-005-expected.txt: Removed.
  • platform/qt/editing/pasteboard/smart-paste-006-expected.png: Removed.
  • platform/qt/editing/pasteboard/smart-paste-006-expected.txt: Removed.
Location:
trunk/LayoutTests
Files:
2 added
27 deleted
4 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r87495 r87496  
     12011-05-27  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Kent Tamura.
     4
     5        Convert smart-paste-004.html through smart-paste-006.html to dumpAsText tests
     6        https://bugs.webkit.org/show_bug.cgi?id=61618
     7
     8        Converted smart-paste-004.html, smart-paste-005.html, and smart-paste-005.html to dumpAsText tests.
     9
     10        * editing/pasteboard/smart-paste-004-expected.txt: Added.
     11        * editing/pasteboard/smart-paste-004.html:
     12        * editing/pasteboard/smart-paste-005-expected.txt: Added.
     13        * editing/pasteboard/smart-paste-005.html:
     14        * editing/pasteboard/smart-paste-006-expected.txt: Added.
     15        * editing/pasteboard/smart-paste-006.html:
     16        * platform/chromium-linux/editing/pasteboard/smart-paste-004-expected.png: Removed.
     17        * platform/chromium-linux/editing/pasteboard/smart-paste-004-expected.txt: Removed.
     18        * platform/chromium-linux/editing/pasteboard/smart-paste-005-expected.png: Removed.
     19        * platform/chromium-linux/editing/pasteboard/smart-paste-006-expected.png: Removed.
     20        * platform/chromium-win/editing/pasteboard/smart-paste-004-expected.png: Removed.
     21        * platform/chromium-win/editing/pasteboard/smart-paste-004-expected.txt: Removed.
     22        * platform/chromium-win/editing/pasteboard/smart-paste-005-expected.png: Removed.
     23        * platform/chromium-win/editing/pasteboard/smart-paste-005-expected.txt: Removed.
     24        * platform/chromium-win/editing/pasteboard/smart-paste-006-expected.png: Removed.
     25        * platform/chromium-win/editing/pasteboard/smart-paste-006-expected.txt: Removed.
     26        * platform/gtk/editing/pasteboard/smart-paste-004-expected.png: Removed.
     27        * platform/gtk/editing/pasteboard/smart-paste-004-expected.txt: Removed.
     28        * platform/gtk/editing/pasteboard/smart-paste-005-expected.png: Removed.
     29        * platform/gtk/editing/pasteboard/smart-paste-005-expected.txt: Removed.
     30        * platform/gtk/editing/pasteboard/smart-paste-006-expected.png: Removed.
     31        * platform/gtk/editing/pasteboard/smart-paste-006-expected.txt: Removed.
     32        * platform/mac/editing/pasteboard/smart-paste-004-expected.png: Removed.
     33        * platform/mac/editing/pasteboard/smart-paste-004-expected.txt: Removed.
     34        * platform/mac/editing/pasteboard/smart-paste-005-expected.png: Removed.
     35        * platform/mac/editing/pasteboard/smart-paste-005-expected.txt: Removed.
     36        * platform/mac/editing/pasteboard/smart-paste-006-expected.png: Removed.
     37        * platform/mac/editing/pasteboard/smart-paste-006-expected.txt: Removed.
     38        * platform/qt/editing/pasteboard/smart-paste-004-expected.png: Removed.
     39        * platform/qt/editing/pasteboard/smart-paste-004-expected.txt: Removed.
     40        * platform/qt/editing/pasteboard/smart-paste-005-expected.png: Removed.
     41        * platform/qt/editing/pasteboard/smart-paste-005-expected.txt: Removed.
     42        * platform/qt/editing/pasteboard/smart-paste-006-expected.png: Removed.
     43        * platform/qt/editing/pasteboard/smart-paste-006-expected.txt: Removed.
     44
    1452011-05-27  Ryosuke Niwa  <rniwa@webkit.org>
    246

  • trunk/LayoutTests/editing/pasteboard/smart-paste-004.html

    r55913 r87496  
    1 <html>
     1<!DOCTYPE html>
     2<html>
    23<head>
    3 
    44<style>
    55.editing {
    … …  
    1717.expected-results:first-line { font-weight: bold }
    1818</style>
    19 <script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
     19</head>
     20<body>
     21<div class="explanation">
     22<div class="scenario">
     23Tests:
     24<br>
     25Smart paste when pasting after word and a space before another word.
     26</div>
     27<div class="expected-results">
     28Expected Results:
     29<br>
     30A space should be added after the pasted word before the other preexisting word.  It should like this:
     31<BR>
     32test test test
     33</div>
     34</div>
    2035
     36<div contenteditable id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;">
     37<div id="test" class="editing">
     38test test
     39</div>
     40</div>
     41<script src="../editing.js"></script>
    2142<script>
    2243
    … …  
    2950}
    3051
     52runDumpAsTextEditingTest(true);
    3153</script>
    32 
    33 <title>Editing Test</title>
    34 </head>
    35 <body>
    36 
    37 <div class="explanation">
    38 <div class="scenario">
    39 Tests:
    40 <br>
    41 Smart paste when pasting after word and a space before another word.
    42 </div>
    43 <div class="expected-results">
    44 Expected Results:
    45 <br>
    46 A space should be added after the pasted word before the other preexisting word.  It should like this this:
    47 <BR>
    48 test test test
    49 </div>
    50 </div>
    51 
    52 <div contenteditable id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;">
    53 <div id="test" class="editing">
    54 test test
    55 </div>
    56 </div>
    57 
    58 <script>
    59 runEditingTest();
    60 </script>
    61 
    6254</body>
    6355</html>

  • trunk/LayoutTests/editing/pasteboard/smart-paste-005.html

    r56089 r87496  
    1 <html>
     1<!DOCTYPE html>
     2<html>
    23<head>
    3 
    44<style>
    55.editing {
    … …  
    1717.expected-results:first-line { font-weight: bold }
    1818</style>
    19 <script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
    20 
    21 <script>
    22 
    23 function editingTest() {
    24     var target = document.getElementById('test');
    25     var x = target.offsetLeft + target.offsetWidth / 2;
    26     var y = target.offsetTop + target.offsetHeight / 2;
    27     doubleClick(x, y);
    28     copyCommand();
    29     moveSelectionBackwardByWordCommand();
    30     moveSelectionForwardByCharacterCommand();
    31     moveSelectionForwardByCharacterCommand();
    32     pasteCommand();
    33 }
    34 
    35 </script>
    36 
    37 <title>Editing Test</title>
    3819</head>
    3920<body>
    … …  
    5940</div>
    6041</div>
     42<script src="../editing.js"></script>
     43<script>
    6144
    62 <script>
    63 runEditingTest();
     45function editingTest() {
     46    var target = document.getElementById('test');
     47    var x = target.offsetLeft + target.offsetWidth / 2;
     48    var y = target.offsetTop + target.offsetHeight / 2;
     49    doubleClick(x, y);
     50    copyCommand();
     51    moveSelectionBackwardByWordCommand();
     52    moveSelectionForwardByCharacterCommand();
     53    moveSelectionForwardByCharacterCommand();
     54    pasteCommand();
     55}
     56
     57runDumpAsTextEditingTest(true);
    6458</script>
    65 
    6659</body>
    6760</html>

  • trunk/LayoutTests/editing/pasteboard/smart-paste-006-expected.txt

    r87495 r87496  
    2323EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    2424EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
    25 layer at (0,0) size 800x600
    26   RenderView at (0,0) size 800x600
    27 layer at (0,0) size 800x600
    28   RenderBlock {HTML} at (0,0) size 800x600
    29     RenderBody {BODY} at (8,8) size 784x584
    30       RenderBlock {DIV} at (0,0) size 784x242 [border: (2px solid #0000FF)]
    31         RenderBlock {DIV} at (14,14) size 756x66
    32           RenderText {#text} at (0,0) size 67x33
    33             text run at (0,0) width 67: "Tests: "
    34           RenderBR {BR} at (0,0) size 0x0
    35           RenderText {#text} at (0,33) size 680x33
    36             text run at (0,33) width 680: "Smart paste when pasting between smart paste exempt characters."
    37         RenderBlock {DIV} at (14,96) size 756x132
    38           RenderText {#text} at (0,0) size 189x33
    39             text run at (0,0) width 189: "Expected Results: "
    40           RenderBR {BR} at (189,24) size 0x0
    41           RenderText {#text} at (0,33) size 749x66
    42             text run at (0,33) width 749: "No spaces should be added before or after the pasted word. It should look"
    43             text run at (0,66) width 95: "like this: "
    44           RenderBR {BR} at (95,90) size 0x0
    45           RenderText {#text} at (0,99) size 52x33
    46             text run at (0,99) width 52: "-test-"
    47       RenderBlock {DIV} at (0,266) size 784x37
    48         RenderBlock {DIV} at (0,0) size 784x37 [border: (2px solid #FF0000)]
    49           RenderText {#text} at (2,2) size 8x33
    50             text run at (2,2) width 8: "-"
    51           RenderText {#text} at (10,2) size 36x33
    52             text run at (10,2) width 36: "test"
    53           RenderText {#text} at (46,2) size 8x33
    54             text run at (46,2) width 8: "-"
    55         RenderBlock (anonymous) at (0,37) size 784x0
    56 caret: position 4 of child 1 {#text} of child 1 {DIV} of child 3 {DIV} of body
     25Tests:
     26Smart paste when pasting between smart paste exempt characters.
     27Expected Results:
     28No spaces should be added before or after the pasted word. It should look like this:
     29-test-
     30-test-
     31execCutCommand: <div id="test" class="editing"><br></div>
     32execTypeCharacterCommand: <div id="test" class="editing">-</div>
     33execTypeCharacterCommand: <div id="test" class="editing">--</div>
     34execPasteCommand: <div id="test" class="editing">-test-</div>

  • trunk/LayoutTests/editing/pasteboard/smart-paste-006.html

    r11995 r87496  
     1<!DOCTYPE html>
    12<html>
    23<head>
    3 
    44<style>
    55.editing {
    … …  
    1717.expected-results:first-line { font-weight: bold }
    1818</style>
    19 <script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
    20 
    21 <script>
    22 
    23 function editingTest() {
    24     extendSelectionForwardByWordCommand();
    25     cutCommand();
    26     typeCharacterCommand('-');
    27     typeCharacterCommand('-');
    28     moveSelectionBackwardByCharacterCommand();
    29     pasteCommand();
    30 }
    31 
    32 </script>
    33 
    34 <title>Editing Test</title>
    3519</head>
    3620<body>
    … …  
    5640</div>
    5741</div>
     42<script src="../editing.js"></script>
     43<script>
    5844
    59 <script>
    60 runEditingTest();
     45function editingTest() {
     46    extendSelectionForwardByWordCommand();
     47    cutCommand();
     48    typeCharacterCommand('-');
     49    typeCharacterCommand('-');
     50    moveSelectionBackwardByCharacterCommand();
     51    pasteCommand();
     52}
     53
     54runDumpAsTextEditingTest(true);
    6155</script>
    62 
    6356</body>
    6457</html>
Note: See TracChangeset for help on using the changeset viewer.