Changeset 58235

Timestamp:

05/29/2024 12:20:56 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Tests: Use more specific assertions in a few tests.

Follow-up to [121/tests], [915/tests], [34903], [36307], [43548], [44154], [52286], [57337].

See #60705.

Location:

trunk/tests/phpunit/tests

Files:

• block-template-utils.php (modified) (1 diff)
• formatting/utf8UriEncode.php (modified) (1 diff)
• l10n/wpTranslationsConvert.php (modified) (1 diff)
• multisite/site.php (modified) (1 diff)
• oembed/controller.php (modified) (5 diffs)
• oembed/getResponseData.php (modified) (2 diffs)

trunk/tests/phpunit/tests/block-template-utils.php

@@ -380 +380 @@
                 $filename = wp_generate_block_templates_export_file();
                 $this->assertFileExists( $filename, 'zip file is created at the specified path' );
-                $this->assertTrue( filesize( $filename ) > 0, 'zip file is larger than 0 bytes' );
+                $this->assertGreaterThan( 0, filesize( $filename ), 'zip file is larger than 0 bytes' );
 
                 // Open ZIP file and make sure the directories exist.

trunk/tests/phpunit/tests/formatting/utf8UriEncode.php

@@ -23 +23 @@
         public function test_output_is_not_longer_than_optional_length_argument( $utf8, $unused_for_this_test ) {
                 $max_length = 30;
-                $this->assertTrue( strlen( utf8_uri_encode( $utf8, $max_length ) ) <= $max_length );
+                $this->assertLessThanOrEqual( $max_length, strlen( utf8_uri_encode( $utf8, $max_length ) ) );
         }
 

trunk/tests/phpunit/tests/l10n/wpTranslationsConvert.php

@@ -502 +502 @@
                 $this->assertNull( $destination->error() );
 
-                $this->assertTrue( filesize( $destination_file ) > 0 );
+                $this->assertGreaterThan( 0, filesize( $destination_file ) );
 
                 $destination_read = WP_Translation_File::create( $destination_file, $destination_format );

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

@@ -1214 +1214 @@
                                         $this->assertEquals( $expected_data[ $key ], $value );
                                 } elseif ( 'last_updated' === $key ) {
-                                        $this->assertTrue( $old_site->last_updated <= $value );
+                                        $this->assertLessThanOrEqual( $value, $old_site->last_updated );
                                 } else {
                                         $this->assertSame( $old_site->$key, $value );

trunk/tests/phpunit/tests/oembed/controller.php

@@ -343 +343 @@
                 $this->assertSame( $post->post_title, $data['title'] );
                 $this->assertSame( 'rich', $data['type'] );
-                $this->assertTrue( $data['width'] <= $request['maxwidth'] );
+                $this->assertLessThanOrEqual( $request['maxwidth'], $data['width'] );
         }
 
@@ -386 +386 @@
                 $this->assertSame( $post->post_title, $data['title'] );
                 $this->assertSame( 'rich', $data['type'] );
-                $this->assertTrue( $data['width'] <= $request['maxwidth'] );
+                $this->assertLessThanOrEqual( $request['maxwidth'], $data['width'] );
 
                 update_option( 'show_on_front', 'posts' );
@@ -431 +431 @@
                 $this->assertSame( $post->post_title, $data['title'] );
                 $this->assertSame( 'rich', $data['type'] );
-                $this->assertTrue( $data['width'] <= $request['maxwidth'] );
+                $this->assertLessThanOrEqual( $request['maxwidth'], $data['width'] );
         }
 
@@ -717 +717 @@
                 $this->assertSame( $post->post_title, $data['title'] );
                 $this->assertSame( 'rich', $data['type'] );
-                $this->assertTrue( $data['width'] <= $request['maxwidth'] );
+                $this->assertLessThanOrEqual( $request['maxwidth'], $data['width'] );
         }
 
@@ -766 +766 @@
                 $this->assertSame( $post->post_title, $data['title'] );
                 $this->assertSame( 'rich', $data['type'] );
-                $this->assertTrue( $data['width'] <= $request['maxwidth'] );
+                $this->assertLessThanOrEqual( $request['maxwidth'], $data['width'] );
 
                 update_option( 'show_on_front', 'posts' );

trunk/tests/phpunit/tests/oembed/getResponseData.php

@@ -249 +249 @@
                 $this->assertArrayHasKey( 'thumbnail_width', $data );
                 $this->assertArrayHasKey( 'thumbnail_height', $data );
-                $this->assertTrue( 400 >= $data['thumbnail_width'] );
+                $this->assertLessThanOrEqual( 400, $data['thumbnail_width'] );
         }
 
@@ -268 +268 @@
                 $this->assertArrayHasKey( 'thumbnail_width', $data );
                 $this->assertArrayHasKey( 'thumbnail_height', $data );
-                $this->assertTrue( 400 >= $data['thumbnail_width'] );
+                $this->assertLessThanOrEqual( 400, $data['thumbnail_width'] );
         }
 }