<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[190346] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/190346">190346</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-30 07:07:42 -0700 (Wed, 30 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Deprecation warnings in DOMNodeTest
https://bugs.webkit.org/show_bug.cgi?id=149663
After the webkit_dom_document_get_elements_by_tag_name deprecation we
need to update the tests to use webkit_dom_document_query_selector_all
to avoid compilation warnings.
Also add a new test for webkit_dom_document_get_elements_by_tag_name_as_html_collection
(the suggested replacement for the deprecated function).
Patch by Tomas Popela <tpopela@redhat.com> on 2015-09-30
Reviewed by Carlos Garcia Campos.
* TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp:
(WebKitDOMNodeTest::testTagNamesNodeList):
(WebKitDOMNodeTest::testTagNamesHTMLCollection):
(registerTests):
(WebKitDOMNodeTest::testTagNames): Deleted.
* TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp:
(prepareDOMForTagNamesTests):
(testWebKitDOMNodeTagNamesNodeList):
(testWebKitDOMNodeTagNamesHTMLCollection):
(beforeAll):
(testWebKitDOMNodeTagNames): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkDOMNodeTestcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestDOMNodecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (190345 => 190346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-30 12:55:17 UTC (rev 190345)
+++ trunk/Tools/ChangeLog 2015-09-30 14:07:42 UTC (rev 190346)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-09-30 Tomas Popela <tpopela@redhat.com>
+
+ [GTK] Deprecation warnings in DOMNodeTest
+ https://bugs.webkit.org/show_bug.cgi?id=149663
+
+ After the webkit_dom_document_get_elements_by_tag_name deprecation we
+ need to update the tests to use webkit_dom_document_query_selector_all
+ to avoid compilation warnings.
+
+ Also add a new test for webkit_dom_document_get_elements_by_tag_name_as_html_collection
+ (the suggested replacement for the deprecated function).
+
+ Reviewed by Carlos Garcia Campos.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp:
+ (WebKitDOMNodeTest::testTagNamesNodeList):
+ (WebKitDOMNodeTest::testTagNamesHTMLCollection):
+ (registerTests):
+ (WebKitDOMNodeTest::testTagNames): Deleted.
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp:
+ (prepareDOMForTagNamesTests):
+ (testWebKitDOMNodeTagNamesNodeList):
+ (testWebKitDOMNodeTagNamesHTMLCollection):
+ (beforeAll):
+ (testWebKitDOMNodeTagNames): Deleted.
+
</ins><span class="cx"> 2015-09-29 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKitTestRunner fails to apply "useFlexibleViewport" when it's specified in a file comment
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkDOMNodeTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp (190345 => 190346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp 2015-09-30 12:55:17 UTC (rev 190345)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp 2015-09-30 14:07:42 UTC (rev 190346)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool testTagNames(WebKitWebPage* page)
</del><ins>+ bool testTagNamesNodeList(WebKitWebPage* page)
</ins><span class="cx"> {
</span><span class="cx"> static const char* expectedTagNames[] = { "HTML", "HEAD", "BODY", "VIDEO", "SOURCE", "VIDEO", "SOURCE", "INPUT" };
</span><span class="cx">
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> g_assert(WEBKIT_DOM_IS_DOCUMENT(document));
</span><span class="cx"> assertObjectIsDeletedWhenTestFinishes(G_OBJECT(document));
</span><span class="cx">
</span><del>- GRefPtr<WebKitDOMNodeList> list = adoptGRef(webkit_dom_document_get_elements_by_tag_name(document, "*"));
</del><ins>+ GRefPtr<WebKitDOMNodeList> list = adoptGRef(webkit_dom_document_query_selector_all(document, "*", nullptr));
</ins><span class="cx"> g_assert(WEBKIT_DOM_IS_NODE_LIST(list.get()));
</span><span class="cx"> assertObjectIsDeletedWhenTestFinishes(G_OBJECT(list.get()));
</span><span class="cx"> gulong nodeCount = webkit_dom_node_list_get_length(list.get());
</span><span class="lines">@@ -202,6 +202,30 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool testTagNamesHTMLCollection(WebKitWebPage* page)
+ {
+ static const char* expectedTagNames[] = { "HTML", "HEAD", "BODY", "VIDEO", "SOURCE", "VIDEO", "SOURCE", "INPUT" };
+
+ WebKitDOMDocument* document = webkit_web_page_get_dom_document(page);
+ g_assert(WEBKIT_DOM_IS_DOCUMENT(document));
+ assertObjectIsDeletedWhenTestFinishes(G_OBJECT(document));
+
+ GRefPtr<WebKitDOMHTMLCollection> collection = adoptGRef(webkit_dom_document_get_elements_by_tag_name_as_html_collection(document, "*"));
+ g_assert(WEBKIT_DOM_IS_HTML_COLLECTION(collection.get()));
+ assertObjectIsDeletedWhenTestFinishes(G_OBJECT(collection.get()));
+ gulong nodeCount = webkit_dom_html_collection_get_length(collection.get());
+ g_assert_cmpuint(nodeCount, ==, G_N_ELEMENTS(expectedTagNames));
+ for (unsigned i = 0; i < nodeCount; i++) {
+ WebKitDOMNode* node = webkit_dom_html_collection_item(collection.get(), i);
+ g_assert(WEBKIT_DOM_IS_NODE(node));
+ assertObjectIsDeletedWhenTestFinishes(G_OBJECT(node));
+ GUniquePtr<char> tagName(webkit_dom_node_get_node_name(node));
+ g_assert_cmpstr(tagName.get(), ==, expectedTagNames[i]);
+ }
+
+ return true;
+ }
+
</ins><span class="cx"> bool testDOMCache(WebKitWebPage* page)
</span><span class="cx"> {
</span><span class="cx"> WebKitDOMDocument* document = webkit_web_page_get_dom_document(page);
</span><span class="lines">@@ -252,8 +276,10 @@
</span><span class="cx"> return testHierarchyNavigation(page);
</span><span class="cx"> if (!strcmp(testName, "insertion"))
</span><span class="cx"> return testInsertion(page);
</span><del>- if (!strcmp(testName, "tag-names"))
- return testTagNames(page);
</del><ins>+ if (!strcmp(testName, "tag-names-node-list"))
+ return testTagNamesNodeList(page);
+ if (!strcmp(testName, "tag-names-html-collection"))
+ return testTagNamesHTMLCollection(page);
</ins><span class="cx"> if (!strcmp(testName, "dom-cache"))
</span><span class="cx"> return testDOMCache(page);
</span><span class="cx">
</span><span class="lines">@@ -266,7 +292,8 @@
</span><span class="cx"> {
</span><span class="cx"> REGISTER_TEST(WebKitDOMNodeTest, "WebKitDOMNode/hierarchy-navigation");
</span><span class="cx"> REGISTER_TEST(WebKitDOMNodeTest, "WebKitDOMNode/insertion");
</span><del>- REGISTER_TEST(WebKitDOMNodeTest, "WebKitDOMNode/tag-names");
</del><ins>+ REGISTER_TEST(WebKitDOMNodeTest, "WebKitDOMNode/tag-names-node-list");
+ REGISTER_TEST(WebKitDOMNodeTest, "WebKitDOMNode/tag-names-html-collection");
</ins><span class="cx"> REGISTER_TEST(WebKitDOMNodeTest, "WebKitDOMNode/dom-cache");
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestDOMNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp (190345 => 190346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp 2015-09-30 12:55:17 UTC (rev 190345)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDOMNode.cpp 2015-09-30 14:07:42 UTC (rev 190346)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> g_assert(test->runWebProcessTest("WebKitDOMNode", "insertion"));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void testWebKitDOMNodeTagNames(WebViewTest* test, gconstpointer)
</del><ins>+static void prepareDOMForTagNamesTests(WebViewTest* test)
</ins><span class="cx"> {
</span><span class="cx"> static const char* testHTML = "<html><head></head><body>"
</span><span class="cx"> "<video id='video' preload='none'>"
</span><span class="lines">@@ -53,12 +53,22 @@
</span><span class="cx"> " Your browser does not support the video tag."
</span><span class="cx"> "</video>"
</span><span class="cx"> "<input type='hidden' id='test' name='finish' value='false'></body></html>";
</span><del>- test->loadHtml(testHTML, 0);
</del><ins>+ test->loadHtml(testHTML, nullptr);
</ins><span class="cx"> test->waitUntilLoadFinished();
</span><ins>+}
</ins><span class="cx">
</span><del>- g_assert(test->runWebProcessTest("WebKitDOMNode", "tag-names"));
</del><ins>+static void testWebKitDOMNodeTagNamesNodeList(WebViewTest* test, gconstpointer)
+{
+ prepareDOMForTagNamesTests(test);
+ g_assert(test->runWebProcessTest("WebKitDOMNode", "tag-names-node-list"));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static void testWebKitDOMNodeTagNamesHTMLCollection(WebViewTest* test, gconstpointer)
+{
+ prepareDOMForTagNamesTests(test);
+ g_assert(test->runWebProcessTest("WebKitDOMNode", "tag-names-html-collection"));
+}
+
</ins><span class="cx"> static void testWebKitDOMObjectCache(WebViewTest* test, gconstpointer)
</span><span class="cx"> {
</span><span class="cx"> static const char* testHTML = "<html><body><div id='container'><p>DOM Cache test</p><a id='link href='#'>link</a></div></body></html>";
</span><span class="lines">@@ -78,7 +88,8 @@
</span><span class="cx"> {
</span><span class="cx"> WebViewTest::add("WebKitDOMNode", "hierarchy-navigation", testWebKitDOMNodeHierarchyNavigation);
</span><span class="cx"> WebViewTest::add("WebKitDOMNode", "insertion", testWebKitDOMNodeInsertion);
</span><del>- WebViewTest::add("WebKitDOMNode", "tag-names", testWebKitDOMNodeTagNames);
</del><ins>+ WebViewTest::add("WebKitDOMNode", "tag-names-node-list", testWebKitDOMNodeTagNamesNodeList);
+ WebViewTest::add("WebKitDOMNode", "tag-names-html-collection", testWebKitDOMNodeTagNamesHTMLCollection);
</ins><span class="cx"> WebViewTest::add("WebKitDOMNode", "dom-cache", testWebKitDOMObjectCache);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>