Changeset 51451 for trunk/tests/phpunit/tests/mail.php

Timestamp:

07/17/2021 10:36:52 AM (5 years ago)

Author:

SergeyBiryukov

Message:

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 [51335], [51337], [51367], [51397], [51403], [51404], [51436], [51438], [51448], [51449].

See #53363.

File:

• trunk/tests/phpunit/tests/mail.php (modified) (7 diffs)

trunk/tests/phpunit/tests/mail.php

@@ -82 +82 @@
                 // We need some better assertions here but these catch the failure for now.
                 $this->assertSameIgnoreEOL( $body, $mailer->get_sent()->body );
-                $this->assertTrue( strpos( iconv_mime_decode_headers( ( $mailer->get_sent()->header ) )['Content-Type'][0], 'boundary="----=_Part_4892_25692638.1192452070893"' ) > 0 );
-                $this->assertTrue( strpos( $mailer->get_sent()->header, 'charset=' ) > 0 );
+                $this->assertStringContainsString( 'boundary="----=_Part_4892_25692638.1192452070893"', iconv_mime_decode_headers( ( $mailer->get_sent()->header ) )['Content-Type'][0] );
+                $this->assertStringContainsString( 'charset=', $mailer->get_sent()->header );
         }
 
@@ -191 +191 @@
 
                 $mailer = tests_retrieve_phpmailer_instance();
-                $this->assertTrue( strpos( $mailer->get_sent()->header, $expected ) > 0 );
+                $this->assertStringContainsString( $expected, $mailer->get_sent()->header );
         }
 
@@ -207 +207 @@
 
                 $mailer = tests_retrieve_phpmailer_instance();
-                $this->assertTrue( strpos( $mailer->get_sent()->header, $expected ) > 0 );
+                $this->assertStringContainsString( $expected, $mailer->get_sent()->header );
         }
 
@@ -223 +223 @@
 
                 $mailer = tests_retrieve_phpmailer_instance();
-                $this->assertTrue( strpos( $mailer->get_sent()->header, $expected ) > 0 );
+                $this->assertStringContainsString( $expected, $mailer->get_sent()->header );
         }
 
@@ -239 +239 @@
 
                 $mailer = tests_retrieve_phpmailer_instance();
-                $this->assertTrue( strpos( $mailer->get_sent()->header, $expected ) > 0 );
+                $this->assertStringContainsString( $expected, $mailer->get_sent()->header );
         }
 
@@ -255 +255 @@
 
                 $mailer = tests_retrieve_phpmailer_instance();
-                $this->assertTrue( strpos( $mailer->get_sent()->header, $expected ) > 0 );
+                $this->assertStringContainsString( $expected, $mailer->get_sent()->header );
         }
 
@@ -271 +271 @@
 
                 $mailer = tests_retrieve_phpmailer_instance();
-                $this->assertTrue( strpos( $mailer->get_sent()->header, $expected ) > 0 );
+                $this->assertStringContainsString( $expected, $mailer->get_sent()->header );
         }