Changeset 51451 for trunk/tests/phpunit/includes/testcase.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/includes/testcase.php (modified) (1 diff)

trunk/tests/phpunit/includes/testcase.php

@@ -373 +373 @@
                 static::assertFalse( is_iterable( $actual ), $message );
         }
+
+        /**
+         * 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 );
+        }
 }