<!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>[51451] trunk/tests/phpunit: Tests: Use more appropriate assertions in various 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/51451">51451</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/51451","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>2021-07-17 10:36:52 +0000 (Sat, 17 Jul 2021)</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 appropriate assertions in various tests.

This replaces instances of `assertTrue( strpos( ... ) > 0 )` with `assertStringContainsString()` to use native PHPUnit functionality.

Going forward, these methods introduced in PHPUnit 7.5 should be used for similar assertions:

* `assertStringContainsString()`

* `assertStringNotContainsString()`

As WordPress currently uses PHPUnit 5.7.x to run tests on PHP 5.6, polyfills for these methods are now added to the `WP_UnitTestCase` class for PHPUnit < 7.5.

Follow-up to <a href="https://core.trac.wordpress.org/changeset/51335">[51335]</a>, <a href="https://core.trac.wordpress.org/changeset/51337">[51337]</a>, <a href="https://core.trac.wordpress.org/changeset/51367">[51367]</a>, <a href="https://core.trac.wordpress.org/changeset/51397">[51397]</a>, <a href="https://core.trac.wordpress.org/changeset/51403">[51403]</a>, <a href="https://core.trac.wordpress.org/changeset/51404">[51404]</a>, <a href="https://core.trac.wordpress.org/changeset/51436">[51436]</a>, <a href="https://core.trac.wordpress.org/changeset/51438">[51438]</a>, <a href="https://core.trac.wordpress.org/changeset/51448">[51448]</a>, <a href="https://core.trac.wordpress.org/changeset/51449">[51449]</a>.

See <a href="https://core.trac.wordpress.org/ticket/53363">#53363</a>.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunktestsphpunitincludestestcasephp">trunk/tests/phpunit/includes/testcase.php</a></li>

<li><a href="#trunktestsphpunittestsajaxAutosavephp">trunk/tests/phpunit/tests/ajax/Autosave.php</a></li>

<li><a href="#trunktestsphpunittestsimageintermediateSizephp">trunk/tests/phpunit/tests/image/intermediateSize.php</a></li>

<li><a href="#trunktestsphpunittestsmailphp">trunk/tests/phpunit/tests/mail.php</a></li>

<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>

<li><a href="#trunktestsphpunittestsoembedtemplatephp">trunk/tests/phpunit/tests/oembed/template.php</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunktestsphpunitincludestestcasephp"></a>

<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/testcase.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/testcase.php 2021-07-17 10:23:57 UTC (rev 51450)

+++ trunk/tests/phpunit/includes/testcase.php   2021-07-17 10:36:52 UTC (rev 51451)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -372,4 +372,36 @@

</span><span class="cx" style="display: block; padding: 0 10px">        public static function assertIsNotIterable( $actual, $message = '' ) {

</span><span class="cx" style="display: block; padding: 0 10px">                static::assertFalse( is_iterable( $actual ), $message );

</span><span class="cx" style="display: block; padding: 0 10px">        }

</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+

+       /**

+        * Asserts that a string haystack contains a needle.

+        *

+        * This method has been backported from a more recent PHPUnit version,

+        * as tests running on PHP 5.6 use PHPUnit 5.7.x.

+        *

+        * @since 5.9.0

+        *

+        * @param string $needle   The string to search for.

+        * @param string $haystack The string to treat as the haystack.

+        * @param string $message  Optional. Message to display when the assertion fails.

+        */

+       public static function assertStringContainsString( $needle, $haystack, $message = '' ) {

+               static::assertContains( $needle, $haystack, $message );

+       }

+

+       /**

+        * Asserts that a string haystack does not contain a needle.

+        *

+        * This method has been backported from a more recent PHPUnit version,

+        * as tests running on PHP 5.6 use PHPUnit 5.7.x.

+        *

+        * @since 5.9.0

+        *

+        * @param string $needle   The string to search for.

+        * @param string $haystack The string to treat as the haystack.

+        * @param string $message  Optional. Message to display when the assertion fails.

+        */

+       public static function assertStringNotContainsString( $needle, $haystack, $message = '' ) {

+               static::assertNotContains( $needle, $haystack, $message );

+       }

</ins><span class="cx" style="display: block; padding: 0 10px"> }

</span></span></pre></div>

<a id="trunktestsphpunittestsajaxAutosavephp"></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/ajax/Autosave.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/Autosave.php       2021-07-17 10:23:57 UTC (rev 51450)

+++ trunk/tests/phpunit/tests/ajax/Autosave.php 2021-07-17 10:36:52 UTC (rev 51451)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,7 +79,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check that the edit happened.

</span><span class="cx" style="display: block; padding: 0 10px">                $post = get_post( self::$post_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertNotFalse( strpos( $post->post_content, $md5 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertStringContainsString( $md5, $post->post_content );

</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">@@ -125,12 +125,12 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check that the original post was NOT edited.

</span><span class="cx" style="display: block; padding: 0 10px">                $post = get_post( self::$post_id );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertFalse( strpos( $post->post_content, $md5 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertStringNotContainsString( $md5, $post->post_content );

</ins><span class="cx" style="display: block; padding: 0 10px"> 

<span class="cx" style="display: block; padding: 0 10px">                // Check if the autosave post was created.

</span><span class="cx" style="display: block; padding: 0 10px">                $autosave = wp_get_post_autosave( self::$post_id, get_current_user_id() );

</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertNotEmpty( $autosave );

</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertNotFalse( strpos( $autosave->post_content, $md5 ) );

</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertStringContainsString( $md5, $autosave->post_content );

</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></pre></div>

<a id="trunktestsphpunittestsimageintermediateSizephp"></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/image/intermediateSize.php</h4>

<pre class="diff"><span>

<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/intermediateSize.php      2021-07-17 10:23:57 UTC (rev 51450)

+++ trunk/tests/phpunit/tests/image/intermediateSize.php        2021-07-17 10:36:52 UTC (rev 51451)

</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@

</span><span class="cx" style="display: block; padding: 0 10px"> 

</span><span class="cx" style="display: block; padding: 0 10px">                // Test for the expected string because the array will by definition