Changeset 39173

Timestamp:

11/08/2016 11:49:11 PM (10 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Utilise assertFileExists() and assertFileNotExists() in more places.

See #38716

Location:

trunk/tests/phpunit/tests

Files:

• admin/includesUpdateCore.php (modified) (1 diff)
• ajax/MediaEdit.php (modified) (1 diff)
• dependencies/backbonejs.php (modified) (1 diff)
• multisite/ms-files-rewriting.php (modified) (1 diff)
• multisite/site.php (modified) (1 diff)
• theme.php (modified) (1 diff)
• theme/themeDir.php (modified) (1 diff)

trunk/tests/phpunit/tests/admin/includesUpdateCore.php

@@ -30 +30 @@
          */
         public function test_new_files_are_not_in_old_files_array_compiled( $file ) {
-                $this->assertFalse( file_exists( dirname( ABSPATH ) . '/build/' . $file ) );
+                $this->assertFileNotExists( dirname( ABSPATH ) . '/build/' . $file );
         }
 }

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

@@ -95 +95 @@
 
                 foreach ( $files_that_shouldnt_exist as $file ) {
-                        $this->assertFalse( file_exists( $file ), 'IMAGE_EDIT_OVERWRITE is leaving garbage image files behind.' );
+                        $this->assertFileNotExists( $file, 'IMAGE_EDIT_OVERWRITE is leaving garbage image files behind.' );
                 }
         }

trunk/tests/phpunit/tests/dependencies/backbonejs.php

@@ -9 +9 @@
         function test_exclusion_of_sourcemaps() {
                 $file = ABSPATH . WPINC . '/js/backbone.min.js';
-                $this->assertTrue( file_exists( $file ) );
+                $this->assertFileExists( $file );
                 $contents = trim( file_get_contents( $file ) );
                 $this->assertFalse( strpos( $contents, 'sourceMappingURL' ), 'Presence of sourceMappingURL' );

trunk/tests/phpunit/tests/multisite/ms-files-rewriting.php

@@ -77 +77 @@
 
                 // The file on the main site should still exist. The file on the deleted site should not.
-                $this->assertTrue( file_exists( $file1['file'] ) );
-                $this->assertFalse( file_exists( $file2['file'] ) );
+                $this->assertFileExists( $file1['file'] );
+                $this->assertFileNotExists( $file2['file'] );
 
                 wpmu_delete_blog( $blog_id, true );
 
                 // The file on the main site should still exist. The file on the deleted site should not.
-                $this->assertTrue( file_exists( $file1['file'] ) );
-                $this->assertFalse( file_exists( $file2['file'] ) );
+                $this->assertFileExists( $file1['file'] );
+                $this->assertFileNotExists( $file2['file'] );
         }
 }

trunk/tests/phpunit/tests/multisite/site.php

@@ -286 +286 @@
 
                 // The file on the main site should still exist. The file on the deleted site should not.
-                $this->assertTrue( file_exists( $file1['file'] ) );
-                $this->assertFalse( file_exists( $file2['file'] ) );
+                $this->assertFileExists( $file1['file'] );
+                $this->assertFileNotExists( $file2['file'] );
 
                 wpmu_delete_blog( $blog_id, true );
 
                 // The file on the main site should still exist. The file on the deleted site should not.
-                $this->assertTrue( file_exists( $file1['file'] ) );
-                $this->assertFalse( file_exists( $file2['file'] ) );
+                $this->assertFileExists( $file1['file'] );
+                $this->assertFileNotExists( $file2['file'] );
         }
 

trunk/tests/phpunit/tests/theme.php

@@ -211 +211 @@
                 $this->assertNotEmpty( $wp_theme->get('License') );
                 $path_to_style_css = $wp_theme->get_theme_root() . '/' . $wp_theme->get_stylesheet() . '/style.css';
-                $this->assertTrue( file_exists( $path_to_style_css ) );
+                $this->assertFileExists( $path_to_style_css );
                 $theme_data = get_theme_data( $path_to_style_css );
                 $this->assertArrayHasKey( 'License', $theme_data );

trunk/tests/phpunit/tests/theme/themeDir.php

@@ -247 +247 @@
                 @mkdir( WP_CONTENT_DIR . '/themes/foo-themes' );
 
-                $this->assertTrue( file_exists( WP_CONTENT_DIR . '/themes/foo' ) );
-                $this->assertTrue( file_exists( WP_CONTENT_DIR . '/themes/foo-themes') );
+                $this->assertFileExists( WP_CONTENT_DIR . '/themes/foo' );
+                $this->assertFileExists( WP_CONTENT_DIR . '/themes/foo-themes' );
 
                 register_theme_directory( '/' );