Changeset 87262 in webkit


Ignore:
Timestamp:
May 24, 2011 8:50:54 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-05-24 Annie Sullivan <sullivan@chromium.org>

Reviewed by Ryosuke Niwa.

Convert LayoutTests/editing/deleting/5206311-2.html to dump-as-markup
https://bugs.webkit.org/show_bug.cgi?id=61332

Used dump-as-markup to improve readability of results.
Also improved HTML and cleaned up descriptions.

  • editing/deleting/5206311-2-expected.txt: Added.
  • editing/deleting/5206311-2.html: Convert to dump-as-markup.
  • platform/chromium-linux/editing/deleting/5206311-2-expected.png: Removed.
  • platform/chromium-win/editing/deleting/5206311-2-expected.png: Removed.
  • platform/chromium-win/editing/deleting/5206311-2-expected.txt: Removed.
  • platform/gtk/editing/deleting/5206311-2-expected.txt: Removed.
  • platform/mac-leopard/editing/deleting/5206311-2-expected.png: Removed.
  • platform/mac/editing/deleting/5206311-2-expected.png: Removed.
  • platform/mac/editing/deleting/5206311-2-expected.txt: Removed.
  • platform/qt/editing/deleting/5206311-2-expected.png: Removed.
  • platform/qt/editing/deleting/5206311-2-expected.txt: Removed.
Location:
trunk/LayoutTests
Files:
1 added
9 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r87261 r87262  
     12011-05-24  Annie Sullivan  <sullivan@chromium.org>
     2
     3        Reviewed by Ryosuke Niwa.
     4
     5        Convert LayoutTests/editing/deleting/5206311-2.html to dump-as-markup
     6        https://bugs.webkit.org/show_bug.cgi?id=61332
     7
     8        Used dump-as-markup to improve readability of results.
     9        Also improved HTML and cleaned up descriptions.
     10
     11        * editing/deleting/5206311-2-expected.txt: Added.
     12        * editing/deleting/5206311-2.html: Convert to dump-as-markup.
     13        * platform/chromium-linux/editing/deleting/5206311-2-expected.png: Removed.
     14        * platform/chromium-win/editing/deleting/5206311-2-expected.png: Removed.
     15        * platform/chromium-win/editing/deleting/5206311-2-expected.txt: Removed.
     16        * platform/gtk/editing/deleting/5206311-2-expected.txt: Removed.
     17        * platform/mac-leopard/editing/deleting/5206311-2-expected.png: Removed.
     18        * platform/mac/editing/deleting/5206311-2-expected.png: Removed.
     19        * platform/mac/editing/deleting/5206311-2-expected.txt: Removed.
     20        * platform/qt/editing/deleting/5206311-2-expected.png: Removed.
     21        * platform/qt/editing/deleting/5206311-2-expected.txt: Removed.
     22
    1232011-05-24  Annie Sullivan  <sullivan@chromium.org>
    224
  • trunk/LayoutTests/editing/deleting/5206311-2.html

    r24375 r87262  
     1<!DOCTYPE html>
     2<head>
     3<script src="../../resources/dump-as-markup.js"></script>
    14<script>
    2 function runTest(num)
     5function runTest(elem)
    36{
    47    sel = window.getSelection();
    5     start = document.getElementById("test" + num + "start");
    6     end = document.getElementById("test" + num + "end");
     8    start = elem.getElementsByClassName("start")[0];
     9    end = elem.getElementsByClassName("end")[0];
    710    sel.setBaseAndExtent(start, 0, end, end.childNodes.length);
    811    document.execCommand("Delete");
     12    Markup.dump(elem.getElementsByClassName('root')[0], elem.getElementsByClassName("description")[0].textContent);
    913}
    1014</script>
     15</head>
    1116
    12 <p>This empties the last row, it should be removed. 'world!' should also be brought into the second cell of the second row.</p>
    13 <div contenteditable="true">
     17<body>
     18<div id="test1">
     19<p class="description">The test deletes cells 5 through 9.
     20Since all the cells in the third row were deleted, the third row is removed.
     21The cells in the second row are not removed because not all of them are deleted.
     22The second cell, which used to contain '5', is replaced with the 'world!' text, and the third cell is cleared</p>
     23<div class="root" contenteditable="true">
    1424<table border="1">
    1525<tr><td>1</td><td>2</td><td>3</td></tr>
    16 <tr><td>4</td><td id="test1start">5</td><td>6</td></tr>
     26<tr><td>4</td><td class="start">5</td><td>6</td></tr>
    1727<tr><td>7</td><td>8</td><td>9</td></tr>
    1828</table>
    19 <div><span id="test1end">Hello </span>world!</div>
     29<div><span class="end">Hello </span>world!</div>
     30</div>
    2031</div>
    2132
    22 <script>runTest(1);</script>
     33<script>runTest(test1);</script>
    2334
    2435
    2536
    26 <p>This empties a the last row of the first table and the first of the second, they should both be removed.</p>
    27 <div contenteditable="true">
     37<div id="test2">
     38<p class="description">
     39This test deletes cells 5 through 9 of the first table and 1 through 5 of the second.
     40In the first table, cells 5-6 in the second row are cleared and the last row (cells 7-9) is removed.
     41In the second table, the first row (cells 1-3) is removed and cells 4-5 in the second row are cleared</p>
     42<div class="root" contenteditable="true">
    2843<table border="1">
    2944<tr><td>1</td><td>2</td><td>3</td></tr>
    30 <tr><td>4</td><td id="test2start">5</td><td>6</td></tr>
     45<tr><td>4</td><td class="start">5</td><td>6</td></tr>
    3146<tr><td>7</td><td>8</td><td>9</td></tr>
    3247</table>
     
    3449<table border="1">
    3550<tr><td>1</td><td>2</td><td>3</td></tr>
    36 <tr><td>4</td><td id="test2end">5</td><td>6</td></tr>
     51<tr><td>4</td><td class="end">5</td><td>6</td></tr>
    3752<tr><td>7</td><td>8</td><td>9</td></tr>
    3853</table>
    3954</div>
     55</div>
    4056
    41 <script>runTest(2);</script>
     57<script>runTest(test2);</script>
     58</body>
     59</html>
Note: See TracChangeset for help on using the changeset viewer.