sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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.




git-svn-id: https://develop.svn.wordpress.org/trunk@25380 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2013-09-12 04:40:13 +00:00
parent dc35c8d11e
commit a76e6cef7d
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/phpunit/includes/mock-image-editor.php
View File

@ -11,7 +11,7 @@ if (class_exists( 'WP_Image_Editor' ) ) :
public function load() { public function load() {
return self::$load_return; return self::$load_return;
} }
public static function test() { public static function test( $args = array() ) {
return self::$test_return; return self::$test_return;
} }
public static function supports_mime_type( $mime_type ) { public static function supports_mime_type( $mime_type ) {

27
tests/phpunit/tests/image/functions.php
View File

@ -9,12 +9,30 @@ class Tests_Image_Functions extends WP_UnitTestCase {
/** /**
* Setup test fixture * 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.php' );
require_once( ABSPATH . WPINC . '/class-wp-image-editor-gd.php' ); require_once( ABSPATH . WPINC . '/class-wp-image-editor-gd.php' );
require_once( ABSPATH . WPINC . '/class-wp-image-editor-imagick.php' ); require_once( ABSPATH . WPINC . '/class-wp-image-editor-imagick.php' );
include_once( DIR_TESTDATA . '/../includes/mock-image-editor.php' ); 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;
} }
/** /**
@ -236,8 +254,11 @@ class Tests_Image_Functions extends WP_UnitTestCase {
public function test_load_directory() { public function test_load_directory() {
// First, test with deprecated wp_load_image function // First, test with deprecated wp_load_image function
$editor = wp_load_image( DIR_TESTDATA ); $editor1 = wp_load_image( DIR_TESTDATA );
$this->assertNotInternalType( 'resource', $editor ); $this->assertNotInternalType( 'resource', $editor1 );
$editor2 = wp_get_image_editor( DIR_TESTDATA );
$this->assertNotInternalType( 'resource', $editor2 );
// Then, test with editors. // Then, test with editors.
$classes = array('WP_Image_Editor_GD', 'WP_Image_Editor_Imagick'); $classes = array('WP_Image_Editor_GD', 'WP_Image_Editor_Imagick');