diff options
Diffstat (limited to 'Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp')
-rw-r--r-- | Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp index c13185427..99efa7cfb 100644 --- a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp +++ b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp @@ -20,12 +20,14 @@ #include "config.h" #include "WebViewTest.h" #include <glib/gstdio.h> -#include <wtf/glib/GRefPtr.h> +#include <wtf/gobject/GRefPtr.h> #ifdef HAVE_GTK_UNIX_PRINTING #include <gtk/gtkunixprint.h> #endif +static char* kTempDirectory; + static void testPrintOperationPrintSettings(WebViewTest* test, gconstpointer) { GRefPtr<WebKitPrintOperation> printOperation = adoptGRef(webkit_print_operation_new(test->m_webView)); @@ -132,7 +134,7 @@ static void testPrintOperationPrint(PrintTest* test, gconstpointer) return; } - GUniquePtr<char> outputFilename(g_build_filename(Test::dataDirectory(), "webkit-print.pdf", nullptr)); + GUniquePtr<char> outputFilename(g_build_filename(kTempDirectory, "webkit-print.pdf", NULL)); GRefPtr<GFile> outputFile = adoptGRef(g_file_new_for_path(outputFilename.get())); GUniquePtr<char> outputURI(g_file_get_uri(outputFile.get())); @@ -192,7 +194,7 @@ class CloseAfterPrintTest: public WebViewTest { public: MAKE_GLIB_TEST_FIXTURE(CloseAfterPrintTest); - static GtkWidget* webViewCreate(WebKitWebView* webView, WebKitNavigationAction*, CloseAfterPrintTest* test) + static GtkWidget* webViewCreate(WebKitWebView* webView, CloseAfterPrintTest* test) { return test->createWebView(); } @@ -226,7 +228,7 @@ public: GtkWidget* createWebView() { - GtkWidget* newWebView = webkit_web_view_new_with_context(m_webContext.get()); + GtkWidget* newWebView = webkit_web_view_new(); g_object_ref_sink(newWebView); assertObjectIsDeletedWhenTestFinishes(G_OBJECT(newWebView)); @@ -245,7 +247,7 @@ public: return; } - GUniquePtr<char> outputFilename(g_build_filename(Test::dataDirectory(), "webkit-close-after-print.pdf", nullptr)); + GUniquePtr<char> outputFilename(g_build_filename(kTempDirectory, "webkit-close-after-print.pdf", NULL)); m_outputFile = adoptGRef(g_file_new_for_path(outputFilename.get())); GUniquePtr<char> outputURI(g_file_get_uri(m_outputFile.get())); @@ -290,6 +292,9 @@ static void testPrintOperationCloseAfterPrint(CloseAfterPrintTest* test, gconstp void beforeAll() { + kTempDirectory = g_dir_make_tmp("WebKit2Tests-XXXXXX", 0); + g_assert(kTempDirectory); + WebViewTest::add("WebKitPrintOperation", "printing-settings", testPrintOperationPrintSettings); WebViewTest::add("WebKitWebView", "print", testWebViewPrint); #ifdef HAVE_GTK_UNIX_PRINTING @@ -301,4 +306,5 @@ void beforeAll() void afterAll() { + g_rmdir(kTempDirectory); } |