Changeset 50449

Timestamp:

02/27/2021 04:54:52 PM (6 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Fix and standardise calls to the setUp() and setUpBeforeClass() methods in the test suite.

The parent methods should always be called before any test-specific functionality is set up, unless there is a specific and documented reason.

See #52625

Location:

trunk/tests/phpunit

Files:

• includes/testcase-ajax.php (modified) (2 diffs)
• includes/testcase-block-supports.php (modified) (1 diff)
• tests/admin/includesScreen.php (modified) (1 diff)
• tests/adminbar.php (modified) (1 diff)
• tests/comment/getCommentExcerpt.php (modified) (1 diff)
• tests/comment/query.php (modified) (1 diff)
• tests/dbdelta.php (modified) (1 diff)
• tests/feed/wp-simplepie-file.php (modified) (1 diff)
• tests/image/editor.php (modified) (1 diff)
• tests/image/editorGd.php (modified) (1 diff)
• tests/image/editorImagick.php (modified) (1 diff)
• tests/image/resizeGd.php (modified) (1 diff)
• tests/image/resizeImagick.php (modified) (1 diff)
• tests/menu/walker-nav-menu.php (modified) (1 diff)
• tests/menu/wpAjaxMenuQuickSearch.php (modified) (1 diff)
• tests/post/formats.php (modified) (1 diff)
• tests/post/getPages.php (modified) (1 diff)
• tests/query/setupPostdata.php (modified) (1 diff)
• tests/rest-api/rest-block-renderer-controller.php (modified) (1 diff)
• tests/upload.php (modified) (1 diff)
• tests/walker.php (modified) (1 diff)

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

@@ -117 +117 @@
 
         public static function setUpBeforeClass() {
+                parent::setUpBeforeClass();
+
                 remove_action( 'admin_init', '_maybe_update_core' );
                 remove_action( 'admin_init', '_maybe_update_plugins' );
@@ -127 +129 @@
                         }
                 }
-
-                parent::setUpBeforeClass();
         }
 

trunk/tests/phpunit/includes/testcase-block-supports.php

@@ -15 +15 @@
          */
         private $registered_block_names = array();
-
-        /**
-         * Sets up each test method.
-         */
-        public function setUp() {
-                parent::setUp();
-        }
 
         /**

trunk/tests/phpunit/tests/admin/includesScreen.php

@@ -157 +157 @@
 
         function setUp() {
+                parent::setUp();
                 set_current_screen( 'front' );
-                parent::setUp();
         }
 

trunk/tests/phpunit/tests/adminbar.php

@@ -16 +16 @@
 
         public static function setUpBeforeClass() {
+                parent::setUpBeforeClass();
+
                 require_once ABSPATH . WPINC . '/class-wp-admin-bar.php';
-
-                parent::setUpBeforeClass();
         }
 

trunk/tests/phpunit/tests/comment/getCommentExcerpt.php

@@ -2 +2 @@
 
 class Tests_Get_Comment_Excerpt extends WP_UnitTestCase {
-        protected static $bacon_comment;
-
-        public static function setUpBeforeClass() {
-                parent::setUpBeforeClass();
-
-                self::$bacon_comment = 'Bacon ipsum dolor amet porchetta capicola sirloin prosciutto brisket shankle jerky. Ham hock filet mignon boudin ground round, prosciutto alcatra spare ribs meatball turducken pork beef ribs ham beef. Bacon pastrami short loin, venison tri-tip ham short ribs doner swine. Tenderloin pig tongue pork jowl doner. Pork loin rump t-bone, beef strip steak flank drumstick tri-tip short loin capicola jowl. Cow filet mignon hamburger doner rump. Short loin jowl drumstick, tongue tail beef ribs pancetta flank brisket landjaeger chuck venison frankfurter turkey.
+        protected static $bacon_comment = 'Bacon ipsum dolor amet porchetta capicola sirloin prosciutto brisket shankle jerky. Ham hock filet mignon boudin ground round, prosciutto alcatra spare ribs meatball turducken pork beef ribs ham beef. Bacon pastrami short loin, venison tri-tip ham short ribs doner swine. Tenderloin pig tongue pork jowl doner. Pork loin rump t-bone, beef strip steak flank drumstick tri-tip short loin capicola jowl. Cow filet mignon hamburger doner rump. Short loin jowl drumstick, tongue tail beef ribs pancetta flank brisket landjaeger chuck venison frankfurter turkey.
 
 Brisket shank rump, tongue beef ribs swine fatback turducken capicola meatball picanha chicken cupim meatloaf turkey. Bacon biltong shoulder tail frankfurter boudin cupim turkey drumstick. Porchetta pig shoulder, jerky flank pork tail meatball hamburger. Doner ham hock ribeye tail jerky swine. Leberkas ribeye pancetta, tenderloin capicola doner turducken chicken venison ground round boudin pork chop. Tail pork loin pig spare ribs, biltong ribeye brisket pork chop cupim. Short loin leberkas spare ribs jowl landjaeger tongue kevin flank bacon prosciutto.
 
 Shankle pork chop prosciutto ribeye ham hock pastrami. T-bone shank brisket bacon pork chop. Cupim hamburger pork loin short loin. Boudin ball tip cupim ground round ham shoulder. Sausage rump cow tongue bresaola pork pancetta biltong tail chicken turkey hamburger. Kevin flank pork loin salami biltong. Alcatra landjaeger pastrami andouille kielbasa ham tenderloin drumstick sausage turducken tongue corned beef.';
-        }
 
         public function test_get_comment_excerpt() {

trunk/tests/phpunit/tests/comment/query.php

@@ -12 +12 @@
         public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
                 self::$post_id = $factory->post->create();
-        }
-
-        function setUp() {
-                parent::setUp();
         }
 

trunk/tests/phpunit/tests/dbdelta.php

@@ -80 +80 @@
                 );
 
+                // This has to be called after the `CREATE TABLE` above as the `_create_temporary_tables` filter
+                // causes it to create a temporary table, and a temporary table cannot use a FULLTEXT index.
                 parent::setUp();
         }

trunk/tests/phpunit/tests/feed/wp-simplepie-file.php

@@ -18 +18 @@
 class Tests_WP_SimplePie_File extends WP_UnitTestCase {
         public static function setUpBeforeClass() {
+                parent::setUpBeforeClass();
+
                 require_once ABSPATH . '/wp-includes/class-simplepie.php';
                 require_once ABSPATH . '/wp-includes/class-wp-simplepie-file.php';

trunk/tests/phpunit/tests/image/editor.php

@@ -20 +20 @@
                 require_once DIR_TESTDATA . '/../includes/mock-image-editor.php';
 
+                // This needs to come after the mock image editor class is loaded.
                 parent::setUp();
         }

trunk/tests/phpunit/tests/image/editorGd.php

@@ -18 +18 @@
                 require_once ABSPATH . WPINC . '/class-wp-image-editor-gd.php';
 
+                // This needs to come after the mock image editor class is loaded.
                 parent::setUp();
         }

trunk/tests/phpunit/tests/image/editorImagick.php

@@ -19 +19 @@
                 require_once DIR_TESTROOT . '/includes/class-wp-test-stream.php';
 
+                // This needs to come after the mock image editor class is loaded.
                 parent::setUp();
         }

trunk/tests/phpunit/tests/image/resizeGd.php

@@ -22 +22 @@
                 require_once ABSPATH . WPINC . '/class-wp-image-editor-gd.php';
 
+                // This needs to come after the mock image editor class is loaded.
                 parent::setUp();
         }

trunk/tests/phpunit/tests/image/resizeImagick.php

@@ -22 +22 @@
                 require_once ABSPATH . WPINC . '/class-wp-image-editor-imagick.php';
 
+                // This needs to come after the mock image editor class is loaded.
                 parent::setUp();
         }

trunk/tests/phpunit/tests/menu/walker-nav-menu.php

@@ -24 +24 @@
 
                 $this->_wp_nav_menu_max_depth = $_wp_nav_menu_max_depth;
-                parent::setUp();
         }
 

trunk/tests/phpunit/tests/menu/wpAjaxMenuQuickSearch.php

@@ -17 +17 @@
          */
         function setUp() {
+                parent::setUp();
+
                 global $current_screen;
                 $this->current_screen = $current_screen;
-                parent::setUp();
         }
 

trunk/tests/phpunit/tests/post/formats.php

@@ -5 +5 @@
  */
 class Tests_Post_Formats extends WP_UnitTestCase {
-        function setUp() {
-                parent::setUp();
-        }
-
         function test_set_get_post_format_for_post() {
                 $post_id = self::factory()->post->create();

trunk/tests/phpunit/tests/post/getPages.php

@@ -6 +6 @@
 
 class Tests_Post_GetPages extends WP_UnitTestCase {
-        function setUp() {
-                parent::setUp();
-        }
-
         /**
          * @ticket 23167

trunk/tests/phpunit/tests/query/setupPostdata.php

@@ -11 +11 @@
 
         protected $pages_global;
-
-        public function setUp() {
-                parent::setUp();
-                return;
-
-                foreach ( $this->global_keys as $global_key ) {
-                        if ( isset( $GLOBALS[ $global_key ] ) ) {
-                                $this->global_data[ $global_key ] = $GLOBALS[ $global_key ];
-                                unset( $GLOBALS[ $global_key ] );
-                        } else {
-                                $this->global_data[ $global_key ] = null;
-                        }
-                }
-        }
 
         public function test_id() {

trunk/tests/phpunit/tests/rest-api/rest-block-renderer-controller.php

@@ -134 +134 @@
          */
         public function setUp() {
+                parent::setUp();
+
                 $this->register_test_block();
                 $this->register_post_context_test_block();
                 $this->register_non_dynamic_block();
                 $this->register_dynamic_block_with_boolean_attributes();
-                parent::setUp();
         }
 

trunk/tests/phpunit/tests/upload.php

@@ -9 +9 @@
 
         function setUp() {
+                parent::setUp();
                 $this->_reset_options();
-                parent::setUp();
         }
 

trunk/tests/phpunit/tests/walker.php

@@ -10 +10 @@
 
         function setUp() {
+                parent::setUp();
 
                 $this->walker = new Walker_Test();
-
-                parent::setUp();
-
         }