Changeset 46612 for trunk/tests/phpunit/tests/pomo/po.php

Timestamp:

10/29/2019 02:26:41 PM (7 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/tests/pomo/po.php (modified) (10 diffs)

trunk/tests/phpunit/tests/pomo/po.php

@@ -23 +23 @@
 http://wordpress.org/
 ';
+                $this->mail    = str_replace( "\r\n", "\n", $this->mail );
                 $this->po_mail = '""
 "Your new WordPress blog has been successfully set up at:\n"
@@ -64 +65 @@
                 $this->assertEquals( '"Categories can be selectively converted to tags using the <a href=\\"%s\\">category to tag converter</a>."', $po->poify( $src ) );
 
-                $this->assertEquals( $this->po_mail, $po->poify( $this->mail ) );
+                $this->assertEqualsIgnoreEOL( $this->po_mail, $po->poify( $this->mail ) );
         }
 
@@ -75 +76 @@
                 // wordwrapped
                 $this->assertEquals( 'babadyado', $po->unpoify( "\"\"\n\"baba\"\n\"dyado\"" ) );
-                $this->assertEquals( $this->mail, $po->unpoify( $this->po_mail ) );
+                $this->assertEqualsIgnoreEOL( $this->mail, $po->unpoify( $this->po_mail ) );
         }
 
@@ -89 +90 @@
                         )
                 );
-                $this->assertEquals(
+                $this->assertEqualsIgnoreEOL(
                         'msgid "baba"
 msgid_plural "babas"
@@ -102 +103 @@
                         )
                 );
-                $this->assertEquals(
+                $this->assertEqualsIgnoreEOL(
                         '#  baba
 #  dyado
@@ -115 +116 @@
                         )
                 );
-                $this->assertEquals(
+                $this->assertEqualsIgnoreEOL(
                         '#. baba
 msgid "baba"
@@ -128 +129 @@
                         )
                 );
-                $this->assertEquals(
+                $this->assertEqualsIgnoreEOL(
                         '#. baba
 #: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28
@@ -159 +160 @@
                         )
                 );
-                $this->assertEquals(
+                $this->assertEqualsIgnoreEOL(
                         'msgid "baba"
 msgid_plural "babas"
@@ -173 +174 @@
                         )
                 );
-                $this->assertEquals(
+                $this->assertEqualsIgnoreEOL(
                         'msgid "baba"
 msgid_plural "babas"
@@ -191 +192 @@
                         )
                 );
-                $this->assertEquals(
+                $this->assertEqualsIgnoreEOL(
                         '#, fuzzy, php-format
 msgctxt "ctxt"