Changeset 46612 for trunk/tests/phpunit/includes/abstract-testcase.php

Timestamp:

10/29/2019 02:26:41 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Build/Test Tools: Ignore EOL differences in tests using multiline string assertions.

Unix vs. Windows EOL style mismatches can cause misleading failures in tests using the heredoc syntax (<<<) or multiline strings as the expected result.

Fixes #31432. See #42594, #47411.

File:

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

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

@@ -634 +634 @@
     public function assertDiscardWhitespace( $expected, $actual ) {
         $this->assertEquals( preg_replace( '/\s*/', '', $expected ), preg_replace( '/\s*/', '', $actual ) );
+    }
+
+    /**
+     * Asserts that two values are equal, with EOL differences discarded.
+     *
+     * @since 5.4.0
+     *
+     * @param string $expected The expected value.
+     * @param string $actual   The actual value.
+     */
+    public function assertEqualsIgnoreEOL( $expected, $actual ) {
+        $this->assertEquals( str_replace( "\r\n", "\n", $expected ), str_replace( "\r\n", "\n", $actual ) );
     }