Changeset 35244 for trunk/tests/phpunit/includes/factory.php

Timestamp:

10/17/2015 07:24:20 PM (11 years ago)

Author:

wonderboymusic

Message:

Unit Tests: WP_UnitTest_Generator_Sequence needs a static incrementer - otherwise, it assumes every test class is a reset, which it no longer is (it is now static).

While we're at it, remove unnecessary tearDown() code.

See #30017, #33968.

File:

• trunk/tests/phpunit/includes/factory.php (modified) (1 diff)

trunk/tests/phpunit/includes/factory.php

@@ -402 +402 @@
 
 class WP_UnitTest_Generator_Sequence {
-        var $next;
-        var $template_string;
-
-        function __construct( $template_string = '%s', $start = 1 ) {
-                $this->next = $start;
+        static $incr = -1;
+        public $next;
+        public $template_string;
+
+        function __construct( $template_string = '%s', $start = null ) {
+                if ( $start ) {
+                        $this->next = $start;
+                } else {
+                        self::$incr++;
+                        $this->next = self::$incr;
+                }
                 $this->template_string = $template_string;
         }