Changeset 896 in tests for trunk/includes/testcase.php

Timestamp:

07/09/2012 04:12:47 PM (12 years ago)

Author:

nacin

Message:

Remove ability to provide an extra description to the @ticket annotation, added in [984].

This extra text causes problems when you try to use a ticket # as a group name, which phpunit supports.

File:

• trunk/includes/testcase.php (modified) (4 diffs)

trunk/includes/testcase.php

@@ -125 +125 @@
         $tickets = PHPUnit_Util_Test::getTickets( get_class( $this ), $this->getName() );
         foreach ( $tickets as $ticket ) {
-            $annotation = explode( ' ', $ticket, 2 );
-            $ticket     = $annotation[0];
-            $message    = isset( $annotation[1] ) ? $annotation[1] : '';
-
             if ( is_numeric( $ticket ) ) {
-                $this->knownWPBug( $ticket, $message );
+                $this->knownWPBug( $ticket );
             } elseif ( 'UT' == substr( $ticket, 0, 2 ) ) {
-                $this->knownUTBug( substr( $ticket, 2 ), $message );
+                $this->knownUTBug( substr( $ticket, 2 ) );
             }
         }
@@ -140 +136 @@
      * Skips the current test if there is an open WordPress ticket with id $ticket_id
      */
-    function knownWPBug( $ticket_id, $message = '' ) {
+    function knownWPBug( $ticket_id ) {
         if ( ! WP_TESTS_FORCE_KNOWN_BUGS && ! TracTickets::isTracTicketClosed( 'http://core.trac.wordpress.org', $ticket_id ) ) {
-            $this->markTestSkipped( sprintf( 'WordPress Ticket #%d is not fixed', $ticket_id ) . "\n" . $message );
+            $this->markTestSkipped( sprintf( 'WordPress Ticket #%d is not fixed', $ticket_id ) );
         }
     }
@@ -149 +145 @@
      * Skips the current test if there is an open unit tests ticket with id $ticket_id
      */
-    function knownUTBug( $ticket_id, $message = '' ) {
+    function knownUTBug( $ticket_id ) {
         if ( ! WP_TESTS_FORCE_KNOWN_BUGS && ! TracTickets::isTracTicketClosed( 'http://unit-tests.trac.wordpress.org', $ticket_id ) ) {
-            $this->markTestSkipped( sprintf( 'Unit Tests Ticket #%d is not fixed', $ticket_id ) . "\n" . $message );
+            $this->markTestSkipped( sprintf( 'Unit Tests Ticket #%d is not fixed', $ticket_id ) );
         }
     }
@@ -158 +154 @@
      * Skips the current test if there is an open plugin ticket with id $ticket_id
      */
-    function knownPluginBug( $ticket_id, $message = '' ) {
+    function knownPluginBug( $ticket_id ) {
         if ( ! WP_TESTS_FORCE_KNOWN_BUGS && ! TracTickets::isTracTicketClosed( 'http://plugins.trac.wordpress.org', $ticket_id ) ) {
-            $this->markTestSkipped( sprintf( 'WordPress Plugin Ticket #%d is not fixed', $ticket_id ) . "\n" . $message );
+            $this->markTestSkipped( sprintf( 'WordPress Plugin Ticket #%d is not fixed', $ticket_id ) );
         }
     }