From a6f91faa7929c2800d54b9921371fe526fc2e531 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 29 May 2024 12:20:56 +0000 Subject: [PATCH] Tests: Use more specific assertions in a few tests. Follow-up to [121/tests], [915/tests], [34903], [36307], [43548], [44154], [52286], [57337]. See #60705. git-svn-id: https://develop.svn.wordpress.org/trunk@58235 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/tests/block-template-utils.php | 2 +- tests/phpunit/tests/formatting/utf8UriEncode.php | 2 +- tests/phpunit/tests/l10n/wpTranslationsConvert.php | 2 +- tests/phpunit/tests/multisite/site.php | 2 +- tests/phpunit/tests/oembed/controller.php | 10 +++++----- tests/phpunit/tests/oembed/getResponseData.php | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/phpunit/tests/block-template-utils.php b/tests/phpunit/tests/block-template-utils.php index c56d3a01bc..e5255ba5ae 100644 --- a/tests/phpunit/tests/block-template-utils.php +++ b/tests/phpunit/tests/block-template-utils.php @@ -379,7 +379,7 @@ class Tests_Block_Template_Utils extends WP_UnitTestCase { public function test_wp_generate_block_templates_export_file() { $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. $zip = new ZipArchive(); diff --git a/tests/phpunit/tests/formatting/utf8UriEncode.php b/tests/phpunit/tests/formatting/utf8UriEncode.php index 45d370d1da..cb6f513c8e 100644 --- a/tests/phpunit/tests/formatting/utf8UriEncode.php +++ b/tests/phpunit/tests/formatting/utf8UriEncode.php @@ -22,7 +22,7 @@ class Tests_Formatting_Utf8UriEncode extends WP_UnitTestCase { */ 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 ) ) ); } public function data() { diff --git a/tests/phpunit/tests/l10n/wpTranslationsConvert.php b/tests/phpunit/tests/l10n/wpTranslationsConvert.php index ea318eb329..cd046fdb80 100644 --- a/tests/phpunit/tests/l10n/wpTranslationsConvert.php +++ b/tests/phpunit/tests/l10n/wpTranslationsConvert.php @@ -501,7 +501,7 @@ class WP_Translation_Controller_Convert_Tests extends WP_UnitTestCase { $this->assertInstanceOf( WP_Translation_File::class, $destination ); $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 ); diff --git a/tests/phpunit/tests/multisite/site.php b/tests/phpunit/tests/multisite/site.php index 714035999f..097f5fb6e2 100644 --- a/tests/phpunit/tests/multisite/site.php +++ b/tests/phpunit/tests/multisite/site.php @@ -1213,7 +1213,7 @@ if ( is_multisite() ) : if ( isset( $expected_data[ $key ] ) ) { $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 ); } diff --git a/tests/phpunit/tests/oembed/controller.php b/tests/phpunit/tests/oembed/controller.php index bef51f5953..dfaf462841 100644 --- a/tests/phpunit/tests/oembed/controller.php +++ b/tests/phpunit/tests/oembed/controller.php @@ -342,7 +342,7 @@ class Test_oEmbed_Controller extends WP_UnitTestCase { $this->assertSame( get_author_posts_url( $user->ID, $user->user_nicename ), $data['author_url'] ); $this->assertSame( $post->post_title, $data['title'] ); $this->assertSame( 'rich', $data['type'] ); - $this->assertTrue( $data['width'] <= $request['maxwidth'] ); + $this->assertLessThanOrEqual( $request['maxwidth'], $data['width'] ); } /** @@ -385,7 +385,7 @@ class Test_oEmbed_Controller extends WP_UnitTestCase { $this->assertSame( home_url(), $data['author_url'] ); $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' ); } @@ -430,7 +430,7 @@ class Test_oEmbed_Controller extends WP_UnitTestCase { $this->assertSame( get_author_posts_url( $user->ID, $user->user_nicename ), $data['author_url'] ); $this->assertSame( $post->post_title, $data['title'] ); $this->assertSame( 'rich', $data['type'] ); - $this->assertTrue( $data['width'] <= $request['maxwidth'] ); + $this->assertLessThanOrEqual( $request['maxwidth'], $data['width'] ); } /** @@ -716,7 +716,7 @@ class Test_oEmbed_Controller extends WP_UnitTestCase { $this->assertSame( get_author_posts_url( $user->ID, $user->user_nicename ), $data['author_url'] ); $this->assertSame( $post->post_title, $data['title'] ); $this->assertSame( 'rich', $data['type'] ); - $this->assertTrue( $data['width'] <= $request['maxwidth'] ); + $this->assertLessThanOrEqual( $request['maxwidth'], $data['width'] ); } /** @@ -765,7 +765,7 @@ class Test_oEmbed_Controller extends WP_UnitTestCase { $this->assertSame( home_url(), $data['author_url'] ); $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' ); } diff --git a/tests/phpunit/tests/oembed/getResponseData.php b/tests/phpunit/tests/oembed/getResponseData.php index d782014b25..7cd5b1cc66 100644 --- a/tests/phpunit/tests/oembed/getResponseData.php +++ b/tests/phpunit/tests/oembed/getResponseData.php @@ -248,7 +248,7 @@ class Tests_oEmbed_Response_Data extends WP_UnitTestCase { $this->assertArrayHasKey( 'thumbnail_url', $data ); $this->assertArrayHasKey( 'thumbnail_width', $data ); $this->assertArrayHasKey( 'thumbnail_height', $data ); - $this->assertTrue( 400 >= $data['thumbnail_width'] ); + $this->assertLessThanOrEqual( 400, $data['thumbnail_width'] ); } public function test_get_oembed_response_data_for_attachment() { @@ -267,6 +267,6 @@ class Tests_oEmbed_Response_Data extends WP_UnitTestCase { $this->assertArrayHasKey( 'thumbnail_url', $data ); $this->assertArrayHasKey( 'thumbnail_width', $data ); $this->assertArrayHasKey( 'thumbnail_height', $data ); - $this->assertTrue( 400 >= $data['thumbnail_width'] ); + $this->assertLessThanOrEqual( 400, $data['thumbnail_width'] ); } }