Changeset 83246 in webkit


Ignore:
Timestamp:
Apr 7, 2011 9:02:11 PM (13 years ago)
Author:
rniwa@webkit.org
Message:

2011-04-07 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Eric Seidel.

dump-as-markup conversion: editing/pasteboard/paste-text-001.html and paste-text-011.html
​https://bugs.webkit.org/show_bug.cgi?id=58078

Converted the tests.

  • editing/pasteboard/paste-text-001-expected.txt: Added.
  • editing/pasteboard/paste-text-001.html:
  • editing/pasteboard/paste-text-011-expected.txt: Added.
  • editing/pasteboard/paste-text-011.html:
  • platform/chromium-linux/editing/pasteboard/paste-text-001-expected.checksum: Removed.
  • platform/chromium-linux/editing/pasteboard/paste-text-001-expected.png: Removed.
  • platform/chromium-linux/editing/pasteboard/paste-text-011-expected.checksum: Removed.
  • platform/chromium-linux/editing/pasteboard/paste-text-011-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/paste-text-001-expected.checksum: Removed.
  • platform/chromium-win/editing/pasteboard/paste-text-001-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/paste-text-001-expected.txt: Removed.
  • platform/chromium-win/editing/pasteboard/paste-text-011-expected.checksum: Removed.
  • platform/chromium-win/editing/pasteboard/paste-text-011-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/paste-text-011-expected.txt: Removed.
  • platform/gtk/editing/pasteboard/paste-text-001-expected.txt: Removed.
  • platform/gtk/editing/pasteboard/paste-text-011-expected.checksum: Removed.
  • platform/gtk/editing/pasteboard/paste-text-011-expected.png: Removed.
  • platform/gtk/editing/pasteboard/paste-text-011-expected.txt: Removed.
  • platform/mac-leopard/editing/pasteboard/paste-text-011-expected.checksum: Removed.
  • platform/mac-leopard/editing/pasteboard/paste-text-011-expected.png: Removed.
  • platform/mac/editing/pasteboard/paste-text-001-expected.checksum: Removed.
  • platform/mac/editing/pasteboard/paste-text-001-expected.png: Removed.
  • platform/mac/editing/pasteboard/paste-text-001-expected.txt: Removed.
  • platform/mac/editing/pasteboard/paste-text-011-expected.checksum: Removed.
  • platform/mac/editing/pasteboard/paste-text-011-expected.png: Removed.
  • platform/mac/editing/pasteboard/paste-text-011-expected.txt: Removed.
  • platform/qt/editing/pasteboard/paste-text-011-expected.checksum: Removed.
  • platform/qt/editing/pasteboard/paste-text-011-expected.png: Removed.
  • platform/qt/editing/pasteboard/paste-text-011-expected.txt: Removed.
Location:
trunk/LayoutTests
Files:
1 added
24 deleted
3 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r83244 r83246  
     12011-04-07  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        dump-as-markup conversion: editing/pasteboard/paste-text-001.html and paste-text-011.html
     6        https://bugs.webkit.org/show_bug.cgi?id=58078
     7
     8        Converted the tests.
     9
     10        * editing/pasteboard/paste-text-001-expected.txt: Added.
     11        * editing/pasteboard/paste-text-001.html:
     12        * editing/pasteboard/paste-text-011-expected.txt: Added.
     13        * editing/pasteboard/paste-text-011.html:
     14        * platform/chromium-linux/editing/pasteboard/paste-text-001-expected.checksum: Removed.
     15        * platform/chromium-linux/editing/pasteboard/paste-text-001-expected.png: Removed.
     16        * platform/chromium-linux/editing/pasteboard/paste-text-011-expected.checksum: Removed.
     17        * platform/chromium-linux/editing/pasteboard/paste-text-011-expected.png: Removed.
     18        * platform/chromium-win/editing/pasteboard/paste-text-001-expected.checksum: Removed.
     19        * platform/chromium-win/editing/pasteboard/paste-text-001-expected.png: Removed.
     20        * platform/chromium-win/editing/pasteboard/paste-text-001-expected.txt: Removed.
     21        * platform/chromium-win/editing/pasteboard/paste-text-011-expected.checksum: Removed.
     22        * platform/chromium-win/editing/pasteboard/paste-text-011-expected.png: Removed.
     23        * platform/chromium-win/editing/pasteboard/paste-text-011-expected.txt: Removed.
     24        * platform/gtk/editing/pasteboard/paste-text-001-expected.txt: Removed.
     25        * platform/gtk/editing/pasteboard/paste-text-011-expected.checksum: Removed.
     26        * platform/gtk/editing/pasteboard/paste-text-011-expected.png: Removed.
     27        * platform/gtk/editing/pasteboard/paste-text-011-expected.txt: Removed.
     28        * platform/mac-leopard/editing/pasteboard/paste-text-011-expected.checksum: Removed.
     29        * platform/mac-leopard/editing/pasteboard/paste-text-011-expected.png: Removed.
     30        * platform/mac/editing/pasteboard/paste-text-001-expected.checksum: Removed.
     31        * platform/mac/editing/pasteboard/paste-text-001-expected.png: Removed.
     32        * platform/mac/editing/pasteboard/paste-text-001-expected.txt: Removed.
     33        * platform/mac/editing/pasteboard/paste-text-011-expected.checksum: Removed.
     34        * platform/mac/editing/pasteboard/paste-text-011-expected.png: Removed.
     35        * platform/mac/editing/pasteboard/paste-text-011-expected.txt: Removed.
     36        * platform/qt/editing/pasteboard/paste-text-011-expected.checksum: Removed.
     37        * platform/qt/editing/pasteboard/paste-text-011-expected.png: Removed.
     38        * platform/qt/editing/pasteboard/paste-text-011-expected.txt: Removed.
     39
    1402011-04-07  Kent Tamura  <tkent@chromium.org>
    241

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

    r83245 r83246  
    1 EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
    2 EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
    3 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    41EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    52EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    … …  
    1613EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    1714EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
    18 layer at (0,0) size 800x600
    19   RenderView at (0,0) size 800x600
    20 layer at (0,0) size 800x600
    21   RenderBlock {HTML} at (0,0) size 800x600
    22     RenderBody {BODY} at (8,8) size 784x584
    23       RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
    24         RenderInline {SPAN} at (0,0) size 139x27
    25           RenderText {#text} at (14,14) size 69x27
    26             text run at (14,14) width 69: "foo bar"
    27           RenderText {#text} at (83,14) size 31x27
    28             text run at (83,14) width 31: "bar"
    29           RenderText {#text} at (114,14) size 39x27
    30             text run at (114,14) width 39: " baz"
    31         RenderText {#text} at (0,0) size 0x0
    32 caret: position 3 of child 1 {#text} of child 1 {SPAN} of child 1 {DIV} of body
     15EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
     16EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
     17
     18You should see "foo barbar baz" below:
     19| "
     20"
     21| <span>
     22|   id="test"
     23|   "foo bar"
     24|   "bar<#selection-caret>"
     25|   " baz"
     26| "
     27"

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

    r11995 r83246  
    1 <html>
    2 <head>
    3 
    4 <style>
    5 .editing {
    6     border: 2px solid red;
    7     padding: 12px;
    8     font-size: 24px;
    9 }
    10 </style>
    11 <script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
    12 
    13 <script>
    14 
    15 function editingTest() {
    16     for (i = 0; i < 4; i++)
    17         moveSelectionForwardByCharacterCommand();
    18     for (i = 0; i < 3; i++)
    19         extendSelectionForwardByCharacterCommand();
    20     copyCommand();
    21     moveSelectionForwardByCharacterCommand();
    22     pasteCommand();
    23 }
    24 
    25 </script>
    26 
    27 <title>Editing Test</title>
    28 </head>
     1<!DOCTYPE html>
     2<html>
    293<body>
    304<div contenteditable id="root" class="editing">
    315<span id="test">foo bar baz</span>
    326</div>
     7<script src="../editing.js"></script>
     8<script src="../../resources/dump-as-markup.js"></script>
     9<script>
    3310
    34 <script>
    35 runEditingTest();
     11var test = document.getElementById('test');
     12test.focus();
     13window.getSelection().setPosition(root, 0);
     14
     15if (window.layoutTestController)
     16    layoutTestController.dumpEditingCallbacks();
     17
     18for (i = 0; i < 4; i++)
     19    moveSelectionForwardByCharacterCommand();
     20for (i = 0; i < 3; i++)
     21    extendSelectionForwardByCharacterCommand();
     22copyCommand();
     23moveSelectionForwardByCharacterCommand();
     24pasteCommand();
     25
     26Markup.dump('root', 'You should see "foo barbar baz" below');
     27
    3628</script>
    37 
    3829</body>
    3930</html>

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

    r14172 r83246  
    1 
    2 <html> 
     1<!DOCTYPE html>
     2<html>
    33<head>
    4 
    5 <style>
    6 .editing {
    7     border: 2px solid red;
    8     padding: 12px;
    9     font-size: 24px;
    10 }
    11 </style>
    12 <script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
    13 
     4<script src="../editing.js"></script>
     5<script src="../../resources/dump-as-markup.js"></script>
    146<script>
    157
    16 // There was a bug when pasting at the end of the block. The content was inserted at the
    17 // start of the block instead of the end. This tests the insert-at-end case.
     8Markup.waitUntilDone();
    189
    1910function editingTest() {
     11    document.body.focus();
     12    window.getSelection().setPosition(document.body, 0);
     13
     14    if (window.layoutTestController)
     15        layoutTestController.dumpEditingCallbacks();
     16
     17    Markup.description('There was a bug when pasting at the end of the block.\n'+
     18    'The content was inserted at the start of the block instead of the end. This tests the insert-at-end case.');
     19
    2020    selectAllCommand();
    2121    copyCommand();
    … …  
    2323    insertParagraphCommand();
    2424    pasteCommand();
     25
     26    Markup.dump(document.body);
     27    Markup.notifyDone();
    2528}
    2629
    2730</script>
    28 
    29 <title>Editing Test</title>
    3031</head>
    31 <body contenteditable id="test">
     32<body contenteditable id="test" onload="editingTest()">
    3233<p><font face="Monaco"><b>hello</b></font></p>
    3334<p><font face="Monaco"><b>there</b></font></p>
    34  
    35 <script>
    36 runEditingTest();
    37 </script>
    38 
    3935</body>
    4036</html>
Note: See TracChangeset for help on using the changeset viewer.