Title: [152648] releases/WebKitGTK/webkit-2.0
Revision
152648
Author
[email protected]
Date
2013-07-15 10:53:08 -0700 (Mon, 15 Jul 2013)

Log Message

Merge r152412 - [GTK] WebKit2 test TestWebKitFaviconDatabase times out with recent glib
https://bugs.webkit.org/show_bug.cgi?id=111434

Patch by Xabier Rodriguez Calvar <[email protected]> on 2013-07-05
Reviewed by Carlos Garcia Campos.

Source/WebKit2:

* UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp:
(testNotInitialized):
(testSetDirectory):
(testClearDatabase):
(testGetFavicon):
(testGetFaviconURI): Removed gconstpointer parameter.
(testWebViewFavicon): Fixed to make it work together with the
other tests and removed gconstpointer parameter.
(testFaviconDatabase): Created to call all tests in the proper
order.
(beforeAll): Changed to call only testFaviconDatabase instead of
the separate tests.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog (152647 => 152648)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog	2013-07-15 17:50:50 UTC (rev 152647)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog	2013-07-15 17:53:08 UTC (rev 152648)
@@ -1,3 +1,23 @@
+2013-07-05  Xabier Rodriguez Calvar  <[email protected]>
+
+        [GTK] WebKit2 test TestWebKitFaviconDatabase times out with recent glib
+        https://bugs.webkit.org/show_bug.cgi?id=111434
+
+        Reviewed by Carlos Garcia Campos.
+
+        * UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp:
+        (testNotInitialized):
+        (testSetDirectory):
+        (testClearDatabase):
+        (testGetFavicon):
+        (testGetFaviconURI): Removed gconstpointer parameter.
+        (testWebViewFavicon): Fixed to make it work together with the
+        other tests and removed gconstpointer parameter.
+        (testFaviconDatabase): Created to call all tests in the proper
+        order.
+        (beforeAll): Changed to call only testFaviconDatabase instead of
+        the separate tests.
+
 2013-07-15  Simon Pena  <[email protected]>
 
         [GTK] [WK2] Check if the keyEventQueue is empty in WebPageProxy::getEditorCommandsForKeyEvent

Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp (152647 => 152648)


--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp	2013-07-15 17:50:50 UTC (rev 152647)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp	2013-07-15 17:53:08 UTC (rev 152648)
@@ -133,7 +133,7 @@
     soup_message_body_complete(message->response_body);
 }
 
-static void testNotInitialized(FaviconDatabaseTest* test, gconstpointer)
+static void testNotInitialized(FaviconDatabaseTest* test)
 {
     // Try to retrieve a valid favicon from a not initialized database.
     test->getFaviconForPageURIAndWaitUntilReady(kServer->getURIForPath("/foo").data());
@@ -142,13 +142,13 @@
     g_assert_cmpint(test->m_error->code, ==, WEBKIT_FAVICON_DATABASE_ERROR_NOT_INITIALIZED);
 }
 
-static void testSetDirectory(FaviconDatabaseTest* test, gconstpointer)
+static void testSetDirectory(FaviconDatabaseTest* test)
 {
     webkit_web_context_set_favicon_database_directory(test->m_webContext, kTempDirectory);
     g_assert_cmpstr(kTempDirectory, ==, webkit_web_context_get_favicon_database_directory(test->m_webContext));
 }
 
-static void testClearDatabase(FaviconDatabaseTest* test, gconstpointer)
+static void testClearDatabase(FaviconDatabaseTest* test)
 {
     WebKitFaviconDatabase* database = webkit_web_context_get_favicon_database(test->m_webContext);
     webkit_favicon_database_clear(database);
@@ -157,7 +157,7 @@
     g_assert(!iconURI);
 }
 
-static void testGetFavicon(FaviconDatabaseTest* test, gconstpointer)
+static void testGetFavicon(FaviconDatabaseTest* test)
 {
     // We need to load the page first to ensure the icon data will be
     // in the database in case there's an associated favicon.
@@ -198,7 +198,7 @@
     g_assert(test->m_error);
 }
 
-static void testGetFaviconURI(FaviconDatabaseTest* test, gconstpointer)
+static void testGetFaviconURI(FaviconDatabaseTest* test)
 {
     WebKitFaviconDatabase* database = webkit_web_context_get_favicon_database(test->m_webContext);
 
@@ -207,8 +207,10 @@
     ASSERT_CMP_CSTRING(iconURI.get(), ==, kServer->getURIForPath("/icon/favicon.ico"));
 }
 
-static void testWebViewFavicon(FaviconDatabaseTest* test, gconstpointer)
+static void testWebViewFavicon(FaviconDatabaseTest* test)
 {
+    test->m_faviconURI = CString();
+
     cairo_surface_t* iconFromWebView = webkit_web_view_get_favicon(test->m_webView);
     g_assert(!iconFromWebView);
 
@@ -225,6 +227,18 @@
     g_assert_cmpuint(cairo_image_surface_get_height(iconFromWebView), ==, 16);
 }
 
+static void testFaviconDatabase(FaviconDatabaseTest* test, gconstpointer)
+{
+    // These tests depend on this order to run properly so we declare them in a single one.
+    // See https://bugs.webkit.org/show_bug.cgi?id=111434.
+    testNotInitialized(test);
+    testSetDirectory(test);
+    testGetFavicon(test);
+    testGetFaviconURI(test);
+    testWebViewFavicon(test);
+    testClearDatabase(test);
+}
+
 void beforeAll()
 {
     // Start a soup server for testing.
@@ -235,12 +249,7 @@
     g_assert(kTempDirectory);
 
     // Add tests to the suite.
-    FaviconDatabaseTest::add("WebKitFaviconDatabase", "not-initialized", testNotInitialized);
-    FaviconDatabaseTest::add("WebKitFaviconDatabase", "set-directory", testSetDirectory);
-    FaviconDatabaseTest::add("WebKitFaviconDatabase", "get-favicon", testGetFavicon);
-    FaviconDatabaseTest::add("WebKitFaviconDatabase", "get-favicon-uri", testGetFaviconURI);
-    FaviconDatabaseTest::add("WebKitWebView", "favicon", testWebViewFavicon);
-    FaviconDatabaseTest::add("WebKitFaviconDatabase", "clear-database", testClearDatabase);
+    FaviconDatabaseTest::add("WebKitFaviconDatabase", "favicon-database-test", testFaviconDatabase);
 }
 
 static void webkitFaviconDatabaseFinalizedCallback(gpointer, GObject*)

Modified: releases/WebKitGTK/webkit-2.0/Tools/ChangeLog (152647 => 152648)


--- releases/WebKitGTK/webkit-2.0/Tools/ChangeLog	2013-07-15 17:50:50 UTC (rev 152647)
+++ releases/WebKitGTK/webkit-2.0/Tools/ChangeLog	2013-07-15 17:53:08 UTC (rev 152648)
@@ -1,3 +1,13 @@
+2013-07-05  Xabier Rodriguez Calvar  <[email protected]>
+
+        [GTK] WebKit2 test TestWebKitFaviconDatabase times out with recent glib
+        https://bugs.webkit.org/show_bug.cgi?id=111434
+
+        Reviewed by Carlos Garcia Campos.
+
+        * Scripts/run-gtk-tests:
+        (TestRunner): Unskipped TestWebKitFaviconDatabase tests.
+
 2013-07-02  Brian Holt  <[email protected]>
 
         [ATK] Leak: leaks in AccessibilityUIElement
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to