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

Timestamp:

10/15/2013 02:30:02 PM (13 years ago)

Author:

nacin

Message:

Test runner: Add @expectedIncorrectUsage to trap _doing_it_wrong() calls.

see #24813, #25282.

File:

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

trunk/tests/phpunit/includes/testcase.php

@@ -9 +9 @@
         protected $expected_deprecated = array();
         protected $caught_deprecated = array();
+        protected $expected_doing_it_wrong = array();
+        protected $caught_doing_it_wrong = array();
 
         /**
@@ -90 +92 @@
                         if ( ! empty( $annotations[ $depth ]['expectedDeprecated'] ) )
                                 $this->expected_deprecated = array_merge( $this->expected_deprecated, $annotations[ $depth ]['expectedDeprecated'] );
+                        if ( ! empty( $annotations[ $depth ]['expectedIncorrectUsage'] ) )
+                                $this->expected_doing_it_wrong = array_merge( $this->expected_doing_it_wrong, $annotations[ $depth ]['expectedIncorrectUsage'] );
                 }
                 add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
                 add_action( 'deprecated_argument_run', array( $this, 'deprecated_function_run' ) );
+                add_action( 'doing_it_wrong_run', array( $this, 'doing_it_wrong_run' ) );
                 add_action( 'deprecated_function_trigger_error', '__return_false' );
                 add_action( 'deprecated_argument_trigger_error', '__return_false' );
+                add_action( 'doing_it_wrong_trigger_error',      '__return_false' );
         }
 
@@ -107 +113 @@
                         $this->fail( "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" );
+                }
+
+                $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" );
+                }
         }
 
@@ -112 +128 @@
                 if ( ! in_array( $function, $this->caught_deprecated ) )
                         $this->caught_deprecated[] = $function;
+        }
+
+        function doing_it_wrong_run( $function ) {
+                if ( ! in_array( $function, $this->caught_doing_it_wrong ) )
+                        $this->caught_doing_it_wrong[] = $function;
         }