Changeset 48443

Timestamp:

07/11/2020 11:27:51 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Ignore EOL differences in email 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], [48033].

Props davidbaumwald.
See #31432, #41750.

File:

• trunk/tests/phpunit/tests/mail.php (modified) (5 diffs)

trunk/tests/phpunit/tests/mail.php

@@ -81 +81 @@
 
         // We need some better assertions here but these catch the failure for now.
-        $this->assertEquals( $body, $mailer->get_sent()->body );
+        $this->assertEqualsIgnoreEOL( $body, $mailer->get_sent()->body );
         $this->assertTrue( strpos( iconv_mime_decode_headers( ( $mailer->get_sent()->header ) )['Content-Type'][0], 'boundary="----=_Part_4892_25692638.1192452070893"' ) > 0 );
         $this->assertTrue( strpos( $mailer->get_sent()->header, 'charset=' ) > 0 );
@@ -113 +113 @@
         $this->assertEquals( 'bcc@bcc.com', $mailer->get_recipient( 'bcc' )->address );
         $this->assertEquals( 'The Blind Carbon Guy', $mailer->get_recipient( 'bcc' )->name );
-        $this->assertEquals( $message . "\n", $mailer->get_sent()->body );
+        $this->assertEqualsIgnoreEOL( $message . "\n", $mailer->get_sent()->body );
     }
 
@@ -133 +133 @@
         $this->assertEquals( 'another_address@different-tld.com', $mailer->get_recipient( 'to', 0, 1 )->address );
         $this->assertEquals( 'Another Name', $mailer->get_recipient( 'to', 0, 1 )->name );
-        $this->assertEquals( $message . "\n", $mailer->get_sent()->body );
+        $this->assertEqualsIgnoreEOL( $message . "\n", $mailer->get_sent()->body );
     }
 
@@ -146 +146 @@
         $this->assertEquals( 'address@tld.com', $mailer->get_recipient( 'to' )->address );
         $this->assertEquals( 'another_address@different-tld.com', $mailer->get_recipient( 'to', 0, 1 )->address );
-        $this->assertEquals( $message . "\n", $mailer->get_sent()->body );
+        $this->assertEqualsIgnoreEOL( $message . "\n", $mailer->get_sent()->body );
     }
 
@@ -161 +161 @@
         $mailer = tests_retrieve_phpmailer_instance();
         $this->assertEquals( 'address@tld.com', $mailer->get_recipient( 'to' )->address );
-        $this->assertEquals( $message . "\n", $mailer->get_sent()->body );
+        $this->assertEqualsIgnoreEOL( $message . "\n", $mailer->get_sent()->body );
     }