vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-07 09:49:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unit Tests: one $factory to rule them all, and it shall be static.

Browse Source 
Using more than one instance of `WP_UnitTest_Factory` causes all kinds of craziness, due to out-of-sync internal generator sequences. Since we want to use `setUpBeforeClass`, we were creating ad hoc instances. To avoid that, we were injecting one `static` instance via Dependency Injection in `wpSetUpBeforeClass`. All tests should really use the `static` instance, so we will remove the instance prop `$factory`.

Replace `$this->factory` with `self::$factory` over 2000 times.
Rewrite all of the tests that were hard-coding dynamic values. 

#YOLOFriday



git-svn-id: https://develop.svn.wordpress.org/trunk@35225 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor
2015-10-16 21:04:12 +00:00
parent 84272ff8cd
commit e70ebea219
169 changed files with 2631 additions and 2616 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/phpunit/includes/testcase-ajax.php
+2 -2
View File
@@ -75,7 +75,7 @@ abstract class WP_Ajax_UnitTestCase extends WP_UnitTestCase {
error_reporting( $this->_error_level & ~E_WARNING );
// Make some posts
$this->factory->post->create_many( 5 );
self::$factory->post->create_many( 5 );
}
/**
@@ -148,7 +148,7 @@ abstract class WP_Ajax_UnitTestCase extends WP_UnitTestCase {
*/
protected function _setRole( $role ) {
$post = $_POST;
$user_id = $this->factory->user->create( array( 'role' => $role ) );
$user_id = self::$factory->user->create( array( 'role' => $role ) );
wp_set_current_user( $user_id );
$_POST = array_merge($_POST, $post);
}
tests/phpunit/includes/testcase-canonical.php
+1 -1
View File
@@ -49,7 +49,7 @@ class WP_Canonical_UnitTestCase extends WP_UnitTestCase {
wp_set_current_user( self::$author_id );
// Already created by install defaults:
// $this->factory->term->create( array( 'taxonomy' => 'category', 'name' => 'uncategorized' ) );
// self::$factory->term->create( array( 'taxonomy' => 'category', 'name' => 'uncategorized' ) );
self::$post_ids[] = $factory->post->create( array( 'import_id' => 587, 'post_title' => 'post-format-test-audio', 'post_date' => '2008-06-02 00:00:00' ) );
self::$post_ids[] = $post_id = $factory->post->create( array( 'post_title' => 'post-format-test-gallery', 'post_date' => '2008-06-10 00:00:00' ) );
tests/phpunit/includes/testcase-xmlrpc.php
+1 -1
View File
@@ -22,7 +22,7 @@ class WP_XMLRPC_UnitTestCase extends WP_UnitTestCase {
}
protected function make_user_by_role( $role ) {
return $this->factory->user->create( array(
return self::$factory->user->create( array(
'user_login' => $role,
'user_pass' => $role,
'role' => $role
tests/phpunit/includes/testcase.php
+6 -9
View File
@@ -17,9 +17,7 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
/**
* @var WP_UnitTest_Factory
*/
protected $factory;
protected static $static_factory;
protected static $factory;
public static function get_called_class() {
if ( function_exists( 'get_called_class' ) ) {
@@ -39,16 +37,16 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
public static function setUpBeforeClass() {
parent::setUpBeforeClass();
if ( ! self::$factory ) {
self::$factory = new WP_UnitTest_Factory();
}
$c = self::get_called_class();
if ( ! method_exists( $c, 'wpSetUpBeforeClass' ) ) {
return;
}
if ( ! self::$static_factory ) {
self::$static_factory = new WP_UnitTest_Factory();
}
call_user_func( array( $c, 'wpSetUpBeforeClass' ), self::$static_factory );
call_user_func( array( $c, 'wpSetUpBeforeClass' ), self::$factory );
self::commit_transaction();
}
@@ -82,7 +80,6 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
$wpdb->show_errors = true;
$wpdb->db_connect();
ini_set('display_errors', 1 );
$this->factory = new WP_UnitTest_Factory;
$this->clean_up_global_scope();
/*