Changeset 48466

Timestamp:

07/14/2020 01:40:33 AM (4 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 [46612], [48443].

See #31432.

Location:

trunk/tests/phpunit/tests

Files:

• dependencies/scripts.php (modified) (1 diff)
• functions/cleanupHeaderComment.php (modified) (1 diff)

trunk/tests/phpunit/tests/dependencies/scripts.php

@@ -753 +753 @@
         );
 
-        $this->assertEquals( $expected, $print_scripts );
+        $this->assertEqualsIgnoreEOL( $expected, $print_scripts );
     }
 

trunk/tests/phpunit/tests/functions/cleanupHeaderComment.php

@@ -18 +18 @@
      */
     public function test_cleanup_header_comment( $test_string, $expected ) {
-        $this->assertEquals( $expected, _cleanup_header_comment( $test_string ) );
+        $this->assertEqualsIgnoreEOL( $expected, _cleanup_header_comment( $test_string ) );
     }