Changeset 25380

Timestamp:

09/12/2013 04:40:13 AM (11 years ago)

Author:

wonderboymusic

Message:

• Avoid notice by making WP_Image_Editor_Mock::test() compatible with WP_Image_Editor::test().
• Suppress deprecated function notice for wp_load_image().
• Add assertion for wp_get_image_editor().

See #25282.

Location:

trunk/tests/phpunit

Files:

• includes/mock-image-editor.php (modified) (1 diff)
• tests/image/functions.php (modified) (3 diffs)

trunk/tests/phpunit/includes/mock-image-editor.php

@@ -12 +12 @@
             return self::$load_return;
         }
-        public static function test() {
+        public static function test( $args = array() ) {
             return self::$test_return;
         }

trunk/tests/phpunit/tests/image/functions.php

@@ -10 +10 @@
      * Setup test fixture
      */
-    public function setup() {
+    public function setUp() {
+        parent::setUp();
+
         require_once( ABSPATH . WPINC . '/class-wp-image-editor.php' );
         require_once( ABSPATH . WPINC . '/class-wp-image-editor-gd.php' );
@@ -16 +18 @@
 
         include_once( DIR_TESTDATA . '/../includes/mock-image-editor.php' );
+        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_load_image' ) ) )
+            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;
     }
 
@@ -237 +255 @@
 
         // First, test with deprecated wp_load_image function
-        $editor = wp_load_image( DIR_TESTDATA );
-        $this->assertNotInternalType( 'resource', $editor );
+        $editor1 = wp_load_image( DIR_TESTDATA );
+        $this->assertNotInternalType( 'resource', $editor1 );
+
+        $editor2 = wp_get_image_editor( DIR_TESTDATA );
+        $this->assertNotInternalType( 'resource', $editor2 );
 
         // Then, test with editors.