Changeset 50986 for trunk/tests/phpunit/includes/testcase.php

Timestamp:

05/25/2021 01:07:43 AM (5 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.

File:

• trunk/tests/phpunit/includes/testcase.php (modified) (1 diff)

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 );
     }
 }