Move deletionUI tests into platform/mac
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Feb 2013 01:31:36 +0000 (01:31 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Feb 2013 01:31:36 +0000 (01:31 +0000)
https://bugs.webkit.org/show_bug.cgi?id=109517

Reviewed by Benjamin Poulain.

Moved deletionUI tests into platform/mac since Mac is the only port that ships this feature.

* editing/deleting/5408255-expected.txt: Removed.
* editing/deleting/5408255.html: Removed.
* editing/deleting/deletionUI-single-instance.html: Removed.
* platform/chromium/editing/deleting/deletionUI-single-instance-expected.png: Removed.
* platform/chromium/editing/deleting/deletionUI-single-instance-expected.txt: Removed.
* platform/efl/TestExpectations:
* platform/mac/editing/deleting/deletionUI-click-on-delete-button-expected.txt: Copied from LayoutTests/editing/deleting/5408255-expected.txt.
* platform/mac/editing/deleting/deletionUI-click-on-delete-button.html: Copied from LayoutTests/editing/deleting/5408255.html.
* platform/mac/editing/deleting/deletionUI-single-instance.html: Copied from LayoutTests/editing/deleting/deletionUI-single-instance.html.
* platform/qt-mac/TestExpectations:
* platform/qt/editing/deleting/deletionUI-single-instance-expected.png: Removed.
* platform/qt/editing/deleting/deletionUI-single-instance-expected.txt: Removed.
* platform/win/TestExpectations:
* platform/wincairo/TestExpectations:
* platform/wk2/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142559 268f45cc-cd09-0410-ab3c-d52691b4dbfc

13 files changed:
LayoutTests/ChangeLog
LayoutTests/platform/chromium/editing/deleting/deletionUI-single-instance-expected.png [deleted file]
LayoutTests/platform/chromium/editing/deleting/deletionUI-single-instance-expected.txt [deleted file]
LayoutTests/platform/efl/TestExpectations
LayoutTests/platform/mac/editing/deleting/deletionUI-click-on-delete-button-expected.txt [moved from LayoutTests/editing/deleting/5408255-expected.txt with 100% similarity]
LayoutTests/platform/mac/editing/deleting/deletionUI-click-on-delete-button.html [moved from LayoutTests/editing/deleting/5408255.html with 95% similarity]
LayoutTests/platform/mac/editing/deleting/deletionUI-single-instance.html [moved from LayoutTests/editing/deleting/deletionUI-single-instance.html with 100% similarity]
LayoutTests/platform/qt-mac/TestExpectations
LayoutTests/platform/qt/editing/deleting/deletionUI-single-instance-expected.png [deleted file]
LayoutTests/platform/qt/editing/deleting/deletionUI-single-instance-expected.txt [deleted file]
LayoutTests/platform/win/TestExpectations
LayoutTests/platform/wincairo/TestExpectations
LayoutTests/platform/wk2/TestExpectations

index a57a2bb5823f0246ed90596cd5e7ff1b841e707f..e87da80f80845d93f120c14e10e0ab19d111e443 100644 (file)
@@ -1,3 +1,28 @@
+2013-02-11  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Move deletionUI tests into platform/mac
+        https://bugs.webkit.org/show_bug.cgi?id=109517
+
+        Reviewed by Benjamin Poulain.
+
+        Moved deletionUI tests into platform/mac since Mac is the only port that ships this feature.
+
+        * editing/deleting/5408255-expected.txt: Removed.
+        * editing/deleting/5408255.html: Removed.
+        * editing/deleting/deletionUI-single-instance.html: Removed.
+        * platform/chromium/editing/deleting/deletionUI-single-instance-expected.png: Removed.
+        * platform/chromium/editing/deleting/deletionUI-single-instance-expected.txt: Removed.
+        * platform/efl/TestExpectations:
+        * platform/mac/editing/deleting/deletionUI-click-on-delete-button-expected.txt: Copied from LayoutTests/editing/deleting/5408255-expected.txt.
+        * platform/mac/editing/deleting/deletionUI-click-on-delete-button.html: Copied from LayoutTests/editing/deleting/5408255.html.
+        * platform/mac/editing/deleting/deletionUI-single-instance.html: Copied from LayoutTests/editing/deleting/deletionUI-single-instance.html.
+        * platform/qt-mac/TestExpectations:
+        * platform/qt/editing/deleting/deletionUI-single-instance-expected.png: Removed.
+        * platform/qt/editing/deleting/deletionUI-single-instance-expected.txt: Removed.
+        * platform/win/TestExpectations:
+        * platform/wincairo/TestExpectations:
+        * platform/wk2/TestExpectations:
+
 2013-02-11  Adam Barth  <abarth@webkit.org>
 
         Load event fires too early with threaded HTML parser (take 2)
diff --git a/LayoutTests/platform/chromium/editing/deleting/deletionUI-single-instance-expected.png b/LayoutTests/platform/chromium/editing/deleting/deletionUI-single-instance-expected.png
deleted file mode 100644 (file)
index f71a203..0000000
Binary files a/LayoutTests/platform/chromium/editing/deleting/deletionUI-single-instance-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium/editing/deleting/deletionUI-single-instance-expected.txt b/LayoutTests/platform/chromium/editing/deleting/deletionUI-single-instance-expected.txt
deleted file mode 100644 (file)
index ed81986..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x54
-        RenderText {#text} at (0,0) size 782x54
-          text run at (0,0) width 457: "This test can only be run with DRT and not manually from the browser. "
-          text run at (457,0) width 325: "This test makes sure that we don't make the mistake"
-          text run at (0,18) width 738: "of adding new m_containerElements to the DeletionUI over and over again. A successful run of the test will not have"
-          text run at (0,36) width 450: "multiple instances of deletion UI render objects at the same coordinates:"
-      RenderBlock {DIV} at (0,70) size 784x114
-layer at (24,94) size 752x82 layerType: background only
-layer at (20,90) size 760x90
-  RenderBlock (positioned) zI: -1000000 {DIV} at (-4,-4) size 760x90 [border: (4px solid #00000099)]
-layer at (24,94) size 752x82 layerType: foreground only
-  RenderTable {TABLE} at (16,16) size 752x82
-    RenderTableSection {TBODY} at (0,0) size 752x78
-      RenderTableRow {TR} at (0,2) size 752x74
-        RenderTableCell {TD} at (2,2) size 748x74 [r=0 c=0 rs=1 cs=1]
-          RenderText {#text} at (1,1) size 746x72
-            text run at (1,1) width 743: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas odio. Morbi sed tortor id nisl bibendum commodo."
-            text run at (744,1) width 3: " "
-            text run at (1,19) width 739: "Donec pede. Praesent accumsan dui vitae mauris. Mauris non dui at neque lacinia pulvinar. Quisque nibh. Nulla vitae"
-            text run at (740,19) width 4: " "
-            text run at (1,37) width 715: "lectus. Pellentesque enim. Mauris hendrerit molestie dui. Etiam pretium ligula a pede. Fusce consectetuer purus sit"
-            text run at (716,37) width 4: " "
-            text run at (1,55) width 353: "amet sem. Morbi tincidunt mollis libero. Maecenas mole"
-    RenderTableSection (anonymous) at (0,78) size 752x4
-      RenderTableRow (anonymous) at (0,2) size 752x0
-        RenderTableCell (anonymous) at (2,2) size 748x0 [r=0 c=0 rs=1 cs=1]
-layer at (7,79) size 30x30
-  RenderImage zI: 1000000 {IMG} at (-17,-15) size 30x30
-caret: position 403 of child 0 {#text} of child 1 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 3 {DIV} of body
index efb59b1b2c060020b5441534d9c86f06fa2407b7..6fb66c449a3fb54c034b42a6097d9840d83045b9 100644 (file)
@@ -1432,10 +1432,6 @@ webkit.org/b/83704 media/event-attributes.html [ Failure ]
 # EFL's LayoutTestController does not implement setAutomaticLinkDetectionEnabled
 webkit.org/b/85463 editing/inserting/typing-space-to-trigger-smart-link.html
 
-# Missing deletebutton controller implementation.
-webkit.org/b/86615 editing/deleting/5408255.html [ Failure ]
-webkit.org/b/86615 editing/deleting/regional-indicators.html [ Failure ]
-
 # Tests failing due to rounding problems in colors inside pixman
 webkit.org/b/49964 fast/canvas/canvas-fillPath-shadow.html [ Failure ]
 
similarity index 95%
rename from LayoutTests/editing/deleting/5408255.html
rename to LayoutTests/platform/mac/editing/deleting/deletionUI-click-on-delete-button.html
index acece9f14e622e9c48ed8775589a07de86637b99..556b420f63e9fad127ef3cfc2cd00bc1e277d842 100644 (file)
@@ -6,7 +6,7 @@
 <ul class="needsDeletionUI"><li>1</li><li id="li">2</li></ul>
 </div>
 
-<script src="../../resources/dump-as-markup.js"></script>
+<script src="../../../../resources/dump-as-markup.js"></script>
 <script>
 
 sel = window.getSelection();
index 4a9488267d9cac1840ecd2bae3ff7219e2e34065..d39d878bdbb14c8259722b428c4f7a752ace1ce1 100644 (file)
@@ -588,7 +588,6 @@ editing/deleting/5206311-2.html
 editing/deleting/5272440.html
 editing/deleting/5300379.html
 editing/deleting/5369009.html
-editing/deleting/5408255.html
 editing/deleting/5433862-2.html
 editing/deleting/5483370.html
 editing/deleting/delete-3608445-fix.html
@@ -4928,7 +4927,6 @@ editing/deleting/delete-ws-fixup-001.html
 editing/deleting/delete-ws-fixup-002.html
 editing/deleting/delete-ws-fixup-003.html
 editing/deleting/delete-ws-fixup-004.html
-editing/deleting/deletionUI-single-instance.html
 editing/deleting/forward-delete.html
 editing/deleting/smart-delete-002.html
 editing/selection/7152-1.html
diff --git a/LayoutTests/platform/qt/editing/deleting/deletionUI-single-instance-expected.png b/LayoutTests/platform/qt/editing/deleting/deletionUI-single-instance-expected.png
deleted file mode 100644 (file)
index 8932160..0000000
Binary files a/LayoutTests/platform/qt/editing/deleting/deletionUI-single-instance-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/qt/editing/deleting/deletionUI-single-instance-expected.txt b/LayoutTests/platform/qt/editing/deleting/deletionUI-single-instance-expected.txt
deleted file mode 100644 (file)
index 652602a..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x57
-        RenderText {#text} at (0,0) size 759x57
-          text run at (0,0) width 430: "This test can only be run with DRT and not manually from the browser. "
-          text run at (430,0) width 329: "This test makes sure that we don't make the mistake of"
-          text run at (0,19) width 730: "adding new m_containerElements to the DeletionUI over and over again. A successful run of the test will not have multiple"
-          text run at (0,38) width 381: "instances of deletion UI render objects at the same coordinates:"
-      RenderBlock {DIV} at (0,73) size 784x118
-layer at (24,97) size 752x86 layerType: background only
-layer at (20,93) size 760x94
-  RenderBlock (positioned) zI: -1000000 {DIV} at (-4,-4) size 760x94 [border: (4px solid #00000099)]
-layer at (24,97) size 752x86 layerType: foreground only
-  RenderTable {TABLE} at (16,16) size 752x86
-    RenderTableSection {TBODY} at (0,0) size 752x82
-      RenderTableRow {TR} at (0,2) size 752x78
-        RenderTableCell {TD} at (2,2) size 748x78 [r=0 c=0 rs=1 cs=1]
-          RenderText {#text} at (1,1) size 746x76
-            text run at (1,1) width 713: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas odio. Morbi sed tortor id nisl bibendum commodo."
-            text run at (714,1) width 4: " "
-            text run at (1,20) width 740: "Donec pede. Praesent accumsan dui vitae mauris. Mauris non dui at neque lacinia pulvinar. Quisque nibh. Nulla vitae lectus."
-            text run at (741,20) width 4: " "
-            text run at (1,39) width 744: "Pellentesque enim. Mauris hendrerit molestie dui. Etiam pretium ligula a pede. Fusce consectetuer purus sit amet sem. Morbi"
-            text run at (745,39) width 2: " "
-            text run at (1,58) width 229: "tincidunt mollis libero. Maecenas mole"
-    RenderTableSection (anonymous) at (0,82) size 752x4
-      RenderTableRow (anonymous) at (0,2) size 752x0
-        RenderTableCell (anonymous) at (2,2) size 748x0 [r=0 c=0 rs=1 cs=1]
-layer at (7,82) size 30x30
-  RenderImage zI: 1000000 {IMG} at (-17,-15) size 30x30
-caret: position 403 of child 0 {#text} of child 1 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 3 {DIV} of body
index 91f23e7cc968a66b035a6aef8382d8022904e707..49e034e4d83f63b7a534f27fb40e9bcbf138863b 100644 (file)
@@ -571,8 +571,6 @@ fast/table/frame-and-rules.html
 fast/table/giantCellspacing.html
 
 # Not investigated yet
-editing/deleting/5408255.html
-editing/deleting/deletionUI-single-instance.html
 editing/pasteboard/input-field-1.html
 editing/selection/contains-boundaries.html
 editing/undo/5378473.html
index 1c0d68525ba7096e3db3df45822ecf445d233439..64189130422b06d44fae7dc586d345ce03800045 100644 (file)
@@ -1092,8 +1092,6 @@ fast/table/frame-and-rules.html
 fast/table/giantCellspacing.html
 
 # Not investigated yet
-editing/deleting/5408255.html
-editing/deleting/deletionUI-single-instance.html
 editing/pasteboard/input-field-1.html
 editing/selection/contains-boundaries.html
 editing/undo/5378473.html
index 472469c1d00027af146f1f2c9d8876d4c6404ff0..3546e352cca0f6845a8d099ea3a05c3edc8ed72d 100644 (file)
@@ -177,8 +177,8 @@ platform/mac/fast/text/justified-text-rect.html
 # WebKitTestRunner needs to support needsDeletionUI mechanism to show deletion UI
 # <https://bugs.webkit.org/show_bug.cgi?id=42535>
 fast/dom/Element/id-in-deletebutton.html
-editing/deleting/5408255.html
-editing/deleting/deletionUI-single-instance.html
+platform/mac/editing/deleting/deletionUI-click-on-delete-button.html
+platform/mac/editing/deleting/deletionUI-single-instance.html
 platform/mac/editing/deleting/deletionUI-borders.html
 platform/mac/editing/deleting/deletionUI-differing-background.html
 platform/mac/editing/deleting/deletionUI-minimum-size.html