Changeset 54865

Timestamp:

11/22/2022 09:25:27 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Tests: Correct references to set_up() and tear_down() in various DocBlocks.

The setUp() and tearDown() methods were renamed to set_up() and tear_down(), respectively, as part of implementing the void return type solution for PHPUnit 8.0.

Follow-up to [29120], [29251], [30277], [32173], [32806], [38829], [42379], [50450], [51276], [51568].

See #56793.

Location:

trunk/tests/phpunit

Files:

• includes/abstract-testcase.php (modified) (3 diffs)
• includes/testcase-canonical.php (modified) (2 diffs)
• tests/customize/custom-css-setting.php (modified) (1 diff)
• tests/customize/nav-menu-item-setting.php (modified) (1 diff)
• tests/customize/nav-menu-setting.php (modified) (1 diff)
• tests/customize/nav-menus.php (modified) (1 diff)
• tests/db/dbDelta.php (modified) (1 diff)
• tests/query/postStatus.php (modified) (1 diff)
• tests/user/capabilities.php (modified) (1 diff)

trunk/tests/phpunit/includes/abstract-testcase.php

@@ -323 +323 @@
      *
      * Stores $wp_actions, $wp_current_filter, and $wp_filter on a class variable
-     * so they can be restored on tearDown() using _restore_hooks().
+     * so they can be restored on tear_down() using _restore_hooks().
      *
      * @global array $wp_actions
@@ -341 +341 @@
 
     /**
-     * Restores the hook-related globals to their state at setUp()
+     * Restores the hook-related globals to their state at set_up()
      * so that future tests aren't affected by hooks set during this last test.
      *
@@ -1366 +1366 @@
      * Deletes files added to the `uploads` directory during tests.
      *
-     * This method works in tandem with the `setUp()` and `rmdir()` methods:
-     * - `setUp()` scans the `uploads` directory before every test, and stores its contents inside of the
-     *   `$ignore_files` property.
-     * - `rmdir()` and its helper methods only delete files that are not listed in the `$ignore_files` property. If
-     *   called during `tearDown()` in tests, this will only delete files added during the previously run test.
+     * This method works in tandem with the `set_up()` and `rmdir()` methods:
+     * - `set_up()` scans the `uploads` directory before every test, and stores
+     *   its contents inside of the `$ignore_files` property.
+     * - `rmdir()` and its helper methods only delete files that are not listed
+     *   in the `$ignore_files` property. If called during `tear_down()` in tests,
+     *   this will only delete files added during the previously run test.
      */
     public function remove_added_uploads() {

trunk/tests/phpunit/includes/testcase-canonical.php

@@ -38 +38 @@
      * Generate fixtures to be shared between canonical tests.
      *
-     * Abstracted here because it's invoked by setUpBeforeClass() in more than one class.
+     * Abstracted here because it's invoked by wpSetUpBeforeClass() in more than one class.
      *
      * @since 4.1.0
@@ -47 +47 @@
 
         /*
-         * Also set in self::setUp(), but we must configure here to make sure that
+         * Also set in self::set_up(), but we must configure here to make sure that
          * post authorship is properly attributed for fixtures.
          */

trunk/tests/phpunit/tests/customize/custom-css-setting.php

@@ -26 +26 @@
      * Set up the test case.
      *
-     * @see WP_UnitTestCase::setup()
+     * @see WP_UnitTestCase_Base::set_up()
      */
     public function set_up() {

trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php

@@ -17 +17 @@
      * Set up a test case.
      *
-     * @see WP_UnitTestCase::setup()
+     * @see WP_UnitTestCase_Base::set_up()
      */
     public function set_up() {

trunk/tests/phpunit/tests/customize/nav-menu-setting.php

@@ -18 +18 @@
      * Set up a test case.
      *
-     * @see WP_UnitTestCase::setup()
+     * @see WP_UnitTestCase_Base::set_up()
      */
     public function set_up() {

trunk/tests/phpunit/tests/customize/nav-menus.php

@@ -18 +18 @@
      * Set up a test case.
      *
-     * @see WP_UnitTestCase::setup()
+     * @see WP_UnitTestCase_Base::set_up()
      */
     public function set_up() {

trunk/tests/phpunit/tests/db/dbDelta.php

@@ -100 +100 @@
         parent::tear_down();
 
-        // This has to be called after the parent `tearDown()` method.
+        // This has to be called after the parent `tear_down()` method.
         $wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}dbdelta_test" );
     }

trunk/tests/phpunit/tests/query/postStatus.php

@@ -88 +88 @@
      *
      * CPTs and CPSs are reset between each test run so need to be registered
-     * in both the wpSetUpBeforeClass() and setUp() methods.
+     * in both the wpSetUpBeforeClass() and set_up() methods.
      */
     public static function register_custom_post_objects() {

trunk/tests/phpunit/tests/user/capabilities.php

@@ -1708 +1708 @@
 
     public function nullify_current_user() {
-        // Prevents fatal errors in ::tearDown()'s and other uses of restore_current_blog().
+        // Prevents fatal errors in ::tear_down()'s and other uses of restore_current_blog().
         $function_stack = wp_debug_backtrace_summary( null, 0, false );
         if ( in_array( 'restore_current_blog', $function_stack, true ) ) {