Changeset 51579

Timestamp:

08/07/2021 02:15:42 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Use more appropriate assertions in get_themes() tests.

This replaces instances of assertTrue( is_file( ... ) ) followed by assertTrue( is_readable( ... ) ) with assertFileIsReadable() to use native PHPUnit functionality.

The assertFileIsReadable() method was introduced in PHPUnit 5.6. As the minimum supported PHPUnit version has been raised to PHPUnit 5.7.21, it can now be used.

Follow-up to [51543], [51574].

Props jrf.
See #53363.

File:

• trunk/tests/phpunit/tests/theme.php (modified) (3 diffs)

trunk/tests/phpunit/tests/theme.php

@@ -149 +149 @@
             $this->assertNotEmpty( $theme['Template Files'] );
             foreach ( $theme['Template Files'] as $file ) {
-                $this->assertTrue( is_file( $dir . $file ) );
-                $this->assertTrue( is_readable( $dir . $file ) );
+                $this->assertFileIsReadable( $dir . $file );
             }
 
@@ -157 +156 @@
             $this->assertNotEmpty( $theme['Stylesheet Files'] );
             foreach ( $theme['Stylesheet Files'] as $file ) {
-                $this->assertTrue( is_file( $dir . $file ) );
-                $this->assertTrue( is_readable( $dir . $file ) );
+                $this->assertFileIsReadable( $dir . $file );
             }
 
@@ -166 +164 @@
             $this->assertSame( 'publish', $theme['Status'] );
 
-            $this->assertTrue( is_file( $dir . $theme['Stylesheet Dir'] . '/' . $theme['Screenshot'] ) );
-            $this->assertTrue( is_readable( $dir . $theme['Stylesheet Dir'] . '/' . $theme['Screenshot'] ) );
+            $this->assertFileIsReadable( $dir . $theme['Stylesheet Dir'] . '/' . $theme['Screenshot'] );
         }
     }