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

Timestamp:

06/09/2021 07:41:47 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Tests: Ignore EOL differences in some 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.

Follow-up to [48466], [50995], [51079].

See #52625.

File:

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

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

@@ -661 +661 @@
          *
          * @since 5.6.0
-         *
-         * @param string $expected The expected value.
-         * @param string $actual   The actual value.
+         * @since 5.8.0 Added support for nested arrays.
+         *
+         * @param string|array $expected The expected value.
+         * @param string|array $actual   The actual value.
          */
         public function assertSameIgnoreEOL( $expected, $actual ) {
-                $this->assertSame( str_replace( "\r\n", "\n", $expected ), str_replace( "\r\n", "\n", $actual ) );
+                $expected = map_deep(
+                        $expected,
+                        function ( $value ) {
+                                return str_replace( "\r\n", "\n", $value );
+                        }
+                );
+
+                $actual = map_deep(
+                        $actual,
+                        function ( $value ) {
+                                return str_replace( "\r\n", "\n", $value );
+                        }
+                );
+
+                $this->assertSame( $expected, $actual );
         }