<!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>[174748] 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/174748">174748</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-15 17:13:17 -0700 (Wed, 15 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>import-w3c-test rewrites relative src paths in ref files incorrectly
https://bugs.webkit.org/show_bug.cgi?id=137586
This patch fixes a bug in test_converter.py where src paths were getting
rewritten as ../../some-path instead of <script src="../../some-path>".
It also adds support for rewriting src paths in style elements, which was
missing before and it adds tests for this case.
Patch by Rebecca Hauck <rhauck@adobe.com> on 2014-10-15
Reviewed by Bem Jones-Bey.
* Scripts/webkitpy/w3c/test_converter.py:
(_W3CTestConverter.convert_attributes_if_needed):
* Scripts/webkitpy/w3c/test_converter_unittest.py:
(test_convert_attributes_if_needed):
(verify_reference_relative_paths):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_converterpy">trunk/Tools/Scripts/webkitpy/w3c/test_converter.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_converter_unittestpy">trunk/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (174747 => 174748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-10-16 00:09:57 UTC (rev 174747)
+++ trunk/Tools/ChangeLog 2014-10-16 00:13:17 UTC (rev 174748)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-10-15 Rebecca Hauck <rhauck@adobe.com>
+
+ import-w3c-test rewrites relative src paths in ref files incorrectly
+ https://bugs.webkit.org/show_bug.cgi?id=137586
+
+ This patch fixes a bug in test_converter.py where src paths were getting
+ rewritten as ../../some-path instead of <script src="../../some-path>".
+ It also adds support for rewriting src paths in style elements, which was
+ missing before and it adds tests for this case.
+
+ Reviewed by Bem Jones-Bey.
+
+ * Scripts/webkitpy/w3c/test_converter.py:
+ (_W3CTestConverter.convert_attributes_if_needed):
+ * Scripts/webkitpy/w3c/test_converter_unittest.py:
+ (test_convert_attributes_if_needed):
+ (verify_reference_relative_paths):
+
</ins><span class="cx"> 2014-10-15 Jake Nielsen <jacob_nielsen@apple.com>
</span><span class="cx">
</span><span class="cx"> Add --json flag to test-webkitpy to emit JSON formatted test results
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_converterpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_converter.py (174747 => 174748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_converter.py 2014-10-16 00:09:57 UTC (rev 174747)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_converter.py 2014-10-16 00:13:17 UTC (rev 174748)
</span><span class="lines">@@ -179,11 +179,12 @@
</span><span class="cx"> new_style = self.convert_style_data(attr[1])
</span><span class="cx"> converted = re.sub(attr[1], new_style, converted)
</span><span class="cx">
</span><del>- src_tags = ('script', 'img', 'frame', 'iframe', 'input', 'layer', 'textarea', 'video', 'audio')
</del><ins>+ src_tags = ('script', 'style', 'img', 'frame', 'iframe', 'input', 'layer', 'textarea', 'video', 'audio')
</ins><span class="cx"> if tag in src_tags and self.reference_support_info is not None and self.reference_support_info != {}:
</span><span class="cx"> for attr_name, attr_value in attrs:
</span><span class="cx"> if attr_name == 'src':
</span><del>- converted = self.convert_reference_relpaths(attr_value)
</del><ins>+ new_path = self.convert_reference_relpaths(attr_value)
+ converted = re.sub(attr_value, new_path, converted)
</ins><span class="cx">
</span><span class="cx"> self.converted_data.append(converted)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_converter_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py (174747 => 174748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py 2014-10-16 00:09:57 UTC (rev 174747)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py 2014-10-16 00:13:17 UTC (rev 174748)
</span><span class="lines">@@ -289,6 +289,34 @@
</span><span class="cx"> self.verify_prefixed_properties(converted, test_content[0])
</span><span class="cx"> self.verify_prefixed_property_values(converted, test_content[1])
</span><span class="cx">
</span><ins>+ def test_convert_attributes_if_needed(self):
+ """ Tests convert_attributes_if_needed() using a reference file that has some relative src paths """
+
+ test_html = """<html>
+<head>
+<script src="../../some-script.js"></script>
+<style src="../../../some-style.css"></style>
+</head>
+<body>
+<img src="../../../../some-image.jpg">
+</body>
+</html>
+"""
+ test_reference_support_info = {'reference_relpath': '../', 'files': ['../../some-script.js', '../../../some-style.css', '../../../../some-image.jpg'], 'elements': ['script', 'style', 'img']}
+ converter = _W3CTestConverter(DUMMY_PATH, DUMMY_FILENAME, test_reference_support_info)
+
+ oc = OutputCapture()
+ oc.capture_output()
+ try:
+ converter.feed(test_html)
+ converter.close()
+ converted = converter.output()
+ finally:
+ oc.restore_output()
+
+ self.verify_conversion_happened(converted)
+ self.verify_reference_relative_paths(converted, test_reference_support_info)
+
</ins><span class="cx"> def verify_conversion_happened(self, converted):
</span><span class="cx"> self.assertTrue(converted, "conversion didn't happen")
</span><span class="cx">
</span><span class="lines">@@ -321,6 +349,15 @@
</span><span class="cx"> for test_value in test_property_values:
</span><span class="cx"> self.assertTrue((test_value in converted[2]), 'Property value ' + test_value + ' not found in converted doc')
</span><span class="cx">
</span><ins>+ def verify_reference_relative_paths(self, converted, reference_support_info):
+ idx = 0
+ for path in reference_support_info['files']:
+ expected_path = re.sub(reference_support_info['reference_relpath'], '', path, 1)
+ element = reference_support_info['elements'][idx]
+ expected_tag = '<' + element + ' src=\"' + expected_path + '\">'
+ self.assertTrue(expected_tag in converted[2], 'relative path ' + path + ' was not converted correcty')
+ idx += 1
+
</ins><span class="cx"> def generate_test_content_properties_and_values(self, full_property_list, fully_property_values_list, num_test_properties_and_values, html):
</span><span class="cx"> """Inserts properties requiring a -webkit- prefix into the content, replacing \'@testXX@\' with a property and \'@propvalueXX@\' with a value."""
</span><span class="cx"> test_content_properties = self.generate_test_content(full_property_list, num_test_properties_and_values, 'test', html)
</span></span></pre>
</div>
</div>
</body>
</html>