diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-04-10 09:28:39 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-04-10 09:28:39 +0000 |
| commit | 32761a6cee1d0dee366b885b7b9c777e67885688 (patch) | |
| tree | d6bec92bebfb216f4126356e55518842c2f476a1 /Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp | |
| parent | a4e969f4965059196ca948db781e52f7cfebf19e (diff) | |
| download | WebKitGtk-tarball-32761a6cee1d0dee366b885b7b9c777e67885688.tar.gz | |
webkitgtk-2.4.11webkitgtk-2.4.11
Diffstat (limited to 'Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp')
| -rw-r--r-- | Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp index 886356b7e..16db87d98 100644 --- a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp +++ b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp @@ -41,7 +41,7 @@ static void testWebKitDOMNodeInsertion(WebViewTest* test, gconstpointer) g_assert(test->runWebProcessTest("WebKitDOMNode", "insertion")); } -static void prepareDOMForTagNamesTests(WebViewTest* test) +static void testWebKitDOMNodeTagNames(WebViewTest* test, gconstpointer) { static const char* testHTML = "<html><head></head><body>" "<video id='video' preload='none'>" @@ -53,44 +53,19 @@ static void prepareDOMForTagNamesTests(WebViewTest* test) " Your browser does not support the video tag." "</video>" "<input type='hidden' id='test' name='finish' value='false'></body></html>"; - test->loadHtml(testHTML, nullptr); + test->loadHtml(testHTML, 0); test->waitUntilLoadFinished(); -} -static void testWebKitDOMNodeTagNamesNodeList(WebViewTest* test, gconstpointer) -{ - prepareDOMForTagNamesTests(test); - g_assert(test->runWebProcessTest("WebKitDOMNode", "tag-names-node-list")); + g_assert(test->runWebProcessTest("WebKitDOMNode", "tag-names")); } -static void testWebKitDOMNodeTagNamesHTMLCollection(WebViewTest* test, gconstpointer) -{ - prepareDOMForTagNamesTests(test); - g_assert(test->runWebProcessTest("WebKitDOMNode", "tag-names-html-collection")); -} - -static void testWebKitDOMObjectCache(WebViewTest* test, gconstpointer) -{ - static const char* testHTML = "<html><body><div id='container'><p>DOM Cache test</p><a id='link href='#'>link</a></div></body></html>"; - - // Run the test 3 times to make sure the DOM objects are correctly released when the - // document is detached from the frame for every new document created. - for (unsigned i = 0; i < 3; ++i) { - test->loadHtml(testHTML, nullptr); - test->waitUntilLoadFinished(); - - g_assert(test->runWebProcessTest("WebKitDOMNode", "dom-cache")); - } -} - - void beforeAll() { + webkit_web_context_set_web_extensions_directory(webkit_web_context_get_default(), WEBKIT_TEST_WEB_EXTENSIONS_DIR); + WebViewTest::add("WebKitDOMNode", "hierarchy-navigation", testWebKitDOMNodeHierarchyNavigation); WebViewTest::add("WebKitDOMNode", "insertion", testWebKitDOMNodeInsertion); - WebViewTest::add("WebKitDOMNode", "tag-names-node-list", testWebKitDOMNodeTagNamesNodeList); - WebViewTest::add("WebKitDOMNode", "tag-names-html-collection", testWebKitDOMNodeTagNamesHTMLCollection); - WebViewTest::add("WebKitDOMNode", "dom-cache", testWebKitDOMObjectCache); + WebViewTest::add("WebKitDOMNode", "tag-names", testWebKitDOMNodeTagNames); } void afterAll() |