Changeset 42863 for trunk/tests/phpunit/tests/image/functions.php

Timestamp:

03/20/2018 10:34:11 PM (8 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Implement assertNotWPError() in appropriate places in the test suite.

Props birgire

Fixes #42065

File:

• trunk/tests/phpunit/tests/image/functions.php (modified) (6 diffs)

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

@@ -164 +164 @@
                                 $ret  = wp_save_image_file( $file, $img, $mime_type, 1 );
                                 $this->assertNotEmpty( $ret );
-                                $this->assertNotInstanceOf( 'WP_Error', $ret );
+                                $this->assertNotWPError( $ret );
                                 $this->assertEquals( $mime_type, $this->get_mime_type( $ret['path'] ) );
 
@@ -206 +206 @@
                         // Make assertions
                         $this->assertNotEmpty( $ret );
-                        $this->assertNotInstanceOf( 'WP_Error', $ret );
+                        $this->assertNotWPError( $ret );
                         $this->assertEquals( $mime_type, $this->get_mime_type( $ret['path'] ) );
 
@@ -250 +250 @@
                         // Save the image as each file extension, check the mime type
                         $img = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
-                        $this->assertNotInstanceOf( 'WP_Error', $img );
+                        $this->assertNotWPError( $img );
 
                         $temp = get_temp_dir();
@@ -261 +261 @@
                                 $ret  = $img->save( trailingslashit( $temp ) . $file );
                                 $this->assertNotEmpty( $ret );
-                                $this->assertNotInstanceOf( 'WP_Error', $ret );
+                                $this->assertNotWPError( $ret );
                                 $this->assertEquals( $mime_type, $this->get_mime_type( $ret['path'] ) );
                                 unlink( $ret['path'] );
@@ -311 +311 @@
                         0, 0, 100, 100, 100, 100
                 );
-                $this->assertNotInstanceOf( 'WP_Error', $file );
+                $this->assertNotWPError( $file );
                 $this->assertFileExists( $file );
                 $image = wp_get_image_editor( $file );
@@ -335 +335 @@
                         DIR_TESTDATA . '/images/' . __FUNCTION__ . '.jpg'
                 );
-                $this->assertNotInstanceOf( 'WP_Error', $file );
+                $this->assertNotWPError( $file );
                 $this->assertFileExists( $file );
                 $image = wp_get_image_editor( $file );