Changeset 55070

Timestamp:

01/15/2023 01:36:10 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Use more specific assertions in image saving tests.

When passed a WP_Image_Editor instance as the $image parameter, wp_save_image_file() returns an array on success, so we can specifically check for an array instead of any non-empty result.

Likewise, in PDF tests, when creating an attachment is expected to return an integer ID and not a WP_Error object, we can specifically check for that.

Follow-up to [1061/tests], [38949], [39617], [42792], [53529], [53530], [53531], [55019], [55066].

See #56793.

File:

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

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

@@ -284 +284 @@
 
                 // Make assertions.
-                $this->assertNotEmpty( $ret, 'Image failed to save - "empty" response returned.' );
                 $this->assertNotWPError( $ret, 'Image failed to save - WP_Error returned.' );
+                $this->assertIsArray( $ret, 'Image failed to save - non-array response returned.' );
                 $this->assertSame( $mime_type, $this->get_mime_type( $ret['path'] ), 'Mime type of the saved image does not match.' );
 
@@ -375 +375 @@
 
                 // Make assertions.
-                $this->assertNotEmpty( $ret, 'Image failed to save - "empty" response returned.' );
                 $this->assertNotWPError( $ret, 'Image failed to save - WP_Error returned.' );
+                $this->assertIsArray( $ret, 'Image failed to save - non-array response returned.' );
                 $this->assertSame( $mime_type, $this->get_mime_type( $ret['path'] ), 'Mime type of the saved image did not override file name.' );
 
@@ -421 +421 @@
 
                 // Make assertions.
-                $this->assertNotEmpty( $ret, 'Image failed to save - "empty" response returned.' );
                 $this->assertNotWPError( $ret, 'Image failed to save - WP Error returned.' );
+                $this->assertIsArray( $ret, 'Image failed to save - non-array response returned.' );
                 $this->assertSame( $mime_type, $this->get_mime_type( $ret['path'] ), 'Mime type of the saved image was not inferred correctly.' );
 
@@ -680 +680 @@
                 );
 
-                $this->assertNotEmpty( $attachment_id );
+                $this->assertNotWPError( $attachment_id, 'Could not create attachment - WP_Error returned.' );
+                $this->assertIsInt( $attachment_id, 'Could not create attachment - non-integer response returned.' );
 
                 $temp_dir = get_temp_dir();
@@ -757 +758 @@
                 );
 
-                $this->assertNotEmpty( $attachment_id );
+                $this->assertNotWPError( $attachment_id, 'Could not create attachment - WP_Error returned.' );
+                $this->assertIsInt( $attachment_id, 'Could not create attachment - non-integer response returned.' );
 
                 $temp_dir = get_temp_dir();
@@ -830 +832 @@
                 );
 
-                $this->assertNotEmpty( $attachment_id );
+                $this->assertNotWPError( $attachment_id, 'Could not create attachment - WP_Error returned.' );
+                $this->assertIsInt( $attachment_id, 'Could not create attachment - non-integer response returned.' );
 
                 add_image_size( 'test-size', 100, 100 );