Changeset 53463

Timestamp:

06/04/2022 12:55:15 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Tests: Clean up test images before performing assertions in image resize tests.

This makes sure there are no leftover images in case of a test failure.

Follow-up to [161/tests], [1255/tests].

See #55652.

File:

• trunk/tests/phpunit/tests/image/resize.php (modified) (11 diffs)

trunk/tests/phpunit/tests/image/resize.php

@@ -24 +24 @@
         $image = $this->resize_helper( DIR_TESTDATA . '/images/test-image.jpg', 25, 25 );
 
+        list( $w, $h, $type ) = getimagesize( $image );
+
+        unlink( $image );
+
         $this->assertSame( 'test-image-25x25.jpg', wp_basename( $image ) );
-        list($w, $h, $type) = getimagesize( $image );
-        $this->assertSame( 25, $w );
-        $this->assertSame( 25, $h );
-        $this->assertSame( IMAGETYPE_JPEG, $type );
-
-        unlink( $image );
+        $this->assertSame( 25, $w );
+        $this->assertSame( 25, $h );
+        $this->assertSame( IMAGETYPE_JPEG, $type );
     }
 
@@ -40 +41 @@
         }
 
+        list( $w, $h, $type ) = getimagesize( $image );
+
+        unlink( $image );
+
         $this->assertSame( 'test-image-25x25.png', wp_basename( $image ) );
-        list($w, $h, $type) = getimagesize( $image );
         $this->assertSame( 25, $w );
         $this->assertSame( 25, $h );
         $this->assertSame( IMAGETYPE_PNG, $type );
-
-        unlink( $image );
     }
 
@@ -56 +58 @@
         }
 
+        list( $w, $h, $type ) = getimagesize( $image );
+
+        unlink( $image );
+
         $this->assertSame( 'test-image-25x25.gif', wp_basename( $image ) );
-        list($w, $h, $type) = getimagesize( $image );
         $this->assertSame( 25, $w );
         $this->assertSame( 25, $h );
         $this->assertSame( IMAGETYPE_GIF, $type );
-
-        unlink( $image );
     }
 
@@ -75 +78 @@
 
         $image = $this->resize_helper( $file, 25, 25 );
+
+        list( $w, $h, $type ) = wp_getimagesize( $image );
+
+        unlink( $image );
+
         $this->assertSame( 'test-image-25x25.webp', wp_basename( $image ) );
-        list($w, $h, $type) = wp_getimagesize( $image );
         $this->assertSame( 25, $w );
         $this->assertSame( 25, $h );
         $this->assertSame( IMAGETYPE_WEBP, $type );
-        unlink( $image );
     }
 
@@ -94 +100 @@
         $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 128, 96 );
 
+        list( $w, $h, $type ) = getimagesize( $image );
+
+        unlink( $image );
+
         $this->assertSame( '2007-06-17DSC_4173-64x96.jpg', wp_basename( $image ) );
-        list($w, $h, $type) = getimagesize( $image );
         $this->assertSame( 64, $w );
         $this->assertSame( 96, $h );
         $this->assertSame( IMAGETYPE_JPEG, $type );
-
-        unlink( $image );
     }
 
@@ -106 +113 @@
         $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 128, 0 );
 
+        list( $w, $h, $type ) = getimagesize( $image );
+
+        unlink( $image );
+
         $this->assertSame( '2007-06-17DSC_4173-128x193.jpg', wp_basename( $image ) );
-        list($w, $h, $type) = getimagesize( $image );
         $this->assertSame( 128, $w );
         $this->assertSame( 193, $h );
         $this->assertSame( IMAGETYPE_JPEG, $type );
-
-        unlink( $image );
     }
 
@@ -118 +126 @@
         $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 0, 96 );
 
+        list( $w, $h, $type ) = getimagesize( $image );
+
+        unlink( $image );
+
         $this->assertSame( '2007-06-17DSC_4173-64x96.jpg', wp_basename( $image ) );
-        list($w, $h, $type) = getimagesize( $image );
         $this->assertSame( 64, $w );
         $this->assertSame( 96, $h );
         $this->assertSame( IMAGETYPE_JPEG, $type );
-
-        unlink( $image );
     }
 
@@ -130 +139 @@
         $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 150, 150, true );
 
+        list( $w, $h, $type ) = getimagesize( $image );
+
+        unlink( $image );
+
         $this->assertSame( '2007-06-17DSC_4173-150x150.jpg', wp_basename( $image ) );
-        list($w, $h, $type) = getimagesize( $image );
         $this->assertSame( 150, $w );
         $this->assertSame( 150, $h );
         $this->assertSame( IMAGETYPE_JPEG, $type );
-
-        unlink( $image );
     }
 
@@ -142 +152 @@
         $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 150, 100, true );
 
+        list( $w, $h, $type ) = getimagesize( $image );
+
+        unlink( $image );
+
         $this->assertSame( '2007-06-17DSC_4173-150x100.jpg', wp_basename( $image ) );
-        list($w, $h, $type) = getimagesize( $image );
         $this->assertSame( 150, $w );
         $this->assertSame( 100, $h );
         $this->assertSame( IMAGETYPE_JPEG, $type );
-
-        unlink( $image );
     }
 
@@ -154 +165 @@
         $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 50, 150, true );
 
+        list( $w, $h, $type ) = getimagesize( $image );
+
+        unlink( $image );
+
         $this->assertSame( '2007-06-17DSC_4173-50x150.jpg', wp_basename( $image ) );
-        list($w, $h, $type) = getimagesize( $image );
         $this->assertSame( 50, $w );
         $this->assertSame( 150, $h );
         $this->assertSame( IMAGETYPE_JPEG, $type );
-
-        unlink( $image );
     }
 
@@ -186 +198 @@
 
         $resized = $editor->resize( $width, $height, $crop );
+
         if ( is_wp_error( $resized ) ) {
             return $resized;