mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-04-04 20:54:29 +00:00
Unit Tests: one $factory to rule them all, and it shall be static.
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:
@@ -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();
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user