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

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
This commit is contained in:
Boone Gorges 2015-01-21 18:27:44 +00:00
parent 4dd59fd9ce
commit ab551d8dac
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/phpunit/tests/image/resize.php
View File

@ -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
*/

14
tests/phpunit/tests/image/resize_gd.php
View File

@ -22,4 +22,16 @@ class Test_Image_Resize_GD extends WP_Tests_Image_Resize_UnitTestCase {
parent::setUp();
}
}
/**
* 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() );
}
}