Changeset 49001 for trunk/tests/phpunit/includes/abstract-testcase.php

Timestamp:

09/19/2020 09:11:23 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Tests: Simplify the logic in WP_UnitTestCase_Base::setUpBeforeClass() and ::tearDownAfterClass().

See #51344.

File:

• trunk/tests/phpunit/includes/abstract-testcase.php (modified) (2 diffs)

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

@@ -71 +71 @@
                 parent::setUpBeforeClass();
 
-                $c = get_called_class();
-                if ( ! method_exists( $c, 'wpSetUpBeforeClass' ) ) {
-                        self::commit_transaction();
-                        return;
-                }
-
-                call_user_func( array( $c, 'wpSetUpBeforeClass' ), self::factory() );
+                $class = get_called_class();
+
+                if ( method_exists( $class, 'wpSetUpBeforeClass' ) ) {
+                        call_user_func( array( $class, 'wpSetUpBeforeClass' ), self::factory() );
+                }
 
                 self::commit_transaction();
@@ -91 +89 @@
                 self::flush_cache();
 
-                $c = get_called_class();
-                if ( ! method_exists( $c, 'wpTearDownAfterClass' ) ) {
-                        self::commit_transaction();
-                        return;
-                }
-
-                call_user_func( array( $c, 'wpTearDownAfterClass' ) );
+                $class = get_called_class();
+
+                if ( method_exists( $class, 'wpTearDownAfterClass' ) ) {
+                        call_user_func( array( $class, 'wpTearDownAfterClass' ) );
+                }
 
                 self::commit_transaction();