Enable swipe tests on iOS
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 31 Jan 2019 07:31:21 +0000 (07:31 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 31 Jan 2019 07:31:21 +0000 (07:31 +0000)
https://bugs.webkit.org/show_bug.cgi?id=194076

Reviewed by Geoffrey Garen.

Tools:

Removed the superflous call to prepareForAsyncTask and asyncTaskComplete as
it causes a debug assertion failure in runUIScript.

* WebKitTestRunner/ios/UIScriptControllerIOS.mm:
(WTR::UIScriptController::beginBackSwipe):
(WTR::UIScriptController::completeBackSwipe):

LayoutTests:

Enabled tests in LayoutTests/swipe and added iOS specific results for the failing tests.

* platform/ios/TestExpectations:
* platform/ios/swipe/basic-cached-back-swipe-expected.txt: Added.
* platform/ios/swipe/main-frame-pinning-requirement-expected.txt: Added.
* platform/ios/swipe/pushState-cached-back-swipe-expected.txt: Added.

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

LayoutTests/ChangeLog
LayoutTests/platform/ios/TestExpectations
LayoutTests/platform/ios/swipe/basic-cached-back-swipe-expected.txt [new file with mode: 0644]
LayoutTests/platform/ios/swipe/main-frame-pinning-requirement-expected.txt [new file with mode: 0644]
LayoutTests/platform/ios/swipe/pushState-cached-back-swipe-expected.txt [new file with mode: 0644]
Tools/ChangeLog
Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm

index 6ff2311..7da39ae 100644 (file)
@@ -1,3 +1,17 @@
+2019-01-30  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Enable swipe tests on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=194076
+
+        Reviewed by Geoffrey Garen.
+
+        Enabled tests in LayoutTests/swipe and added iOS specific results for the failing tests.
+
+        * platform/ios/TestExpectations:
+        * platform/ios/swipe/basic-cached-back-swipe-expected.txt: Added.
+        * platform/ios/swipe/main-frame-pinning-requirement-expected.txt: Added.
+        * platform/ios/swipe/pushState-cached-back-swipe-expected.txt: Added.
+
 2019-01-30  Chris Dumez  <cdumez@apple.com>
 
         Regression(PSON) History navigations to twitter.com lead to a 403 HTTP error
index 842db9b..25f0270 100644 (file)
@@ -11,6 +11,7 @@ displaylists [ Pass ]
 http/tests/quicklook [ Pass ]
 media/ios [ Pass ]
 quicklook [ Pass ]
+swipe [ Pass ]
 
 fast/text-autosizing/ios [ Pass ]
 fast/zooming/ios [ Pass ]
diff --git a/LayoutTests/platform/ios/swipe/basic-cached-back-swipe-expected.txt b/LayoutTests/platform/ios/swipe/basic-cached-back-swipe-expected.txt
new file mode 100644 (file)
index 0000000..56f14de
--- /dev/null
@@ -0,0 +1,6 @@
+startSwipeGesture
+didBeginSwipe
+completeSwipeGesture
+didEndSwipe
+didRemoveSwipeSnapshot
+
diff --git a/LayoutTests/platform/ios/swipe/main-frame-pinning-requirement-expected.txt b/LayoutTests/platform/ios/swipe/main-frame-pinning-requirement-expected.txt
new file mode 100644 (file)
index 0000000..39b0d94
--- /dev/null
@@ -0,0 +1,7 @@
+startSwipeGesture
+Failure. Should never begin a swipe, because we were in the middle of a scrolling gesture that started when the main frame was not pinned to the left.
+didEndSwipe
+completeSwipeGesture
+startSwipeGesture
+didRemoveSwipeSnapshot
+
diff --git a/LayoutTests/platform/ios/swipe/pushState-cached-back-swipe-expected.txt b/LayoutTests/platform/ios/swipe/pushState-cached-back-swipe-expected.txt
new file mode 100644 (file)
index 0000000..56f14de
--- /dev/null
@@ -0,0 +1,6 @@
+startSwipeGesture
+didBeginSwipe
+completeSwipeGesture
+didEndSwipe
+didRemoveSwipeSnapshot
+
index 61f32d8..30914ff 100644 (file)
@@ -1,3 +1,17 @@
+2019-01-30  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Enable swipe tests on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=194076
+
+        Reviewed by Geoffrey Garen.
+
+        Removed the superflous call to prepareForAsyncTask and asyncTaskComplete as
+        it causes a debug assertion failure in runUIScript.
+
+        * WebKitTestRunner/ios/UIScriptControllerIOS.mm:
+        (WTR::UIScriptController::beginBackSwipe):
+        (WTR::UIScriptController::completeBackSwipe):
+
 2019-01-30  Keith Rollin  <krollin@apple.com>
 
         Use correct printf format specifier
index 027bc37..4952765 100644 (file)
@@ -822,18 +822,12 @@ void UIScriptController::beginBackSwipe(JSValueRef callback)
 {
     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
     [webView _beginBackSwipeForTesting];
-
-    unsigned callbackID = m_context->prepareForAsyncTask(callback, CallbackTypeNonPersistent);
-    m_context->asyncTaskComplete(callbackID);
 }
 
 void UIScriptController::completeBackSwipe(JSValueRef callback)
 {
     TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
     [webView _completeBackSwipeForTesting];
-
-    unsigned callbackID = m_context->prepareForAsyncTask(callback, CallbackTypeNonPersistent);
-    m_context->asyncTaskComplete(callbackID);
 }
 
 static BOOL forEachViewInHierarchy(UIView *view, void(^mapFunction)(UIView *subview, BOOL *stop))