Changeset 51451 for trunk/tests/phpunit/tests/oembed/template.php

Timestamp:

07/17/2021 10:36:52 AM (3 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/oembed/template.php (modified) (8 diffs)

trunk/tests/phpunit/tests/oembed/template.php

@@ -33 +33 @@
         $doc = new DOMDocument();
         $this->assertTrue( $doc->loadHTML( $actual ) );
-        $this->assertFalse( strpos( $actual, 'That embed can’t be found.' ) );
-        $this->assertNotFalse( strpos( $actual, 'Hello World' ) );
+        $this->assertStringNotContainsString( 'That embed can’t be found.', $actual );
+        $this->assertStringContainsString( 'Hello World', $actual );
     }
 
@@ -65 +65 @@
         $doc = new DOMDocument();
         $this->assertTrue( $doc->loadHTML( $actual ) );
-        $this->assertFalse( strpos( $actual, 'That embed can’t be found.' ) );
-        $this->assertNotFalse( strpos( $actual, 'Hello World' ) );
-        $this->assertNotFalse( strpos( $actual, 'canola.jpg' ) );
+        $this->assertStringNotContainsString( 'That embed can’t be found.', $actual );
+        $this->assertStringContainsString( 'Hello World', $actual );
+        $this->assertStringContainsString( 'canola.jpg', $actual );
     }
 
@@ -82 +82 @@
         $doc = new DOMDocument();
         $this->assertTrue( $doc->loadHTML( $actual ) );
-        $this->assertNotFalse( strpos( $actual, 'That embed can’t be found.' ) );
+        $this->assertStringContainsString( 'That embed can’t be found.', $actual );
     }
 
@@ -109 +109 @@
         $doc = new DOMDocument();
         $this->assertTrue( $doc->loadHTML( $actual ) );
-        $this->assertFalse( strpos( $actual, 'That embed can’t be found.' ) );
-        $this->assertNotFalse( strpos( $actual, 'Hello World' ) );
-        $this->assertNotFalse( strpos( $actual, 'canola.jpg' ) );
+        $this->assertStringNotContainsString( 'That embed can’t be found.', $actual );
+        $this->assertStringContainsString( 'Hello World', $actual );
+        $this->assertStringContainsString( 'canola.jpg', $actual );
     }
 
@@ -134 +134 @@
         $doc = new DOMDocument();
         $this->assertTrue( $doc->loadHTML( $actual ) );
-        $this->assertNotFalse( strpos( $actual, 'That embed can’t be found.' ) );
+        $this->assertStringContainsString( 'That embed can’t be found.', $actual );
     }
 
@@ -158 +158 @@
         $doc = new DOMDocument();
         $this->assertTrue( $doc->loadHTML( $actual ) );
-        $this->assertNotFalse( strpos( $actual, 'That embed can’t be found.' ) );
+        $this->assertStringContainsString( 'That embed can’t be found.', $actual );
     }
 
@@ -181 +181 @@
         $doc = new DOMDocument();
         $this->assertTrue( $doc->loadHTML( $actual ) );
-        $this->assertNotFalse( strpos( $actual, 'That embed can’t be found.' ) );
+        $this->assertStringContainsString( 'That embed can’t be found.', $actual );
     }
 
@@ -208 +208 @@
         $doc = new DOMDocument();
         $this->assertTrue( $doc->loadHTML( $actual ) );
-        $this->assertFalse( strpos( $actual, 'That embed can’t be found.' ) );
-        $this->assertNotFalse( strpos( $actual, 'Hello World' ) );
+        $this->assertStringNotContainsString( 'That embed can’t be found.', $actual );
+        $this->assertStringContainsString( 'Hello World', $actual );
     }