Changeset 51698

Timestamp:

08/30/2021 08:40:05 PM (2 years ago)

Author:

hellofromTonya

Message:

Tests: Do whitespace replacement in assertDiscardWhitespace() only when string.

The assertDiscardWhitespace() method uses assertEquals() under the hood, meaning that in reality any type of actual/expected value should be accepted by the function. Fixed the documentation to reflect that.

At the same time, only strings can contain whitespace differences. So the whitespace replacement should only be done when string values are passed.

This change (a) prevents potential passing null to non-nullable errors on PHP 8.1, if either of the inputs would turn out to be null and (b) increases tests stability.

Follow-up to [35003], [44902].

Props jrf.
See #53363.

File:

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

trunk/tests/phpunit/includes/abstract-testcase.php

@@ -702 +702 @@
      * @since 5.9.0 Added the `$message` parameter.
      *
-     * @param string $expected The expected value.
-     * @param string $actual   The actual value.
+     * @param mixed  $expected The expected value.
+     * @param mixed  $actual   The actual value.
      * @param string $message  Optional. Message to display when the assertion fails.
      */
     public function assertDiscardWhitespace( $expected, $actual, $message = '' ) {
-        $this->assertEquals( preg_replace( '/\s*/', '', $expected ), preg_replace( '/\s*/', '', $actual ), $message );
+        if ( is_string( $expected ) ) {
+            $expected = preg_replace( '/\s*/', '', $expected );
+        }
+
+        if ( is_string( $actual ) ) {
+            $actual = preg_replace( '/\s*/', '', $actual );
+        }
+
+        $this->assertEquals( $expected, $actual, $message );
     }