<!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>[51362] trunk/WebKitTools</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/51362">51362</a></dd>
<dt>Author</dt> <dd>eric@webkit.org</dd>
<dt>Date</dt> <dd>2009-11-24 15:19:28 -0800 (Tue, 24 Nov 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-11-24  Eric Seidel  &lt;eric@webkit.org&gt;

        Reviewed by Adam Barth.

        queries_unittest.py should test command output
        https://bugs.webkit.org/show_bug.cgi?id=31845

        * Scripts/modules/commands/queries_unittest.py:
         - Capture stdout and stderr and compare with expected strings.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitToolsChangeLog">trunk/WebKitTools/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsScriptsmodulescommandsqueries_unittestpy">trunk/WebKitTools/Scripts/modules/commands/queries_unittest.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/ChangeLog (51361 => 51362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/ChangeLog        2009-11-24 22:41:11 UTC (rev 51361)
+++ trunk/WebKitTools/ChangeLog        2009-11-24 23:19:28 UTC (rev 51362)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2009-11-24  Eric Seidel  &lt;eric@webkit.org&gt;
+
+        Reviewed by Adam Barth.
+
+        queries_unittest.py should test command output
+        https://bugs.webkit.org/show_bug.cgi?id=31845
+
+        * Scripts/modules/commands/queries_unittest.py:
+         - Capture stdout and stderr and compare with expected strings.
+
</ins><span class="cx"> 2009-11-24  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         No Review.
</span></span></pre></div>
<a id="trunkWebKitToolsScriptsmodulescommandsqueries_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/modules/commands/queries_unittest.py (51361 => 51362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/modules/commands/queries_unittest.py        2009-11-24 22:41:11 UTC (rev 51361)
+++ trunk/WebKitTools/Scripts/modules/commands/queries_unittest.py        2009-11-24 23:19:28 UTC (rev 51362)
</span><span class="lines">@@ -27,20 +27,48 @@
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> 
</span><span class="cx"> import unittest
</span><ins>+from StringIO import StringIO
</ins><span class="cx"> 
</span><span class="cx"> from modules.commands.queries import *
</span><span class="cx"> from modules.mock_bugzillatool import *
</span><span class="cx"> 
</span><span class="cx"> class QueryCommandsTest(unittest.TestCase):
</span><ins>+    def _capture_output_with_name(output_name):
+        self.saved_outputs[output_name] = getattr(sys, output_name)
+        setattr(sys, output_name, StringIO.StringIO())
+
+    def _release_output_with_name(output_name):
+        captured_output = getattr(sys, output_name).getvalue()
+        setattr(sys, output_name, self.saved_outputs[output_name])
+        del self.saved_outputs[output_name]
+        return captured_output
+
+    def _capture_output(self):
+        self._capture_output_with_name(&quot;stdout&quot;)
+        self._capture_output_with_name(&quot;stderr&quot;)
+
+    def _restore_output(self):
+        return (self._release_output_with_name(&quot;stdout&quot;), self._release_output_with_name(&quot;stderr&quot;))
+
+    def _assert_execute_outputs(self, command, command_args, expected_stdout, expected_stderr = &quot;&quot;):
+        self._capture_output()
+        command.execute(None, command_args, MockBugzillaTool())
+        (stdout_string, stderr_string) = self._restore_output()
+        self.assertEqual(stdout_string, expected_stdout)
+        self.assertEqual(expected_stderr, expected_stderr)
+
</ins><span class="cx">     def test_bugs_to_commit(self):
</span><del>-        BugsToCommit().execute(None, None, MockBugzillaTool())
</del><ins>+        self._assert_execute_outputs(BugsToCommit(), None, &quot;42\n75\n&quot;)
</ins><span class="cx"> 
</span><span class="cx">     def test_patches_to_commit(self):
</span><del>-        PatchesToCommit().execute(None, None, MockBugzillaTool())
</del><ins>+        expected_stdout = &quot;http://example.com/197\nhttp://example.com/128\n&quot;
+        expected_stderr = &quot;Patches in commit queue:\n&quot;
+        self._assert_execute_outputs(PatchesToCommit(), None, expected_stdout, expected_stderr)
</ins><span class="cx"> 
</span><span class="cx">     def test_reviewed_patches(self):
</span><del>-        args = [42]
-        ReviewedPatches().execute(None, args, MockBugzillaTool())
</del><ins>+        expected_stdout = &quot;http://example.com/197\nhttp://example.com/128\n&quot;
+        self._assert_execute_outputs(ReviewedPatches(), [42], expected_stdout)
</ins><span class="cx"> 
</span><span class="cx">     def test_tree_status(self):
</span><del>-        TreeStatus().execute(None, None, MockBugzillaTool())
</del><ins>+        expected_stdout = &quot;ok   : Builder1\nok   : Builder2\n&quot;
+        self._assert_execute_outputs(TreeStatus(), None, expected_stdout)
</ins></span></pre>
</div>
</div>

</body>
</html>