From 0f916dd90abcc2f5f14e7b02d8e1e708d9065bdd Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Fri, 25 Jun 2021 15:54:54 +0200
Subject: [PATCH] Tests/reorganize: move line break normalization tests to own
 file

As this test does not actually need an instantiated PHPMailer object, this class extends the `Yoast\PHPUnitPolyfills\TestCases\TestCase` instead of the `PHPMailer\Test\TestCase`.

Note: this doesn't move the complete tests from the original test file, just select parts of two test methods.
---
 test/PHPMailer/NormalizeBreaksTest.php | 56 ++++++++++++++++++++++++++
 test/PHPMailer/PHPMailerTest.php       | 19 ---------
 2 files changed, 56 insertions(+), 19 deletions(-)
 create mode 100644 test/PHPMailer/NormalizeBreaksTest.php

diff --git a/test/PHPMailer/NormalizeBreaksTest.php b/test/PHPMailer/NormalizeBreaksTest.php
new file mode 100644
index 00000000..a7bd9202
--- /dev/null
+++ b/test/PHPMailer/NormalizeBreaksTest.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * PHPMailer - PHP email transport unit tests.
+ * PHP version 5.5.
+ *
+ * @author    Marcus Bointon <phpmailer@synchromedia.co.uk>
+ * @author    Andy Prevost
+ * @copyright 2012 - 2020 Marcus Bointon
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ */
+
+namespace PHPMailer\Test\PHPMailer;
+
+use PHPMailer\PHPMailer\PHPMailer;
+use Yoast\PHPUnitPolyfills\TestCases\TestCase;
+
+/**
+ * Test normalize line breaks functionality.
+ */
+final class NormalizeBreaksTest extends TestCase
+{
+
+    /**
+     * Test line break reformatting.
+     */
+    public function testLineBreaks()
+    {
+        $unixsrc = "hello\nWorld\nAgain\n";
+        $macsrc = "hello\rWorld\rAgain\r";
+        $windowssrc = "hello\r\nWorld\r\nAgain\r\n";
+        $mixedsrc = "hello\nWorld\rAgain\r\n";
+        $target = "hello\r\nWorld\r\nAgain\r\n";
+        self::assertSame($target, PHPMailer::normalizeBreaks($unixsrc), 'UNIX break reformatting failed');
+        self::assertSame($target, PHPMailer::normalizeBreaks($macsrc), 'Mac break reformatting failed');
+        self::assertSame($target, PHPMailer::normalizeBreaks($windowssrc), 'Windows break reformatting failed');
+        self::assertSame($target, PHPMailer::normalizeBreaks($mixedsrc), 'Mixed break reformatting failed');
+    }
+
+    /**
+     * Miscellaneous calls to improve test coverage and some small tests.
+     */
+    public function testMiscellaneous()
+    {
+        //Line break normalization
+        $eol = PHPMailer::getLE();
+        $b1 = "1\r2\r3\r";
+        $b2 = "1\n2\n3\n";
+        $b3 = "1\r\n2\r3\n";
+        $t1 = "1{$eol}2{$eol}3{$eol}";
+        self::assertSame($t1, PHPMailer::normalizeBreaks($b1), 'Failed to normalize line breaks (1)');
+        self::assertSame($t1, PHPMailer::normalizeBreaks($b2), 'Failed to normalize line breaks (2)');
+        self::assertSame($t1, PHPMailer::normalizeBreaks($b3), 'Failed to normalize line breaks (3)');
+    }
+}
diff --git a/test/PHPMailer/PHPMailerTest.php b/test/PHPMailer/PHPMailerTest.php
index 3365ebc6..6cd4fadf 100644
--- a/test/PHPMailer/PHPMailerTest.php
+++ b/test/PHPMailer/PHPMailerTest.php
@@ -1298,15 +1298,6 @@ EOT;
         //May have been altered by earlier tests, can interfere with line break format
         $this->Mail->isSMTP();
         $this->Mail->preSend();
-        $unixsrc = "hello\nWorld\nAgain\n";
-        $macsrc = "hello\rWorld\rAgain\r";
-        $windowssrc = "hello\r\nWorld\r\nAgain\r\n";
-        $mixedsrc = "hello\nWorld\rAgain\r\n";
-        $target = "hello\r\nWorld\r\nAgain\r\n";
-        self::assertSame($target, PHPMailer::normalizeBreaks($unixsrc), 'UNIX break reformatting failed');
-        self::assertSame($target, PHPMailer::normalizeBreaks($macsrc), 'Mac break reformatting failed');
-        self::assertSame($target, PHPMailer::normalizeBreaks($windowssrc), 'Windows break reformatting failed');
-        self::assertSame($target, PHPMailer::normalizeBreaks($mixedsrc), 'Mixed break reformatting failed');
 
         //To see accurate results when using postfix, set `sendmail_fix_line_endings = never` in main.cf
         $this->Mail->Subject = 'PHPMailer DOS line breaks';
@@ -1394,16 +1385,6 @@ EOT;
             PHPMailer::filenameToType('abc.xyzpdq'),
             'Default MIME type not applied to unknown extension'
         );
-
-        //Line break normalization
-        $eol = PHPMailer::getLE();
-        $b1 = "1\r2\r3\r";
-        $b2 = "1\n2\n3\n";
-        $b3 = "1\r\n2\r3\n";
-        $t1 = "1{$eol}2{$eol}3{$eol}";
-        self::assertSame($t1, PHPMailer::normalizeBreaks($b1), 'Failed to normalize line breaks (1)');
-        self::assertSame($t1, PHPMailer::normalizeBreaks($b2), 'Failed to normalize line breaks (2)');
-        self::assertSame($t1, PHPMailer::normalizeBreaks($b3), 'Failed to normalize line breaks (3)');
     }
 
     public function testBadSMTP()