Changeset 37328

Timestamp:

04/29/2016 05:51:54 PM (8 years ago)

Author:

wonderboymusic

Message:

Media/Unit Tests: ensure that image sizes are indeed removed when errors are raised before assertions in Tests_Media.

See #36588.

Location:

trunk/tests/phpunit/tests

Files:

• image/intermediate_size.php (modified) (8 diffs)
• media.php (modified) (1 diff)

trunk/tests/phpunit/tests/image/intermediate_size.php

@@ -8 +8 @@
     function tearDown() {
         $this->remove_added_uploads();
+
+        remove_image_size( 'test-size' );
+        remove_image_size( 'false-height' );
+        remove_image_size( 'false-width' );
+        remove_image_size( 'off-by-one' );
         parent::tearDown();
     }
@@ -70 +75 @@
         $image = image_get_intermediate_size( $id, 'test-size' );
 
-        // test for the expected string because the array will by definition
-        // return with the correct height and width attributes
-        $this->assertTrue( strpos( $image['file'], '330x220' ) > 0 );
-
         // cleanup
         remove_image_size( 'test-size' );
+
+        // test for the expected string because the array will by definition
+        // return with the correct height and width attributes
+        $this->assertTrue( strpos( $image['file'], '330x220' ) > 0 );
     }
 
@@ -97 +102 @@
         // return with the correct height and width attributes
         $this->assertTrue( strpos( $image['file'], '330x220' ) > 0 );
-
-        // cleanup
-        remove_image_size( 'test-size' );
-        remove_image_size( 'false-height' );
-        remove_image_size( 'false-width' );
     }
 
@@ -124 +124 @@
         // return with the correct height and width attributes
         $this->assertTrue( strpos( $image['file'], '450x300' ) > 0 );
-
-        // cleanup
-        remove_image_size( 'test-size' );
-        remove_image_size( 'false-height' );
-        remove_image_size( 'false-width' );
     }
 
@@ -150 +145 @@
         // return with the correct height and width attributes
         $this->assertFalse( $image );
-
-        // cleanup
-        remove_image_size( 'false-height' );
-        remove_image_size( 'false-width' );
     }
 
@@ -181 +172 @@
         // return with the correct height and width attributes
         $this->assertTrue( strpos( $image['file'], $image_w . 'x' . $image_h ) > 0 );
-
-        // cleanup
-        remove_image_size( 'test-size' );
-        remove_image_size( 'false-height' );
     }
 
@@ -213 +200 @@
         // return with the correct height and width attributes
         $this->assertTrue( strpos( $image['file'], $image_w . 'x' . $image_h ) > 0 );
-
-        // cleanup
-        remove_image_size( 'test-size' );
-        remove_image_size( 'false-height' );
     }
 
@@ -241 +224 @@
 
         $this->assertTrue( strpos( $image['file'], $width . 'x' . $height ) > 0 );
-
-        // cleanup
-        remove_image_size( 'off-by-one' );
     }
 }

trunk/tests/phpunit/tests/media.php

@@ -585 +585 @@
         }
 
+        remove_image_size( 'test-size' );
+
         $this->assertArrayNotHasKey( 'test-size', $_wp_additional_image_sizes );
         add_image_size( 'test-size', 200, 600 );
-        $this->assertArrayHasKey( 'test-size', $_wp_additional_image_sizes );
-        $this->assertEquals( 200, $_wp_additional_image_sizes['test-size']['width'] );
-        $this->assertEquals( 600, $_wp_additional_image_sizes['test-size']['height'] );
+
+        $sizes = $_wp_additional_image_sizes;
 
         // Clean up
         remove_image_size( 'test-size' );
+
+        $this->assertArrayHasKey( 'test-size', $sizes );
+        $this->assertEquals( 200, $sizes['test-size']['width'] );
+        $this->assertEquals( 600, $sizes['test-size']['height'] );
     }