Changeset 952 in tests

Timestamp:

08/06/2012 01:40:04 AM (14 years ago)

Author:

nbachiyski

Message:

Introduce a category factory

Accomodate the term taxonomy, but set the default taxonomy on construct

File:

• trunk/includes/factory.php (modified) (5 diffs)

trunk/includes/factory.php

@@ -7 +7 @@
                 $this->user = new WP_UnitTest_Factory_For_User( $this );
                 $this->term = new WP_UnitTest_Factory_For_Term( $this );
+                $this->category = new WP_UnitTest_Factory_For_Term( $this, 'category' );
                 if ( is_multisite() )
                         $this->blog = new WP_UnitTest_Factory_For_Blog( $this );
@@ -123 +124 @@
 class WP_UnitTest_Factory_For_Term extends WP_UnitTest_Factory_For_Thing {
 
-        function __construct( $factory = null ) {
-                parent::__construct( $factory );
+        private $taxonomy;
+        const DEFAULT_TAXONOMY = 'post_tag';
+
+        function __construct( $factory = null, $taxonomy = null ) {
+                parent::__construct( $factory );
+                $this->taxonomy = $taxonomy?: self::DEFAULT_TAXONOMY;
                 $this->default_generation_definitions = array(
                         'name' => new WP_UnitTest_Generator_Sequence( 'Term %s' ),
-                        'taxonomy' => 'post_tag',
+                        'taxonomy' => $this->taxonomy,
                         'description' => new WP_UnitTest_Generator_Sequence( 'Term description %s' ),
                 );
@@ -133 +138 @@
 
         function create_object( $args ) {
+                $args = array_merge( array( 'taxonomy' => $this->taxonomy ), $args );
                 $term_id_pair = wp_insert_term( $args['name'], $args['taxonomy'], $args );
                 if ( is_wp_error( $term_id_pair ) )
@@ -140 +146 @@
 
         function update_object( $term, $fields ) {
+                $fields = array_merge( array( 'taxonomy' => $this->taxonomy ), $fields );
                 if ( is_object( $term ) )
                         $taxonomy = $term->taxonomy;
-                elseif ( isset( $fields['taxonomy'] ) )
-                        $taxonomy = $fields['taxonomy'];
-                else
-                        $taxonomy = 'post_tag';
                 $term_id_pair = wp_update_term( $term, $taxonomy, $fields );
                 return $term_id_pair['term_id'];
@@ -155 +158 @@
 
         function get_object_by_id( $term_id ) {
-                return get_term( $term_id );
+                return get_term_by( 'id', $term_id, $this->taxonomy );
         }
 }