<!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>[26871] trunk/tests/phpunit/includes/bootstrap.php: Test runner: Extend WP_PHPUnit_Util_Getopt instead of PHPUnit_TextUI_Command to parse incoming options.</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://core.trac.wordpress.org/changeset/26871">26871</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-12-27 15:07:07 +0000 (Fri, 27 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Test runner: Extend WP_PHPUnit_Util_Getopt instead of PHPUnit_TextUI_Command to parse incoming options.
props wawco.
fixes <a href="http://core.trac.wordpress.org/ticket/26725">#26725</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludesbootstrapphp">trunk/tests/phpunit/includes/bootstrap.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludesbootstrapphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/includes/bootstrap.php (26870 => 26871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/includes/bootstrap.php 2013-12-26 21:47:24 UTC (rev 26870)
+++ trunk/tests/phpunit/includes/bootstrap.php 2013-12-27 15:07:07 UTC (rev 26871)
</span><span class="lines">@@ -95,8 +95,8 @@
</span><span class="cx"> /**
</span><span class="cx"> * A child class of the PHP test runner.
</span><span class="cx"> *
</span><del>- * Not actually used as a runner. Rather, used to access the protected
- * longOptions property, to parse the arguments passed to the script.
</del><ins>+ * Used to access the protected longOptions property, to parse the arguments
+ * passed to the script.
</ins><span class="cx"> *
</span><span class="cx"> * If it is determined that phpunit was called with a --group that corresponds
</span><span class="cx"> * to an @ticket annotation (such as `phpunit --group 12345` for bugs marked
</span><span class="lines">@@ -105,15 +105,29 @@
</span><span class="cx"> * If WP_TESTS_FORCE_KNOWN_BUGS is already set in wp-tests-config.php, then
</span><span class="cx"> * how you call phpunit has no effect.
</span><span class="cx"> */
</span><del>-class WP_PHPUnit_TextUI_Command extends PHPUnit_TextUI_Command {
</del><ins>+class WP_PHPUnit_Util_Getopt extends PHPUnit_Util_Getopt {
+ protected $longOptions = array(
+ 'exclude-group=',
+ 'group=',
+ );
</ins><span class="cx"> function __construct( $argv ) {
</span><del>- $options = PHPUnit_Util_Getopt::getopt(
- $argv,
- 'd:c:hv',
- array_keys( $this->longOptions )
- );
</del><ins>+ array_shift( $argv );
+ $options = array();
+ while ( list( $i, $arg ) = each( $argv ) ) {
+ try {
+ if ( strlen( $arg ) > 1 && $arg[0] === '-' && $arg[1] === '-' ) {
+ PHPUnit_Util_Getopt::parseLongOption( substr( $arg, 2 ), $this->longOptions, $options, $argv );
+ }
+ }
+ catch ( PHPUnit_Framework_Exception $e ) {
+ // Enforcing recognized arguments or correctly formed arguments is
+ // not really the concern here.
+ continue;
+ }
+ }
+
</ins><span class="cx"> $ajax_message = true;
</span><del>- foreach ( $options[0] as $option ) {
</del><ins>+ foreach ( $options as $option ) {
</ins><span class="cx"> switch ( $option[0] ) {
</span><span class="cx"> case '--exclude-group' :
</span><span class="cx"> $ajax_message = false;
</span><span class="lines">@@ -121,15 +135,17 @@
</span><span class="cx"> case '--group' :
</span><span class="cx"> $groups = explode( ',', $option[1] );
</span><span class="cx"> foreach ( $groups as $group ) {
</span><del>- if ( is_numeric( $group ) || preg_match( '/^(UT|Plugin)\d+$/', $group ) )
</del><ins>+ if ( is_numeric( $group ) || preg_match( '/^(UT|Plugin)\d+$/', $group ) ) {
</ins><span class="cx"> WP_UnitTestCase::forceTicket( $group );
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> $ajax_message = ! in_array( 'ajax', $groups );
</span><span class="cx"> continue 2;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if ( $ajax_message )
</del><ins>+ if ( $ajax_message ) {
</ins><span class="cx"> echo "Not running ajax tests... To execute these, use --group ajax." . PHP_EOL;
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-new WP_PHPUnit_TextUI_Command( $_SERVER['argv'] );
</del><ins>+new WP_PHPUnit_Util_Getopt( $_SERVER['argv'] );
</ins></span></pre>
</div>
</div>
</body>
</html>