Changeset 31469 for trunk/tests/phpunit/includes/testcase.php

Timestamp:

02/17/2015 04:11:09 PM (12 years ago)

Author:

boonebgorges

Message:

Improved handling of expectedDeprecated and expectedIncorrectUsage annotations in unit tests.

• Do the expectedDeprecated() check in assertPostConditions() instead of tearDown(). Previously, failing inside of tearDown() was causing the rest of the teardown process to be aborted, resulting in inter-test leakage.
• Collect all expectedDeprecated and expectedIncorrectUsage annotations in an entire method and display them all when failing, instead of showing only the first one.

Props jdgrimes.
Fixes #31362.

File:

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

trunk/tests/phpunit/includes/testcase.php

@@ -56 +56 @@
         }
 
+        /**
+         * Detect post-test failure conditions.
+         *
+         * We use this method to detect expectedDeprecated and expectedIncorrectUsage annotations.
+         *
+         * @since 4.2.0
+         */
+        protected function assertPostConditions() {
+                $this->expectedDeprecated();
+        }
+
         function tearDown() {
                 global $wpdb, $wp_query, $post;
-                $this->expectedDeprecated();
                 $wpdb->query( 'ROLLBACK' );
                 if ( is_multisite() ) {
@@ -225 +235 @@
 
         function expectedDeprecated() {
+                $errors = array();
+
                 $not_caught_deprecated = array_diff( $this->expected_deprecated, $this->caught_deprecated );
                 foreach ( $not_caught_deprecated as $not_caught ) {
-                        $this->fail( "Failed to assert that $not_caught triggered a deprecated notice" );
+                        $errors[] = "Failed to assert that $not_caught triggered a deprecated notice";
                 }
 
                 $unexpected_deprecated = array_diff( $this->caught_deprecated, $this->expected_deprecated );
                 foreach ( $unexpected_deprecated as $unexpected ) {
-                        $this->fail( "Unexpected deprecated notice for $unexpected" );
+                        $errors[] = "Unexpected deprecated notice for $unexpected";
                 }
 
                 $not_caught_doing_it_wrong = array_diff( $this->expected_doing_it_wrong, $this->caught_doing_it_wrong );
                 foreach ( $not_caught_doing_it_wrong as $not_caught ) {
-                        $this->fail( "Failed to assert that $not_caught triggered an incorrect usage notice" );
+                        $errors[] = "Failed to assert that $not_caught triggered an incorrect usage notice";
                 }
 
                 $unexpected_doing_it_wrong = array_diff( $this->caught_doing_it_wrong, $this->expected_doing_it_wrong );
                 foreach ( $unexpected_doing_it_wrong as $unexpected ) {
-                        $this->fail( "Unexpected incorrect usage notice for $unexpected" );
+                        $errors[] = "Unexpected incorrect usage notice for $unexpected";
+                }
+
+                if ( ! empty( $errors ) ) {
+                        $this->fail( implode( "\n", $errors ) );
                 }
         }