Changeset 50986

Timestamp:

05/25/2021 01:07:43 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Minimize the chances of signature conflicts for assertEqualsWithDelta().

The PHPUnit 7.5+ method assertEqualsWithDelta() was polyfilled for PHPUnit < 7.5, but also overloaded for PHPUnit 7.5 itself, which was not necessary and created a higher chance of signature conflicts, especially when the WP test suite is used as a basis for integration tests with plugins/themes.

This change removes the unnecessary overloading for PHPUnit 7.5+ and simplifies the overloaded method for PHPUnit < 7.5, including removing the IsEqual() class alias declaration, no longer needed.

Follow-up to [48952].

Props jrf.
See #52625.

Location:

trunk/tests/phpunit/includes

Files:

• bootstrap.php (modified) (1 diff)
• phpunit6/compat.php (modified) (1 diff)
• phpunit7/testcase.php (modified) (1 diff)
• testcase.php (modified) (1 diff)

trunk/tests/phpunit/includes/bootstrap.php

@@ -194 +194 @@
 _delete_all_posts();
 
-if ( version_compare( tests_get_phpunit_version(), '7.0', '>=' ) ) {
+if ( version_compare( tests_get_phpunit_version(), '7.5', '>=' ) ) {
     require __DIR__ . '/phpunit7/testcase.php';
 } else {

trunk/tests/phpunit/includes/phpunit6/compat.php

@@ -12 +12 @@
     class_alias( 'PHPUnit\Framework\Warning', 'PHPUnit_Framework_Warning' );
     class_alias( 'PHPUnit\Framework\AssertionFailedError', 'PHPUnit_Framework_AssertionFailedError' );
-    class_alias( 'PHPUnit\Framework\Constraint\IsEqual', 'PHPUnit_Framework_Constraint_IsEqual' );
     class_alias( 'PHPUnit\Framework\TestSuite', 'PHPUnit_Framework_TestSuite' );
     class_alias( 'PHPUnit\Framework\TestListener', 'PHPUnit_Framework_TestListener' );

trunk/tests/phpunit/includes/phpunit7/testcase.php

@@ -12 +12 @@
  * All WordPress unit tests should inherit from this class.
  */
-class WP_UnitTestCase extends WP_UnitTestCase_Base {
-
-    /**
-     * Asserts that two variables are equal (with delta).
-     *
-     * 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.6.0
-     *
-     * @param mixed  $expected First value to compare.
-     * @param mixed  $actual   Second value to compare.
-     * @param float  $delta    Allowed numerical distance between two values to consider them equal.
-     * @param string $message  Optional. Message to display when the assertion fails.
-     *
-     * @throws ExpectationFailedException
-     * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
-     */
-    public static function assertEqualsWithDelta( $expected, $actual, float $delta, string $message = '' ): void {
-        $constraint = new PHPUnit\Framework\Constraint\IsEqual(
-            $expected,
-            $delta
-        );
-
-        static::assertThat( $actual, $constraint, $message );
-    }
-}
+class WP_UnitTestCase extends WP_UnitTestCase_Base {}

trunk/tests/phpunit/includes/testcase.php

@@ -31 +31 @@
      */
     public static function assertEqualsWithDelta( $expected, $actual, $delta, $message = '' ) {
-        $constraint = new PHPUnit_Framework_Constraint_IsEqual(
-            $expected,
-            $delta
-        );
-
-        static::assertThat( $actual, $constraint, $message );
+        static::assertEquals( $expected, $actual, $message, $delta );
     }
 }