<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[58235] trunk/tests/phpunit/tests: Tests: Use more specific assertions in a few tests.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/58235">58235</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/58235","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-05-29 12:20:56 +0000 (Wed, 29 May 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Tests: Use more specific assertions in a few tests.
Follow-up to [121/tests], [915/tests], <a href="https://core.trac.wordpress.org/changeset/34903">[34903]</a>, <a href="https://core.trac.wordpress.org/changeset/36307">[36307]</a>, <a href="https://core.trac.wordpress.org/changeset/43548">[43548]</a>, <a href="https://core.trac.wordpress.org/changeset/44154">[44154]</a>, <a href="https://core.trac.wordpress.org/changeset/52286">[52286]</a>, <a href="https://core.trac.wordpress.org/changeset/57337">[57337]</a>.
See <a href="https://core.trac.wordpress.org/ticket/60705">#60705</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsblocktemplateutilsphp">trunk/tests/phpunit/tests/block-template-utils.php</a></li>
<li><a href="#trunktestsphpunittestsformattingutf8UriEncodephp">trunk/tests/phpunit/tests/formatting/utf8UriEncode.php</a></li>
<li><a href="#trunktestsphpunittestsl10nwpTranslationsConvertphp">trunk/tests/phpunit/tests/l10n/wpTranslationsConvert.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitesitephp">trunk/tests/phpunit/tests/multisite/site.php</a></li>
<li><a href="#trunktestsphpunittestsoembedcontrollerphp">trunk/tests/phpunit/tests/oembed/controller.php</a></li>
<li><a href="#trunktestsphpunittestsoembedgetResponseDataphp">trunk/tests/phpunit/tests/oembed/getResponseData.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsblocktemplateutilsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/block-template-utils.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/block-template-utils.php 2024-05-29 11:55:27 UTC (rev 58234)
+++ trunk/tests/phpunit/tests/block-template-utils.php 2024-05-29 12:20:56 UTC (rev 58235)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,7 +379,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_generate_block_templates_export_file() {
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = wp_generate_block_templates_export_file();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFileExists( $filename, 'zip file is created at the specified path' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( filesize( $filename ) > 0, 'zip file is larger than 0 bytes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertGreaterThan( 0, filesize( $filename ), 'zip file is larger than 0 bytes' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Open ZIP file and make sure the directories exist.
</span><span class="cx" style="display: block; padding: 0 10px"> $zip = new ZipArchive();
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingutf8UriEncodephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/formatting/utf8UriEncode.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/utf8UriEncode.php 2024-05-29 11:55:27 UTC (rev 58234)
+++ trunk/tests/phpunit/tests/formatting/utf8UriEncode.php 2024-05-29 12:20:56 UTC (rev 58235)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_output_is_not_longer_than_optional_length_argument( $utf8, $unused_for_this_test ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $max_length = 30;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( strlen( utf8_uri_encode( $utf8, $max_length ) ) <= $max_length );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertLessThanOrEqual( $max_length, strlen( utf8_uri_encode( $utf8, $max_length ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function data() {
</span></span></pre></div>
<a id="trunktestsphpunittestsl10nwpTranslationsConvertphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/l10n/wpTranslationsConvert.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/l10n/wpTranslationsConvert.php 2024-05-29 11:55:27 UTC (rev 58234)
+++ trunk/tests/phpunit/tests/l10n/wpTranslationsConvert.php 2024-05-29 12:20:56 UTC (rev 58235)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -501,7 +501,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( WP_Translation_File::class, $destination );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $destination->error() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( filesize( $destination_file ) > 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertGreaterThan( 0, filesize( $destination_file ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $destination_read = WP_Translation_File::create( $destination_file, $destination_format );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitesitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/site.php 2024-05-29 11:55:27 UTC (rev 58234)
+++ trunk/tests/phpunit/tests/multisite/site.php 2024-05-29 12:20:56 UTC (rev 58235)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1213,7 +1213,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $expected_data[ $key ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected_data[ $key ], $value );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'last_updated' === $key ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( $old_site->last_updated <= $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertLessThanOrEqual( $value, $old_site->last_updated );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $old_site->$key, $value );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedcontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/oembed/controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/controller.php 2024-05-29 11:55:27 UTC (rev 58234)
+++ trunk/tests/phpunit/tests/oembed/controller.php 2024-05-29 12:20:56 UTC (rev 58235)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,7 +342,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( get_author_posts_url( $user->ID, $user->user_nicename ), $data['author_url'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $post->post_title, $data['title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'rich', $data['type'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( $data['width'] <= $request['maxwidth'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertLessThanOrEqual( $request['maxwidth'], $data['width'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,7 +385,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( home_url(), $data['author_url'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $post->post_title, $data['title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'rich', $data['type'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( $data['width'] <= $request['maxwidth'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertLessThanOrEqual( $request['maxwidth'], $data['width'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'show_on_front', 'posts' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -430,7 +430,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( get_author_posts_url( $user->ID, $user->user_nicename ), $data['author_url'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $post->post_title, $data['title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'rich', $data['type'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( $data['width'] <= $request['maxwidth'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertLessThanOrEqual( $request['maxwidth'], $data['width'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -716,7 +716,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( get_author_posts_url( $user->ID, $user->user_nicename ), $data['author_url'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $post->post_title, $data['title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'rich', $data['type'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( $data['width'] <= $request['maxwidth'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertLessThanOrEqual( $request['maxwidth'], $data['width'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -765,7 +765,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( home_url(), $data['author_url'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $post->post_title, $data['title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'rich', $data['type'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( $data['width'] <= $request['maxwidth'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertLessThanOrEqual( $request['maxwidth'], $data['width'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'show_on_front', 'posts' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsoembedgetResponseDataphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/oembed/getResponseData.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/oembed/getResponseData.php 2024-05-29 11:55:27 UTC (rev 58234)
+++ trunk/tests/phpunit/tests/oembed/getResponseData.php 2024-05-29 12:20:56 UTC (rev 58235)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,7 +248,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'thumbnail_url', $data );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'thumbnail_width', $data );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'thumbnail_height', $data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( 400 >= $data['thumbnail_width'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertLessThanOrEqual( 400, $data['thumbnail_width'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_oembed_response_data_for_attachment() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -267,6 +267,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'thumbnail_url', $data );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'thumbnail_width', $data );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'thumbnail_height', $data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( 400 >= $data['thumbnail_width'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertLessThanOrEqual( 400, $data['thumbnail_width'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>