Changeset 25402 for trunk/tests/phpunit/tests/media.php

Timestamp:

09/12/2013 02:47:58 PM (13 years ago)

Author:

wonderboymusic

Message:

There was way too much duplicated code in my notice cleanup, it built up over time, and there's definitely a need to standardize.

• Remove duplicated code for deprecated function notice suppression
• Add support in WP_UnitTestCase setUp/tearDown methods for $deprecated_functions fixture if the extending class has added it
• Add a $deprecated_functions fixture to each extending class that needs it

To use this fixture, add something to your Test Case class like so:
protected $deprecated_functions = array( 'get_theme', 'get_themes', 'get_theme_data', 'get_current_theme' );

See #25282.

File:

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

trunk/tests/phpunit/tests/media.php

@@ -6 +6 @@
  */
 class Tests_Media extends WP_UnitTestCase {
+        protected $deprecated_functions = array( 'wp_convert_bytes_to_hr' );
 
         function setUp() {
@@ -20 +21 @@
                 $this->img_html = '<img src="' . $this->img_url . '"/>';
                 $this->img_dimensions = array( 'width' => 100, 'height' => 100 );
-                add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
-        }
-
-        function tearDown() {
-                parent::tearDown();
-                remove_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
-        }
-
-        function deprecated_function_run( $function ) {
-                if ( in_array( $function, array( 'wp_convert_bytes_to_hr' ) ) )
-                        add_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
-        }
-
-        function deprecated_function_trigger_error() {
-                remove_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
-                return false;
         }