Move ios-sim-deprecated/fast/dom/ tests into fast/dom

* TestExpectations:
* fast/dom/Range/expand-word-with-apostrophe-expected.txt: Renamed from LayoutTests/platform/ios-sim-deprecated/fast/dom/Range/expand-word-with-apostrophe-expected.txt.
* fast/dom/Range/expand-word-with-apostrophe.html: Renamed from LayoutTests/platform/ios-sim-deprecated/fast/dom/Range/expand-word-with-apostrophe.html.
* fast/dom/Window/no-window-resize-on-document-size-change-expected.txt: Added.
* fast/dom/Window/no-window-resize-on-document-size-change.html: Renamed from LayoutTests/platform/ios-sim-deprecated/fast/dom/Window/no-window-resize-on-document-size-change.html.
* fast/dom/adopt-attribute-crash-expected.txt:
* fast/dom/navigator-iOS-userAgent-expected.txt: Added.
* fast/dom/navigator-iOS-userAgent.html: Renamed from LayoutTests/platform/ios-sim-deprecated/fast/dom/navigator-iOS-userAgent.html.
* fast/dom/timer-fire-after-page-pause-expected.txt: Renamed from LayoutTests/platform/ios-sim-deprecated/fast/dom/timer-fire-after-page-pause-expected.txt.
* fast/dom/timer-fire-after-page-pause.html: Renamed from LayoutTests/platform/ios-sim-deprecated/fast/dom/timer-fire-after-page-pause.html.
* platform/ios-sim-deprecated/fast/dom/Window/no-window-resize-on-document-size-change-expected.txt: Removed.
* platform/ios-sim-deprecated/fast/dom/navigator-iOS-userAgent-expected.txt: Removed.
* platform/ios-simulator-wk1/TestExpectations:
* platform/ios-simulator/TestExpectations:
* platform/ios-simulator/fast/dom/navigator-iOS-userAgent-expected.txt: Added.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index af90ccd9fbead04c9c3466b2dc6690e490e72fe1..aa338b0703c7375654386216b74ad6b16742d6d0 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,23 @@
+2015-08-06  Simon Fraser  <simon.fraser@apple.com>
+
+        Move ios-sim-deprecated/fast/dom/ tests into fast/dom
+
+        * TestExpectations:
+        * fast/dom/Range/expand-word-with-apostrophe-expected.txt: Renamed from LayoutTests/platform/ios-sim-deprecated/fast/dom/Range/expand-word-with-apostrophe-expected.txt.
+        * fast/dom/Range/expand-word-with-apostrophe.html: Renamed from LayoutTests/platform/ios-sim-deprecated/fast/dom/Range/expand-word-with-apostrophe.html.
+        * fast/dom/Window/no-window-resize-on-document-size-change-expected.txt: Added.
+        * fast/dom/Window/no-window-resize-on-document-size-change.html: Renamed from LayoutTests/platform/ios-sim-deprecated/fast/dom/Window/no-window-resize-on-document-size-change.html.
+        * fast/dom/adopt-attribute-crash-expected.txt:
+        * fast/dom/navigator-iOS-userAgent-expected.txt: Added.
+        * fast/dom/navigator-iOS-userAgent.html: Renamed from LayoutTests/platform/ios-sim-deprecated/fast/dom/navigator-iOS-userAgent.html.
+        * fast/dom/timer-fire-after-page-pause-expected.txt: Renamed from LayoutTests/platform/ios-sim-deprecated/fast/dom/timer-fire-after-page-pause-expected.txt.
+        * fast/dom/timer-fire-after-page-pause.html: Renamed from LayoutTests/platform/ios-sim-deprecated/fast/dom/timer-fire-after-page-pause.html.
+        * platform/ios-sim-deprecated/fast/dom/Window/no-window-resize-on-document-size-change-expected.txt: Removed.
+        * platform/ios-sim-deprecated/fast/dom/navigator-iOS-userAgent-expected.txt: Removed.
+        * platform/ios-simulator-wk1/TestExpectations:
+        * platform/ios-simulator/TestExpectations:
+        * platform/ios-simulator/fast/dom/navigator-iOS-userAgent-expected.txt: Added.
+
 2015-08-06  Simon Fraser  <simon.fraser@apple.com>
 
         Move two ios-sim-deprecated/animations/ tests into animations.

diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
index abb018f5de9c7ccee0ca3e67d9e01b1d9e53e8f9..0bbb66c37fb974f251c1377ddb9c3005df660796 100644 (file)
--- a/LayoutTests/TestExpectations
+++ b/LayoutTests/TestExpectations
@@ -543,3 +543,6 @@ webkit.org/b/146434 fast/dom/HTMLImageElement/sizes [ Skip ]
 
 # Media Sessions is not yet enabled by default: ENABLE(MEDIA_SESSION)
 media/session [ Skip ]
+
+# Only iOS WK1 has testRunner.setPagePaused.
+fast/dom/timer-fire-after-page-pause.html [ Skip ]
\ No newline at end of file

diff --git a/LayoutTests/platform/ios-sim-deprecated/fast/dom/Range/expand-word-with-apostrophe-expected.txt b/LayoutTests/fast/dom/Range/expand-word-with-apostrophe-expected.txt
similarity index 100%
rename from LayoutTests/platform/ios-sim-deprecated/fast/dom/Range/expand-word-with-apostrophe-expected.txt
rename to LayoutTests/fast/dom/Range/expand-word-with-apostrophe-expected.txt

diff --git a/LayoutTests/platform/ios-sim-deprecated/fast/dom/Range/expand-word-with-apostrophe.html b/LayoutTests/fast/dom/Range/expand-word-with-apostrophe.html
similarity index 100%
rename from LayoutTests/platform/ios-sim-deprecated/fast/dom/Range/expand-word-with-apostrophe.html
rename to LayoutTests/fast/dom/Range/expand-word-with-apostrophe.html

diff --git a/LayoutTests/fast/dom/Window/no-window-resize-on-document-size-change-expected.txt b/LayoutTests/fast/dom/Window/no-window-resize-on-document-size-change-expected.txt
new file mode 100644 (file)
index 0000000..6d1c463
--- /dev/null
+++ b/LayoutTests/fast/dom/Window/no-window-resize-on-document-size-change-expected.txt
@@ -0,0 +1,10 @@
+Test that changing the viewport causes a window.resize event.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS windowResizeCount is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

diff --git a/LayoutTests/platform/ios-sim-deprecated/fast/dom/Window/no-window-resize-on-document-size-change.html b/LayoutTests/fast/dom/Window/no-window-resize-on-document-size-change.html
similarity index 88%
rename from LayoutTests/platform/ios-sim-deprecated/fast/dom/Window/no-window-resize-on-document-size-change.html
rename to LayoutTests/fast/dom/Window/no-window-resize-on-document-size-change.html
index 0f511d7681ca9e0e52e04bdff837229340234471..c8a1ebbfa0e9d37422eb029fdb7cfa1a223bc45a 100644 (file)
--- a/LayoutTests/platform/ios-sim-deprecated/fast/dom/Window/no-window-resize-on-document-size-change.html
+++ b/LayoutTests/fast/dom/Window/no-window-resize-on-document-size-change.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
   <head>
-    <script src="../fast/js/resources/js-test-pre.js"></script>
+    <script src="../../../resources/js-test-pre.js"></script>
    </head>
 <body style="height:5000px;">
 <script>
@@ -35,7 +35,7 @@ window.onload = function() {
     }, 0);
 }
 </script>
-<script src="../fast/js/resources/js-test-post.js"></script>
+<script src="../../../resources/js-test-post.js"></script>
 </body>
 </html>
 

diff --git a/LayoutTests/fast/dom/adopt-attribute-crash-expected.txt b/LayoutTests/fast/dom/adopt-attribute-crash-expected.txt
index fcd3bae41660f917314d6c578c7ca68078426e10..b6df96f20d8799dab70d32c61fbf0a761e3843fb 100644 (file)
--- a/LayoutTests/fast/dom/adopt-attribute-crash-expected.txt
+++ b/LayoutTests/fast/dom/adopt-attribute-crash-expected.txt
@@ -1,7 +1,7 @@
 ALERT: Tests adopting two Attr nodes of the same qualified name. WebKit shouldn't crash or assert.
 This page contains the following errors:
 
-error on line 3 at column 35: Namespaced Attribute href in 'http://www.w3.org/1999/xlink' redefined
+error on line 3 at column 66: Namespaced Attribute href in 'http://www.w3.org/1999/xlink' redefined
 error on line 18 at column 10: Extra content at the end of the document
 Below is a rendering of the page up to the first error.
 

diff --git a/LayoutTests/fast/dom/navigator-iOS-userAgent-expected.txt b/LayoutTests/fast/dom/navigator-iOS-userAgent-expected.txt
new file mode 100644 (file)
index 0000000..810ea35
--- /dev/null
+++ b/LayoutTests/fast/dom/navigator-iOS-userAgent-expected.txt
@@ -0,0 +1,11 @@
+Verify the user-agent string does not have the 'Simulator' device name.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+FAIL User agent platform should be "iPhone" or "iPad".
+PASS User agent does not contain "Simulator".
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

diff --git a/LayoutTests/platform/ios-sim-deprecated/fast/dom/navigator-iOS-userAgent.html b/LayoutTests/fast/dom/navigator-iOS-userAgent.html
similarity index 76%
rename from LayoutTests/platform/ios-sim-deprecated/fast/dom/navigator-iOS-userAgent.html
rename to LayoutTests/fast/dom/navigator-iOS-userAgent.html
index a2f77f3eeffbe2edcad7ac89f76a35ce2b75cdc5..bc85fe0586685f89aae9736a8cebc0ecd07a0eef 100644 (file)
--- a/LayoutTests/platform/ios-sim-deprecated/fast/dom/navigator-iOS-userAgent.html
+++ b/LayoutTests/fast/dom/navigator-iOS-userAgent.html
@@ -1,7 +1,6 @@
 <html>
 <head>
-<link rel="stylesheet" href="../../../../fast/js/resources/js-test-style.css">
-<script src="../../../../fast/js/resources/js-test-pre.js"></script>
+<script src="../../resources/js-test-pre.js"></script>
 </head>
 <body>
 <p id="description"></p>
@@ -23,6 +22,6 @@ test('User agent does not contain "Simulator".', userAgent.indexOf("Simulator")
 
 successfullyParsed = true;
 </script>
-<script src="../../../../fast/js/resources/js-test-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>

diff --git a/LayoutTests/platform/ios-sim-deprecated/fast/dom/timer-fire-after-page-pause-expected.txt b/LayoutTests/fast/dom/timer-fire-after-page-pause-expected.txt
similarity index 100%
rename from LayoutTests/platform/ios-sim-deprecated/fast/dom/timer-fire-after-page-pause-expected.txt
rename to LayoutTests/fast/dom/timer-fire-after-page-pause-expected.txt

diff --git a/LayoutTests/platform/ios-sim-deprecated/fast/dom/timer-fire-after-page-pause.html b/LayoutTests/fast/dom/timer-fire-after-page-pause.html
similarity index 100%
rename from LayoutTests/platform/ios-sim-deprecated/fast/dom/timer-fire-after-page-pause.html
rename to LayoutTests/fast/dom/timer-fire-after-page-pause.html

diff --git a/LayoutTests/platform/ios-sim-deprecated/fast/dom/Window/no-window-resize-on-document-size-change-expected.txt b/LayoutTests/platform/ios-sim-deprecated/fast/dom/Window/no-window-resize-on-document-size-change-expected.txt
deleted file mode 100644 (file)
index 9d2c37f..0000000
--- a/LayoutTests/platform/ios-sim-deprecated/fast/dom/Window/no-window-resize-on-document-size-change-expected.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CONSOLE MESSAGE: line 8: ReferenceError: Can't find variable: description
-layer at (0,0) size 800x5016
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x5016
-  RenderBlock {HTML} at (0,0) size 800x5016
-    RenderBody {BODY} at (8,8) size 784x5000

diff --git a/LayoutTests/platform/ios-sim-deprecated/fast/dom/navigator-iOS-userAgent-expected.txt b/LayoutTests/platform/ios-sim-deprecated/fast/dom/navigator-iOS-userAgent-expected.txt
deleted file mode 100644 (file)
index ab655f8..0000000
--- a/LayoutTests/platform/ios-sim-deprecated/fast/dom/navigator-iOS-userAgent-expected.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-CONSOLE MESSAGE: line 10: TypeError: HTMLParagraphElement is not a function (evaluating 'description("Verify the user-agent string does not have the 'Simulator' device name.")')
-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 784x0
-      RenderBlock {DIV} at (0,0) size 784x0

diff --git a/LayoutTests/platform/ios-simulator-wk1/TestExpectations b/LayoutTests/platform/ios-simulator-wk1/TestExpectations
index aa67970647b081c1a39923c454f05c994be6a77f..56ff2c1de22076fb5a92715834a667335d9afbf3 100644 (file)
--- a/LayoutTests/platform/ios-simulator-wk1/TestExpectations
+++ b/LayoutTests/platform/ios-simulator-wk1/TestExpectations
@@ -1727,3 +1727,5 @@ fast/history/history-length.html [ Crash ]
 storage/websql/alter-to-info-table.html [ Crash ]
 
 webkit.org/b/145432 media/video-transformed-by-javascript.html [ Failure ]
+
+fast/dom/timer-fire-after-page-pause.html [ Pass ]

diff --git a/LayoutTests/platform/ios-simulator/TestExpectations b/LayoutTests/platform/ios-simulator/TestExpectations
index 9a5b5ccd4f73d6877942b22bbe0fedd087ea5ee9..f011a32d34db8ca8ea383eec1ec9e2e87f7cd9f9 100644 (file)
--- a/LayoutTests/platform/ios-simulator/TestExpectations
+++ b/LayoutTests/platform/ios-simulator/TestExpectations
@@ -2694,6 +2694,8 @@ fast/fixed-layout/fixed-layout.html [ Failure Crash Pass ]
 # Not implemented
 webkit.org/b/145617 compositing/layer-creation/zoomed-clip-intersection.html [ Skip ]
 
+fast/dom/timer-fire-after-page-pause.html [ Skip ]
+
 # This test depends on location, and it is impossible to mock the particular mechanism
 # this test uses to determine location.
 fast/text/softbank-emoji.html [ Failure Pass ]

diff --git a/LayoutTests/platform/ios-simulator/fast/dom/navigator-iOS-userAgent-expected.txt b/LayoutTests/platform/ios-simulator/fast/dom/navigator-iOS-userAgent-expected.txt
new file mode 100644 (file)
index 0000000..ec70d5d
--- /dev/null
+++ b/LayoutTests/platform/ios-simulator/fast/dom/navigator-iOS-userAgent-expected.txt
@@ -0,0 +1,11 @@
+Verify the user-agent string does not have the 'Simulator' device name.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS User agent platform should be "iPhone" or "iPad".
+PASS User agent does not contain "Simulator".
+PASS successfullyParsed is true
+
+TEST COMPLETE
+