From 8d562e0d044f09e14f63207a3ee9548dae01ddd8 Mon Sep 17 00:00:00 2001 From: Eric Andrew Lewis Date: Wed, 27 Jan 2016 03:26:15 +0000 Subject: [PATCH] Build/Test Tools: Move class `WP_UnitTest_Factory` into its own file. In [36347] we moved all PHP factory classes into their own files except the main class. The main class is now in its own file, and `factory.php` is solely an include manifest for all factory classes. git-svn-id: https://develop.svn.wordpress.org/trunk@36409 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/includes/factory.php | 63 +------------------ .../factory/class-wp-unittest-factory.php | 63 +++++++++++++++++++ 2 files changed, 64 insertions(+), 62 deletions(-) create mode 100644 tests/phpunit/includes/factory/class-wp-unittest-factory.php diff --git a/tests/phpunit/includes/factory.php b/tests/phpunit/includes/factory.php index 7cb8219158..c6d55186d1 100644 --- a/tests/phpunit/includes/factory.php +++ b/tests/phpunit/includes/factory.php @@ -10,65 +10,4 @@ require_once( dirname( __FILE__ ) . '/factory/class-wp-unittest-factory-for-netw require_once( dirname( __FILE__ ) . '/factory/class-wp-unittest-factory-for-term.php' ); require_once( dirname( __FILE__ ) . '/factory/class-wp-unittest-generator-sequence.php' ); require_once( dirname( __FILE__ ) . '/factory/class-wp-unittest-factory-callback-after-create.php' ); - -class WP_UnitTest_Factory { - - /** - * @var WP_UnitTest_Factory_For_Post - */ - public $post; - - /** - * @var WP_UnitTest_Factory_For_Attachment - */ - public $attachment; - - /** - * @var WP_UnitTest_Factory_For_Comment - */ - public $comment; - - /** - * @var WP_UnitTest_Factory_For_User - */ - public $user; - - /** - * @var WP_UnitTest_Factory_For_Term - */ - public $term; - - /** - * @var WP_UnitTest_Factory_For_Term - */ - public $category; - - /** - * @var WP_UnitTest_Factory_For_Term - */ - public $tag; - - /** - * @var WP_UnitTest_Factory_For_Blog - */ - public $blog; - - /** - * @var WP_UnitTest_Factory_For_Network - */ - public $network; - - function __construct() { - $this->post = new WP_UnitTest_Factory_For_Post( $this ); - $this->attachment = new WP_UnitTest_Factory_For_Attachment( $this ); - $this->comment = new WP_UnitTest_Factory_For_Comment( $this ); - $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' ); - $this->tag = new WP_UnitTest_Factory_For_Term( $this, 'post_tag' ); - if ( is_multisite() ) { - $this->blog = new WP_UnitTest_Factory_For_Blog( $this ); - $this->network = new WP_UnitTest_Factory_For_Network( $this ); - } - } -} +require_once( dirname( __FILE__ ) . '/factory/class-wp-unittest-factory.php' ); diff --git a/tests/phpunit/includes/factory/class-wp-unittest-factory.php b/tests/phpunit/includes/factory/class-wp-unittest-factory.php new file mode 100644 index 0000000000..836352ea32 --- /dev/null +++ b/tests/phpunit/includes/factory/class-wp-unittest-factory.php @@ -0,0 +1,63 @@ +post = new WP_UnitTest_Factory_For_Post( $this ); + $this->attachment = new WP_UnitTest_Factory_For_Attachment( $this ); + $this->comment = new WP_UnitTest_Factory_For_Comment( $this ); + $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' ); + $this->tag = new WP_UnitTest_Factory_For_Term( $this, 'post_tag' ); + if ( is_multisite() ) { + $this->blog = new WP_UnitTest_Factory_For_Blog( $this ); + $this->network = new WP_UnitTest_Factory_For_Network( $this ); + } + } +}