Changeset 25785

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.

Location:

trunk/tests/phpunit

Files:

• includes/testcase.php (modified) (4 diffs)
• tests/dependencies/jquery.php (modified) (3 diffs)
• tests/theme/support.php (modified) (3 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;
         }
 

trunk/tests/phpunit/tests/dependencies/jquery.php

@@ -39 +39 @@
         /**
          * @ticket 22896
+         *
+         * @expectedIncorrectUsage wp_deregister_script
          */
         function test_dont_allow_deregister_core_scripts_in_admin() {
@@ -52 +54 @@
                 );
 
-                add_action( 'doing_it_wrong_run', array( $this, 'doing_it_wrong_run' ) );
-
                 foreach ( $libraries as $library ) {
                         // Try to deregister the script, which should fail.
@@ -60 +60 @@
                 }
 
-                remove_action( 'doing_it_wrong_run', array( $this, 'doing_it_wrong_run' ) );
-
                 set_current_screen( 'front' );
-        }
-
-        function doing_it_wrong_run() {
-                add_filter( 'doing_it_wrong_trigger_error', array( $this, 'doing_it_wrong_trigger_error' ) );
-        }
-
-        function doing_it_wrong_trigger_error() {
-                remove_filter( 'doing_it_wrong_trigger_error', array( $this, 'doing_it_wrong_trigger_error' ) );
-                return false;
         }
 

trunk/tests/phpunit/tests/theme/support.php

@@ -5 +5 @@
  */
 class Tests_Theme_Support extends WP_UnitTestCase {
-
-        function setUp() {
-                parent::setUp();
-                add_action( 'doing_it_wrong_run', array( $this, 'doing_it_wrong_run' ) );
-        }
-
-        function tearDown() {
-                parent::tearDown();
-                remove_action( 'doing_it_wrong_run', array( $this, 'doing_it_wrong_run' ) );
-        }
-
-        function doing_it_wrong_run( $function ) {
-                if ( in_array( $function, array( "add_theme_support( 'html5' )" ) ) )
-                        add_filter( 'doing_it_wrong_trigger_error', array( $this, 'doing_it_wrong_trigger_error' ) );
-        }
-
-        function doing_it_wrong_trigger_error() {
-                remove_filter( 'doing_it_wrong_trigger_error', array( $this, 'doing_it_wrong_trigger_error' ) );
-                return false;
-        }
 
         function test_the_basics() {
@@ -116 +96 @@
         /**
          * @ticket 24932
+         *
+         * @expectedIncorrectUsage add_theme_support( 'html5' )
          */
         function test_supports_html5_subset() {
@@ -145 +127 @@
         /**
          * @ticket 24932
+         *
+         * @expectedIncorrectUsage add_theme_support( 'html5' )
          */
         function test_supports_html5_invalid() {