Changeset 29120

Timestamp:

07/12/2014 07:08:15 AM (10 years ago)

Author:

wonderboymusic

Message:

Wouldn't it be incredible if you could run Unit Tests without all of your uploads being indiscriminately blown away and your upload folder permissions being destroyed?

The Future Is Now.

Fixes #28847.

Location:

trunk/tests/phpunit

Files:

• includes/testcase.php (modified) (3 diffs)
• includes/utils.php (modified) (1 diff)
• tests/ajax/MediaEdit.php (modified) (1 diff)
• tests/functions/deprecated.php (modified) (2 diffs)
• tests/http/base.php (modified) (1 diff)
• tests/image/base.php (modified) (3 diffs)
• tests/image/editor_gd.php (modified) (5 diffs)
• tests/image/editor_imagick.php (modified) (5 diffs)
• tests/image/functions.php (modified) (4 diffs)
• tests/image/intermediate_size.php (modified) (2 diffs)
• tests/image/resize.php (modified) (2 diffs)
• tests/image/resize_gd.php (modified) (2 diffs)
• tests/image/resize_imagick.php (modified) (2 diffs)
• tests/post/attachments.php (modified) (1 diff)
• tests/upload.php (modified) (1 diff)

trunk/tests/phpunit/includes/testcase.php

@@ -12 +12 @@
     protected $caught_doing_it_wrong = array();
 
+    protected static $ignore_files;
+
     /**
      * @var WP_UnitTest_Factory
@@ -19 +21 @@
     function setUp() {
         set_time_limit(0);
+
+        if ( ! self::$ignore_files ) {
+            self::$ignore_files = $this->scan_user_uploads();
+        }
 
         global $wpdb;
@@ -326 +332 @@
         $this->assertTrue( $passed, $message );
     }
+
+    function unlink( $file ) {
+        $exists = is_file( $file );
+        if ( $exists && ! in_array( $file, self::$ignore_files ) ) {
+            //error_log( $file );
+            unlink( $file );
+        } elseif ( ! $exists ) {
+            $this->fail( "Trying to delete a file that doesn't exist: $file" );
+        }
+    }
+
+    function rmdir( $path ) {
+        $files = $this->files_in_dir( $path );
+        foreach ( $files as $file ) {
+            if ( ! in_array( $file, self::$ignore_files ) ) {
+                $this->unlink( $file );
+            }
+        }
+    }
+
+    function remove_added_uploads() {
+        // Remove all uploads.
+        $uploads = wp_upload_dir();
+        $this->rmdir( $uploads['basedir'] );
+    }
+
+    function files_in_dir( $dir ) {
+        $files = array();
+
+        $iterator = new RecursiveDirectoryIterator( $dir );
+        $objects = new RecursiveIteratorIterator( $iterator );
+        foreach ( $objects as $name => $object ) {
+            if ( is_file( $name ) ) {
+                $files[] = $name;
+            }
+        }
+
+        return $files;
+    }
+
+    function scan_user_uploads() {
+        static $files = array();
+        if ( ! empty( $files ) ) {
+            return $files;
+        }
+
+        $uploads = wp_upload_dir();
+        $files = $this->files_in_dir( $uploads['basedir'] );
+        return $files;
+    }
 }

trunk/tests/phpunit/includes/utils.php

@@ -314 +314 @@
 }
 
-function _rmdir( $path ) {
-    if ( in_array(basename( $path ), array( '.', '..' ) ) ) {
-        return;
-    } elseif ( is_file( $path ) ) {
-        unlink( $path );
-    } elseif ( is_dir( $path ) ) {
-        foreach ( scandir( $path ) as $file )
-            _rmdir( $path . '/' . $file );
-        rmdir( $path );
-    }
-}
-
 /**
  * Removes the post type and its taxonomy associations.

trunk/tests/phpunit/tests/ajax/MediaEdit.php

@@ -33 +33 @@
     public function tearDown() {
         // Cleanup
-        foreach ($this->_ids as $id){
-            wp_delete_attachment($id, true);
+        foreach ( $this->_ids as $id ) {
+            wp_delete_attachment( $id, true );
         }
-
-        $uploads = wp_upload_dir();
-        foreach ( scandir( $uploads['basedir'] ) as $file )
-            _rmdir( $uploads['basedir'] . '/' . $file );
 
         parent::tearDown();

trunk/tests/phpunit/tests/functions/deprecated.php

@@ -149 +149 @@
         wp_save_image_file( $file, $img, 'image/jpeg', 1 );
         imagedestroy( $img );
-        @unlink($file);
+        unlink( $file );
 
         // Check if the arg was deprecated
@@ -170 +170 @@
         wp_save_image_file( $file, $img, 'image/jpeg', 1 );
         unset( $img );
-        @unlink($file);
+        unlink( $file );
 
         // Check if the arg was deprecated

trunk/tests/phpunit/tests/http/base.php

@@ -285 +285 @@
         $this->assertTrue( ! is_wp_error( $res ), print_r( $res, true ) );
     }
-    
-    
+
+
 }

trunk/tests/phpunit/tests/image/base.php

@@ -10 +10 @@
      */
     public function setUp() {
+        parent::setUp();
+
         if ( ! call_user_func( array( $this->editor_engine, 'test' ) ) ) {
             $this->markTestSkipped( sprintf('The image editor engine %s is not supported on this system', $this->editor_engine) );
@@ -21 +23 @@
      */
     public function tearDown() {
+        parent::tearDown();
+
         remove_filter( 'wp_image_editors', array( $this, 'setEngine' ), 10, 2 );
     }
@@ -34 +38 @@
     /**
      * Helper assertion for testing alpha on images
-     * 
+     *
      * @param  string $image_path
      * @param  array $point      array(x,y)

trunk/tests/phpunit/tests/image/editor_gd.php

@@ -7 +7 @@
  * @group wp-image-editor-gd
  */
+require_once( dirname( __FILE__ ) . '/base.php' );
 
 class Tests_Image_Editor_GD extends WP_Image_UnitTestCase {
@@ -19 +20 @@
     }
 
-    public function shutDown() {
+    public function tearDown() {
         $folder = DIR_TESTDATA . '/images/waffles-*.jpg';
 
@@ -26 +27 @@
         }
 
-        parent::shutDown();
+        $this->remove_added_uploads();
+
+        parent::tearDown();
     }
 
@@ -468 +471 @@
 
         $this->assertImageAlphaAtPoint( $save_to_file, array( 0,0 ), 127 );
+
+        unlink( $save_to_file );
     }
 
@@ -486 +491 @@
 
         $this->assertImageAlphaAtPoint( $save_to_file, array( 0,0 ), 127 );
+
+        unlink( $save_to_file );
     }
 }

trunk/tests/phpunit/tests/image/editor_imagick.php

@@ -7 +7 @@
  * @group wp-image-editor-imagick
  */
+require_once( dirname( __FILE__ ) . '/base.php' );
 
 class Tests_Image_Editor_Imagick extends WP_Image_UnitTestCase {
@@ -19 +20 @@
     }
 
-    public function shutDown() {
+    public function tearDown() {
         $folder = DIR_TESTDATA . '/images/waffles-*.jpg';
 
@@ -26 +27 @@
         }
 
-        parent::shutDown();
+        $this->remove_added_uploads();
+
+        parent::tearDown();
     }
 
@@ -464 +467 @@
         $editor->resize( 5, 5 );
         $save_to_file = tempnam( get_temp_dir(), '' ) . '.png';
-        
+
         $editor->save( $save_to_file );
 
         $this->assertImageAlphaAtPoint( $save_to_file, array( 0,0 ), 127 );
+
+        unlink( $save_to_file );
     }
 
@@ -486 +491 @@
 
         $this->assertImageAlphaAtPoint( $save_to_file, array( 0,0 ), 127 );
+
+        unlink( $save_to_file );
     }
 }

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

@@ -89 +89 @@
         $files = array(
             // 'test-image-cmyk.jpg', Allowed in r9727
-            // 'test-image.bmp', Allowed in r28589 
+            // 'test-image.bmp', Allowed in r28589
             // 'test-image-grayscale.jpg', Allowed in r9727
             'test-image.pct',
@@ -145 +145 @@
 
                 // Clean up
-                @unlink( $file );
-                @unlink( $ret['path'] );
+                unlink( $file );
+                unlink( $ret['path'] );
             }
 
@@ -186 +186 @@
 
             // Clean up
-            @unlink( $file );
-            @unlink( $ret['path'] );
+            unlink( $file );
+            unlink( $ret['path'] );
             unset( $img );
         }
@@ -232 +232 @@
                 $this->assertNotInstanceOf( 'WP_Error', $ret );
                 $this->assertEquals( $mime_type, $this->get_mime_type( $ret['path'] ) );
-                @unlink( $file );
-                @unlink( $ret['path'] );
+                unlink( $ret['path'] );
             }
 

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

@@ -1 +1 @@
 <?php
-
 /**
  * @group image
@@ -7 +6 @@
  */
 class Tests_Image_Intermediate_Size extends WP_UnitTestCase {
+    function tearDown() {
+        $this->remove_added_uploads();
+        parent::tearDown();
+    }
+
     function test_make_intermediate_size_no_size() {
         $image = image_make_intermediate_size( DIR_TESTDATA . '/images/a2-small.jpg', 0, 0, false );

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

@@ -5 +5 @@
  * @group media
  * @group upload
+ * @group resize
  */
+require_once( dirname( __FILE__ ) . '/base.php' );
+
 abstract class WP_Tests_Image_Resize_UnitTestCase extends WP_Image_UnitTestCase {
 
@@ -109 +112 @@
         $this->assertEquals( IMAGETYPE_JPEG, $type );
 
-        unlink($image);
+        unlink( $image );
     }
 

trunk/tests/phpunit/tests/image/resize_gd.php

@@ -5 +5 @@
  * @group media
  * @group upload
+ * @group resize
  */
+require_once( dirname( __FILE__ ) . '/resize.php' );
+
 class Test_Image_Resize_GD extends WP_Tests_Image_Resize_UnitTestCase {
 
@@ -13 +16 @@
      */
     public $editor_engine = 'WP_Image_Editor_GD';
+
+    public function setUp() {
+        require_once( ABSPATH . WPINC . '/class-wp-image-editor.php' );
+        require_once( ABSPATH . WPINC . '/class-wp-image-editor-gd.php' );
+
+        parent::setUp();
+    }
 }

trunk/tests/phpunit/tests/image/resize_imagick.php

@@ -5 +5 @@
  * @group media
  * @group upload
+ * @group resize
  */
+require_once( dirname( __FILE__ ) . '/resize.php' );
+
 class Test_Image_Resize_Imagick extends WP_Tests_Image_Resize_UnitTestCase {
 
@@ -13 +16 @@
      */
     public $editor_engine = 'WP_Image_Editor_Imagick';
+
+    public function setUp() {
+        require_once( ABSPATH . WPINC . '/class-wp-image-editor.php' );
+        require_once( ABSPATH . WPINC . '/class-wp-image-editor-imagick.php' );
+
+        parent::setUp();
+    }
 }

trunk/tests/phpunit/tests/post/attachments.php

@@ -10 +10 @@
     function tearDown() {
         // Remove all uploads.
-        $uploads = wp_upload_dir();
-        foreach ( scandir( $uploads['basedir'] ) as $file )
-            _rmdir( $uploads['basedir'] . '/' . $file );
-
+        $this->remove_added_uploads();
         parent::tearDown();
     }

trunk/tests/phpunit/tests/upload.php

@@ -23 +23 @@
 
     function tearDown() {
+        $this->remove_added_uploads();
+
         parent::tearDown();
-
-        // Remove year/month folders created by wp_upload_dir().
-        $uploads = wp_upload_dir();
-        foreach ( scandir( $uploads['basedir'] ) as $file )
-            _rmdir( $uploads['basedir'] . '/' . $file );
-        _rmdir( ABSPATH . 'foo/' );
     }