From ab551d8dac9fe3e3503c830548aa572ff6fa9601 Mon Sep 17 00:00:00 2001 From: Boone Gorges Date: Wed, 21 Jan 2015 18:27:44 +0000 Subject: [PATCH] Move GD-specific resize test to GD-specific resize test file. This makes it so that we don't have to mark the test as skipped when running through Imagick tests. See #30284. git-svn-id: https://develop.svn.wordpress.org/trunk@31257 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/tests/image/resize.php | 17 ----------------- tests/phpunit/tests/image/resize_gd.php | 14 +++++++++++++- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/tests/phpunit/tests/image/resize.php b/tests/phpunit/tests/image/resize.php index 3967232223..d3b78fa9f3 100644 --- a/tests/phpunit/tests/image/resize.php +++ b/tests/phpunit/tests/image/resize.php @@ -147,23 +147,6 @@ abstract class WP_Tests_Image_Resize_UnitTestCase extends WP_Image_UnitTestCase $this->assertEquals( 'error_loading_image', $image->get_error_code() ); } - /** - * Try resizing a php file (bad image) - * @ticket 6821 - */ - public function test_resize_bad_image() { - - if ( $this->editor_engine == 'WP_Image_Editor_Imagick' ) { - $this->markTestSkipped( sprintf( 'Avoid GLib-GObject-CRITICAL assertion in %s', $this->editor_engine ) ); - return; - } - - $image = $this->resize_helper( DIR_TESTDATA.'/export/crazy-cdata.xml', 25, 25 ); - $this->assertInstanceOf( 'WP_Error', $image ); - $this->assertEquals( 'invalid_image', $image->get_error_code() ); - } - - /** * Function to help out the tests */ diff --git a/tests/phpunit/tests/image/resize_gd.php b/tests/phpunit/tests/image/resize_gd.php index 53350ff368..85ff985762 100644 --- a/tests/phpunit/tests/image/resize_gd.php +++ b/tests/phpunit/tests/image/resize_gd.php @@ -22,4 +22,16 @@ class Test_Image_Resize_GD extends WP_Tests_Image_Resize_UnitTestCase { parent::setUp(); } -} \ No newline at end of file + + /** + * Try resizing a php file (bad image) + * @ticket 6821 + */ + public function test_resize_bad_image() { + + $image = $this->resize_helper( DIR_TESTDATA.'/export/crazy-cdata.xml', 25, 25 ); + $this->assertInstanceOf( 'WP_Error', $image ); + $this->assertEquals( 'invalid_image', $image->get_error_code() ); + } + +}