Changeset 37299

Timestamp:

04/22/2016 02:35:52 PM (8 years ago)

Author:

boonebgorges

Message:

Tests: Use the same incrementor for all fields belonging to a given text fixture.

[35244] changed the way that WP_UnitTest_Generator_Sequence() created an
incrementor for object fields (like 'post_name' and 'user_email'), by making
incrementor static across the entire run of the test suite. While this helped
to enforce uniqueness across the tests, it has the side effect of bumping the
incrementor between fields on the same object (so that, eg, the same post might
have post_name "post-12" but post_title "Post 13". By switching to a
technique that uses the same incrementor for each field belonging to a given
fixture, we conform better to the expectations of developers using
WP_UnitTest_Factory.

Fixes #35199.

Location:

trunk/tests/phpunit/includes/factory

Files:

• class-wp-unittest-factory-for-thing.php (modified) (1 diff)
• class-wp-unittest-generator-sequence.php (modified) (1 diff)

trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-thing.php

@@ -63 +63 @@
             $generation_definitions = $this->default_generation_definitions;
 
+        // Use the same incrementor for all fields belonging to this object.
+        $gen  = new WP_UnitTest_Generator_Sequence();
+        $incr = $gen->get_incr();
+
         foreach( array_keys( $generation_definitions ) as $field_name ) {
             if ( !isset( $args[$field_name] ) ) {
                 $generator = $generation_definitions[$field_name];
-                if ( is_scalar( $generator ) )
+                if ( is_scalar( $generator ) ) {
                     $args[$field_name] = $generator;
-                elseif ( is_object( $generator ) && method_exists( $generator, 'call' ) ) {
+                } elseif ( is_object( $generator ) && method_exists( $generator, 'call' ) ) {
                     $callbacks[$field_name] = $generator;
-                } elseif ( is_object( $generator ) )
-                    $args[$field_name] = $generator->next();
-                else
+                } elseif ( is_object( $generator ) ) {
+                    $args[ $field_name ] = sprintf( $generator->get_template_string(), $incr );
+                } else {
                     return new WP_Error( 'invalid_argument', 'Factory default value should be either a scalar or an generator object.' );
+                }
             }
         }
+
         return $args;
     }

trunk/tests/phpunit/includes/factory/class-wp-unittest-generator-sequence.php

@@ -21 +21 @@
         return $generated;
     }
+
+    /**
+     * Get the incrementor.
+     *
+     * @since 4.6.0
+     *
+     * @return int
+     */
+    public function get_incr() {
+        return self::$incr;
+    }
+
+    /**
+     * Get the template string.
+     *
+     * @since 4.6.0
+     *
+     * @return string
+     */
+    public function get_template_string() {
+        return $this->template_string;
+    }
 }