<!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>[Tests][918] trunk: When calling phpunit with a --group of a @ticket annotation (--group 12345, --group UT123), force the tests associated with them, rather than skipping them.</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/918">918</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-07-19 15:51:42 +0000 (Thu, 19 Jul 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>When calling phpunit with a --group of a @ticket annotation (--group 12345, --group UT123), force the tests associated with them, rather than skipping them.
Minimizes the need to use WP_TESTS_FORCE_KNOWN_BUGS and makes it easier to run tests for a specific ticket.
see <a href="http://unit-tests.trac.wordpress.org/ticket/49">#49</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbootstrapphp">trunk/bootstrap.php</a></li>
<li><a href="#trunkincludestestcasephp">trunk/includes/testcase.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbootstrapphp"></a>
<div class="modfile"><h4>Modified: trunk/bootstrap.php (917 => 918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bootstrap.php 2012-07-19 14:58:34 UTC (rev 917)
+++ trunk/bootstrap.php 2012-07-19 15:51:42 UTC (rev 918)
</span><span class="lines">@@ -78,3 +78,36 @@
</span><span class="cx"> require dirname( __FILE__ ) . '/includes/testcase-ajax.php';
</span><span class="cx"> require dirname( __FILE__ ) . '/includes/exceptions.php';
</span><span class="cx"> require dirname( __FILE__ ) . '/includes/utils.php';
</span><ins>+
+/**
+ * A child class of the PHP test runner.
+ *
+ * Not actually used as a runner. Rather, used to access the protected
+ * longOptions property, to parse the arguments passed to the script.
+ *
+ * If it is determined that phpunit was called with a --group that corresponds
+ * to an @ticket annotation (such as `phpunit --group 12345` for bugs marked
+ * as #WP12345), then it is assumed that known bugs should not be skipped.
+ *
+ * If WP_TESTS_FORCE_KNOWN_BUGS is already set in wp-tests-config.php, then
+ * how you call phpunit has no effect.
+ */
+class WP_PHPUnit_TextUI_Command extends PHPUnit_TextUI_Command {
+ function __construct( $argv ) {
+ $options = PHPUnit_Util_Getopt::getopt(
+ $argv,
+ 'd:c:hv',
+ array_keys( $this->longOptions )
+ );
+ foreach ( $options[0] as $option ) {
+ if ( $option[0] !== '--group' )
+ continue;
+ $groups = explode( ',', $option[1] );
+ foreach ( $groups as $group ) {
+ if ( is_numeric( $group ) || preg_match( '/^(UT|Plugin)\d+$/', $group ) )
+ WP_UnitTestCase::forceTicket( $group );
+ }
+ }
+ }
+}
+new WP_PHPUnit_TextUI_Command( $_SERVER['argv'] );
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkincludestestcasephp"></a>
<div class="modfile"><h4>Modified: trunk/includes/testcase.php (917 => 918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/includes/testcase.php 2012-07-19 14:58:34 UTC (rev 917)
+++ trunk/includes/testcase.php 2012-07-19 15:51:42 UTC (rev 918)
</span><span class="lines">@@ -1,10 +1,12 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>-require_once 'factory.php';
-require_once 'trac.php';
</del><ins>+require_once dirname( __FILE__ ) . '/factory.php';
+require_once dirname( __FILE__ ) . '/trac.php';
</ins><span class="cx">
</span><span class="cx"> class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
</span><span class="cx">
</span><ins>+ protected static $forced_tickets = array();
+
</ins><span class="cx"> function setUp() {
</span><span class="cx"> global $wpdb;
</span><span class="cx"> $wpdb->suppress_errors = false;
</span><span class="lines">@@ -127,7 +129,13 @@
</span><span class="cx"> if ( is_numeric( $ticket ) ) {
</span><span class="cx"> $this->knownWPBug( $ticket );
</span><span class="cx"> } elseif ( 'UT' == substr( $ticket, 0, 2 ) ) {
</span><del>- $this->knownUTBug( substr( $ticket, 2 ) );
</del><ins>+ $ticket = substr( $ticket, 2 );
+ if ( $ticket && is_numeric( $ticket ) )
+ $this->knownUTBug( $ticket );
+ } elseif ( 'Plugin' == substr( $ticket, 0, 6 ) ) {
+ $ticket = substr( $ticket, 6 );
+ if ( $ticket && is_numeric( $ticket ) )
+ $this->knownPluginBug( $ticket );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -136,29 +144,36 @@
</span><span class="cx"> * Skips the current test if there is an open WordPress ticket with id $ticket_id
</span><span class="cx"> */
</span><span class="cx"> function knownWPBug( $ticket_id ) {
</span><del>- if ( ! WP_TESTS_FORCE_KNOWN_BUGS && ! TracTickets::isTracTicketClosed( 'http://core.trac.wordpress.org', $ticket_id ) ) {
</del><ins>+ if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( $ticket_id, self::$forced_tickets ) )
+ return;
+ if ( ! TracTickets::isTracTicketClosed( 'http://core.trac.wordpress.org', $ticket_id ) )
</ins><span class="cx"> $this->markTestSkipped( sprintf( 'WordPress Ticket #%d is not fixed', $ticket_id ) );
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Skips the current test if there is an open unit tests ticket with id $ticket_id
</span><span class="cx"> */
</span><span class="cx"> function knownUTBug( $ticket_id ) {
</span><del>- if ( ! WP_TESTS_FORCE_KNOWN_BUGS && ! TracTickets::isTracTicketClosed( 'http://unit-tests.trac.wordpress.org', $ticket_id ) ) {
</del><ins>+ if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( 'UT' . $ticket_id, self::$forced_tickets ) )
+ return;
+ if ( ! TracTickets::isTracTicketClosed( 'http://unit-tests.trac.wordpress.org', $ticket_id ) )
</ins><span class="cx"> $this->markTestSkipped( sprintf( 'Unit Tests Ticket #%d is not fixed', $ticket_id ) );
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Skips the current test if there is an open plugin ticket with id $ticket_id
</span><span class="cx"> */
</span><span class="cx"> function knownPluginBug( $ticket_id ) {
</span><del>- if ( ! WP_TESTS_FORCE_KNOWN_BUGS && ! TracTickets::isTracTicketClosed( 'http://plugins.trac.wordpress.org', $ticket_id ) ) {
</del><ins>+ if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( 'Plugin' . $ticket_id, self::$forced_tickets ) )
+ return;
+ if ( ! TracTickets::isTracTicketClosed( 'http://plugins.trac.wordpress.org', $ticket_id ) )
</ins><span class="cx"> $this->markTestSkipped( sprintf( 'WordPress Plugin Ticket #%d is not fixed', $ticket_id ) );
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+ public static function forceTicket( $ticket ) {
+ self::$forced_tickets[] = $ticket;
+ }
+
</ins><span class="cx"> /**
</span><span class="cx"> * Define constants after including files.
</span><span class="cx"> */
</span></span></pre>
</div>
</div>
</body>
</html>