diff options
Diffstat (limited to 'tests/phpunit/includes')
-rw-r--r-- | tests/phpunit/includes/abstract-testcase.php | 14 | ||||
-rw-r--r-- | tests/phpunit/includes/testcase-ajax.php | 12 | ||||
-rw-r--r-- | tests/phpunit/includes/testcase-canonical.php | 4 | ||||
-rw-r--r-- | tests/phpunit/includes/testcase-rest-controller.php | 8 | ||||
-rw-r--r-- | tests/phpunit/includes/testcase-xmlrpc.php | 8 |
5 files changed, 23 insertions, 23 deletions
diff --git a/tests/phpunit/includes/abstract-testcase.php b/tests/phpunit/includes/abstract-testcase.php index 59ea4635fd..d5dccc9d16 100644 --- a/tests/phpunit/includes/abstract-testcase.php +++ b/tests/phpunit/includes/abstract-testcase.php @@ -60,7 +60,7 @@ abstract class WP_UnitTestCase_Base extends PHPUnit_Adapter_TestCase { /** * Runs the routine before setting up all tests. */ - public static function setUpBeforeClass() { + public static function set_up_before_class() { global $wpdb; $wpdb->suppress_errors = false; @@ -68,7 +68,7 @@ abstract class WP_UnitTestCase_Base extends PHPUnit_Adapter_TestCase { $wpdb->db_connect(); ini_set( 'display_errors', 1 ); - parent::setUpBeforeClass(); + parent::set_up_before_class(); $class = get_called_class(); @@ -82,8 +82,8 @@ abstract class WP_UnitTestCase_Base extends PHPUnit_Adapter_TestCase { /** * Runs the routine after all tests have been run. */ - public static function tearDownAfterClass() { - parent::tearDownAfterClass(); + public static function tear_down_after_class() { + parent::tear_down_after_class(); _delete_all_data(); self::flush_cache(); @@ -100,7 +100,7 @@ abstract class WP_UnitTestCase_Base extends PHPUnit_Adapter_TestCase { /** * Runs the routine before each test is executed. */ - public function setUp() { + public function set_up() { set_time_limit( 0 ); if ( ! self::$ignore_files ) { @@ -140,7 +140,7 @@ abstract class WP_UnitTestCase_Base extends PHPUnit_Adapter_TestCase { /** * After a test method runs, resets any state in WordPress the test method might have changed. */ - public function tearDown() { + public function tear_down() { global $wpdb, $wp_query, $wp; $wpdb->query( 'ROLLBACK' ); if ( is_multisite() ) { @@ -535,7 +535,7 @@ abstract class WP_UnitTestCase_Base extends PHPUnit_Adapter_TestCase { * * @since 4.2.0 */ - protected function assertPostConditions() { + protected function assert_post_conditions() { $this->expectedDeprecated(); } diff --git a/tests/phpunit/includes/testcase-ajax.php b/tests/phpunit/includes/testcase-ajax.php index c6db8305c6..0478c10900 100644 --- a/tests/phpunit/includes/testcase-ajax.php +++ b/tests/phpunit/includes/testcase-ajax.php @@ -115,8 +115,8 @@ abstract class WP_Ajax_UnitTestCase extends WP_UnitTestCase { 'wp-privacy-erase-personal-data', ); - public static function setUpBeforeClass() { - parent::setUpBeforeClass(); + public static function set_up_before_class() { + parent::set_up_before_class(); remove_action( 'admin_init', '_maybe_update_core' ); remove_action( 'admin_init', '_maybe_update_plugins' ); @@ -135,8 +135,8 @@ abstract class WP_Ajax_UnitTestCase extends WP_UnitTestCase { * * Overrides wp_die(), pretends to be Ajax, and suppresses E_WARNINGs. */ - public function setUp() { - parent::setUp(); + public function set_up() { + parent::set_up(); add_filter( 'wp_doing_ajax', '__return_true' ); add_filter( 'wp_die_ajax_handler', array( $this, 'getDieHandler' ), 1, 1 ); @@ -156,7 +156,7 @@ abstract class WP_Ajax_UnitTestCase extends WP_UnitTestCase { * * Resets $_POST, removes the wp_die() override, restores error reporting. */ - public function tearDown() { + public function tear_down() { $_POST = array(); $_GET = array(); unset( $GLOBALS['post'] ); @@ -165,7 +165,7 @@ abstract class WP_Ajax_UnitTestCase extends WP_UnitTestCase { remove_action( 'clear_auth_cookie', array( $this, 'logout' ) ); error_reporting( $this->_error_level ); set_current_screen( 'front' ); - parent::tearDown(); + parent::tear_down(); } /** diff --git a/tests/phpunit/includes/testcase-canonical.php b/tests/phpunit/includes/testcase-canonical.php index 9c27471a0c..ef33ca8db8 100644 --- a/tests/phpunit/includes/testcase-canonical.php +++ b/tests/phpunit/includes/testcase-canonical.php @@ -23,8 +23,8 @@ class WP_Canonical_UnitTestCase extends WP_UnitTestCase { self::delete_shared_fixtures(); } - public function setUp() { - parent::setUp(); + public function set_up() { + parent::set_up(); update_option( 'page_comments', true ); update_option( 'comments_per_page', 5 ); diff --git a/tests/phpunit/includes/testcase-rest-controller.php b/tests/phpunit/includes/testcase-rest-controller.php index 2c79df11be..a0b96545bf 100644 --- a/tests/phpunit/includes/testcase-rest-controller.php +++ b/tests/phpunit/includes/testcase-rest-controller.php @@ -4,8 +4,8 @@ abstract class WP_Test_REST_Controller_Testcase extends WP_Test_REST_TestCase { protected $server; - public function setUp() { - parent::setUp(); + public function set_up() { + parent::set_up(); add_filter( 'rest_url', array( $this, 'filter_rest_url_for_leading_slash' ), 10, 2 ); /** @var WP_REST_Server $wp_rest_server */ global $wp_rest_server; @@ -13,12 +13,12 @@ abstract class WP_Test_REST_Controller_Testcase extends WP_Test_REST_TestCase { do_action( 'rest_api_init', $wp_rest_server ); } - public function tearDown() { + public function tear_down() { remove_filter( 'rest_url', array( $this, 'test_rest_url_for_leading_slash' ), 10, 2 ); /** @var WP_REST_Server $wp_rest_server */ global $wp_rest_server; $wp_rest_server = null; - parent::tearDown(); + parent::tear_down(); } abstract public function test_register_routes(); diff --git a/tests/phpunit/includes/testcase-xmlrpc.php b/tests/phpunit/includes/testcase-xmlrpc.php index a2341db1c4..7ae8d10e62 100644 --- a/tests/phpunit/includes/testcase-xmlrpc.php +++ b/tests/phpunit/includes/testcase-xmlrpc.php @@ -6,20 +6,20 @@ require_once ABSPATH . WPINC . '/class-wp-xmlrpc-server.php'; class WP_XMLRPC_UnitTestCase extends WP_UnitTestCase { protected $myxmlrpcserver; - function setUp() { - parent::setUp(); + function set_up() { + parent::set_up(); add_filter( 'pre_option_enable_xmlrpc', '__return_true' ); $this->myxmlrpcserver = new wp_xmlrpc_server(); } - function tearDown() { + function tear_down() { remove_filter( 'pre_option_enable_xmlrpc', '__return_true' ); $this->remove_added_uploads(); - parent::tearDown(); + parent::tear_down(); } protected static function make_user_by_role( $role ) { |