<!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>[525] wp-testlib: Introduce a simple way to run a group of tests with similar names e.g.</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, #logmsg > ol { margin-left: 0; 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://unit-tests.trac.wordpress.org/changeset/525">525</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2012-02-10 14:28:14 +0000 (Fri, 10 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce a simple way to run a group of tests with similar names e.g. all the xmlrpc tests.
I tried implementing something based on the PHPUnit @group auto-grouping but couldn't get it working with our custom runner so went with a simple approach instead.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#wptestphp">wp-test.php</a></li>
<li><a href="#wptestlibbasephp">wp-testlib/base.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="wptestphp"></a>
<div class="modfile"><h4>Modified: wp-test.php (524 => 525)</h4>
<pre class="diff"><span>
<span class="info">--- wp-test.php 2012-02-10 13:45:07 UTC (rev 524)
+++ wp-test.php 2012-02-10 14:28:14 UTC (rev 525)
</span><span class="lines">@@ -23,10 +23,11 @@
</span><span class="cx"> * - -s Skip known bugs
</span><span class="cx"> * - -t Specific test class names to be run (separated by spaces or commas)
</span><span class="cx"> * - -v Sets WP_DIR to "DIR_TESTROOT/wordpress-<value>". Overridden by -r.
</span><ins>+ * - -g Runs a group of test cases by matching part of the test class name
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> // parse options
</span><del>-$options = 'r:t:v:dfhlmnpqs';
</del><ins>+$options = 'g:r:t:v:dfhlmnpqs';
</ins><span class="cx"> if (is_callable('getopt')) {
</span><span class="cx"> $opts = getopt($options);
</span><span class="cx"> } else {
</span><span class="lines">@@ -58,6 +59,7 @@
</span><span class="cx"> -s Skip known bugs
</span><span class="cx"> -t Specific test class names to be run (separated by spaces or commas)
</span><span class="cx"> -v Sets WP_DIR to "DIR_TESTROOT/wordpress-<value>". Overridden by -r.
</span><ins>+ -g Runs a group of test cases by matching part of the test class name
</ins><span class="cx">
</span><span class="cx"> EOH;
</span><span class="cx"> exit(1);
</span><span class="lines">@@ -204,7 +206,7 @@
</span><span class="cx"> error_reporting( E_ALL & ~E_DEPRECATED & ~E_STRICT & ~E_NOTICE );
</span><span class="cx"> }
</span><span class="cx"> // run the tests and print the results
</span><del>- list ($result, $printer) = wptest_run_tests($classes, isset($opts['t']) ? $opts['t'] : array());
</del><ins>+ list ($result, $printer) = wptest_run_tests($classes, isset($opts['t']) ? $opts['t'] : array(), isset($opts['g']) ? $opts['g'] : null );
</ins><span class="cx"> wptest_print_result($printer,$result);
</span><span class="cx"> }
</span><span class="cx"> if ( !isset($opts['n']) ) {
</span></span></pre></div>
<a id="wptestlibbasephp"></a>
<div class="modfile"><h4>Modified: wp-testlib/base.php (524 => 525)</h4>
<pre class="diff"><span>
<span class="info">--- wp-testlib/base.php 2012-02-10 13:45:07 UTC (rev 524)
+++ wp-testlib/base.php 2012-02-10 14:28:14 UTC (rev 525)
</span><span class="lines">@@ -497,7 +497,6 @@
</span><span class="cx"> $tests = array_merge($tests, wptest_get_all_test_files($path));
</span><span class="cx"> }
</span><span class="cx"> closedir($dh);
</span><del>-
</del><span class="cx"> return $tests;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -540,7 +539,7 @@
</span><span class="cx"> return $current . "\t{$item}\n";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function wptest_run_tests($classes, $classnames = array()) {
</del><ins>+function wptest_run_tests($classes, $classnames = array(), $filter = null ) {
</ins><span class="cx"> $suite = new PHPUnit_Framework_TestSuite();
</span><span class="cx">
</span><span class="cx"> if ( ! is_array($classnames) ) // For strings, Accept a comma separated list, or a space separated list.
</span><span class="lines">@@ -550,7 +549,9 @@
</span><span class="cx"> $classnames = array_filter($classnames); //strip out any empty items
</span><span class="cx">
</span><span class="cx"> foreach ( $classes as $testcase ) {
</span><del>- if ( empty($classnames) || in_array( strtolower($testcase), $classnames ) ) {
</del><ins>+ if ( ( empty($classnames) || in_array( strtolower( $testcase ), $classnames ) ) &&
+ ( is_null( $filter ) || strstr( $testcase, $filter ) )
+ ) {
</ins><span class="cx"> $suite->addTestSuite($testcase);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -560,7 +561,7 @@
</span><span class="cx"> require_once('PHPUnit/TextUI/ResultPrinter.php');
</span><span class="cx"> $printer = new PHPUnit_TextUI_ResultPrinter(NULL, WP_PHPUNIT_VERBOSE, !stristr(PHP_OS, 'WIN') );
</span><span class="cx"> $result->addListener($printer);
</span><del>- return array($suite->run($result), $printer);
</del><ins>+ return array($suite->run($result, FALSE ), $printer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function wptest_print_result($printer, $result) {
</span></span></pre>
</div>
</div>
</body>
</html>