Unreviewed. Fix WPE /wpe/WebKitWebView/javascript-dialogs and /wpe/WebKitWebView...
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Jun 2017 08:21:52 +0000 (08:21 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 23 Jun 2017 08:21:52 +0000 (08:21 +0000)
Skip onbeforeunload dialog tests for now in WPE since we don't have a implemention for
simulateUserInteraction(). And do not expect changes in "geometry" property of WebKitWindowProperties that
doesn't exist yet in WPE.

* TestWebKitAPI/Tests/WebKitGLib/TestUIClient.cpp:
(testWebViewJavaScriptDialogs):
(testWebViewWindowProperties):

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

Tools/ChangeLog
Tools/TestWebKitAPI/Tests/WebKitGLib/TestUIClient.cpp

index bd18f11..61737cb 100644 (file)
@@ -1,3 +1,15 @@
+2017-06-23  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Fix WPE /wpe/WebKitWebView/javascript-dialogs and /wpe/WebKitWebView/window-properties
+
+        Skip onbeforeunload dialog tests for now in WPE since we don't have a implemention for
+        simulateUserInteraction(). And do not expect changes in "geometry" property of WebKitWindowProperties that
+        doesn't exist yet in WPE.
+
+        * TestWebKitAPI/Tests/WebKitGLib/TestUIClient.cpp:
+        (testWebViewJavaScriptDialogs):
+        (testWebViewWindowProperties):
+
 2017-06-22  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] Upgrade pixman and cairo in jhbuild
index 6413a9c..1f3b8bb 100644 (file)
@@ -580,6 +580,8 @@ static void testWebViewJavaScriptDialogs(UIClientTest* test, gconstpointer)
     webkit_web_view_stop_loading(test->m_webView);
     test->waitUntilLoadFinished();
 
+    // FIXME: implement simulateUserInteraction in WPE.
+#if PLATFORM(GTK)
     test->m_scriptDialogType = WEBKIT_SCRIPT_DIALOG_BEFORE_UNLOAD_CONFIRM;
     GUniquePtr<char> beforeUnloadDialogHTML(g_strdup_printf(htmlOnBeforeUnloadFormat, kBeforeUnloadConfirmDialogMessage));
     test->loadHtml(beforeUnloadDialogHTML.get(), nullptr);
@@ -621,6 +623,7 @@ static void testWebViewJavaScriptDialogs(UIClientTest* test, gconstpointer)
     test->m_scriptDialogConfirmed = false;
     test->tryCloseAndWaitUntilClosed();
     g_assert(!test->m_scriptDialogConfirmed);
+#endif // PLATFORM(GTK)
 }
 
 static void testWebViewWindowProperties(UIClientTest* test, gconstpointer)
@@ -634,7 +637,10 @@ static void testWebViewWindowProperties(UIClientTest* test, gconstpointer)
     test->waitUntilMainLoopFinishes();
 
     static const char* propertiesChanged[] = {
-        "geometry", "locationbar-visible", "menubar-visible", "statusbar-visible", "toolbar-visible", "scrollbars-visible"
+#if PLATFORM(GTK)
+        "geometry",
+#endif
+        "locationbar-visible", "menubar-visible", "statusbar-visible", "toolbar-visible", "scrollbars-visible"
     };
     for (size_t i = 0; i < G_N_ELEMENTS(propertiesChanged); ++i)
         g_assert(test->m_windowPropertiesChanged.contains(propertiesChanged[i]));