Changeset 918 in tests

Timestamp:

07/19/2012 03:51:42 PM (14 years ago)

Author:

nacin

Message:

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 #49.

Location:

trunk

Files:

• bootstrap.php (modified) (1 diff)
• includes/testcase.php (modified) (5 diffs)

trunk/bootstrap.php

@@ -79 +79 @@
 require dirname( __FILE__ ) . '/includes/exceptions.php';
 require dirname( __FILE__ ) . '/includes/utils.php';
+
+/**
+ * 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'] );

trunk/includes/testcase.php

@@ -1 +1 @@
 <?php
 
-require_once 'factory.php';
-require_once 'trac.php';
+require_once dirname( __FILE__ ) . '/factory.php';
+require_once dirname( __FILE__ ) . '/trac.php';
 
 class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
+
+        protected static $forced_tickets = array();
 
         function setUp() {
@@ -128 +130 @@
                                 $this->knownWPBug( $ticket );
                         } elseif ( 'UT' == substr( $ticket, 0, 2 ) ) {
-                                $this->knownUTBug( substr( $ticket, 2 ) );
+                                $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 );
                         }
                 }
@@ -137 +145 @@
          */
         function knownWPBug( $ticket_id ) {
-                if ( ! WP_TESTS_FORCE_KNOWN_BUGS && ! TracTickets::isTracTicketClosed( 'http://core.trac.wordpress.org', $ticket_id ) ) {
+                if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( $ticket_id, self::$forced_tickets ) )
+                        return;
+                if ( ! TracTickets::isTracTicketClosed( 'http://core.trac.wordpress.org', $ticket_id ) )
                         $this->markTestSkipped( sprintf( 'WordPress Ticket #%d is not fixed', $ticket_id ) );
-                }
         }
 
@@ -146 +155 @@
          */
         function knownUTBug( $ticket_id ) {
-                if ( ! WP_TESTS_FORCE_KNOWN_BUGS && ! TracTickets::isTracTicketClosed( 'http://unit-tests.trac.wordpress.org', $ticket_id ) ) {
+                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 ) )
                         $this->markTestSkipped( sprintf( 'Unit Tests Ticket #%d is not fixed', $ticket_id ) );
-                }
         }
 
@@ -155 +165 @@
          */
         function knownPluginBug( $ticket_id ) {
-                if ( ! WP_TESTS_FORCE_KNOWN_BUGS && ! TracTickets::isTracTicketClosed( 'http://plugins.trac.wordpress.org', $ticket_id ) ) {
+                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 ) )
                         $this->markTestSkipped( sprintf( 'WordPress Plugin Ticket #%d is not fixed', $ticket_id ) );
-                }
+        }
+
+        public static function forceTicket( $ticket ) {
+                self::$forced_tickets[] = $ticket;
         }