mirror
/
PHPMailer
mirror of https://github.com/PHPMailer/PHPMailer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tests/reorganize: move custom header tests to own file

This commit is contained in:
jrfnl 2021-07-04 02:17:05 +02:00
parent 2aa2614e5d
commit ce0c31cea7
2 changed files with 82 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
test/PHPMailer/CustomHeaderTest.php Normal file
View File

@ -0,0 +1,82 @@
<?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\Exception;
use PHPMailer\PHPMailer\PHPMailer;
use PHPMailer\Test\TestCase;
/**
* Test custom header functionality.
*/
final class CustomHeaderTest extends TestCase
{
/**
* Tests the Custom header getter.
*/
public function testCustomHeaderGetter()
{
$this->Mail->addCustomHeader('foo', 'bar');
self::assertSame([['foo', 'bar']], $this->Mail->getCustomHeaders());
$this->Mail->addCustomHeader('foo', 'baz');
self::assertSame(
[
['foo', 'bar'],
['foo', 'baz'],
],
$this->Mail->getCustomHeaders()
);
$this->Mail->clearCustomHeaders();
self::assertEmpty($this->Mail->getCustomHeaders());
$this->Mail->addCustomHeader('yux');
self::assertSame([['yux', '']], $this->Mail->getCustomHeaders());
$this->Mail->addCustomHeader('Content-Type: application/json');
self::assertSame(
[
['yux', ''],
['Content-Type', 'application/json'],
],
$this->Mail->getCustomHeaders()
);
$this->Mail->clearCustomHeaders();
$this->Mail->addCustomHeader('SomeHeader: Some Value');
$headers = $this->Mail->getCustomHeaders();
self::assertSame(['SomeHeader', 'Some Value'], $headers[0]);
$this->Mail->clearCustomHeaders();
$this->Mail->addCustomHeader('SomeHeader', 'Some Value');
$headers = $this->Mail->getCustomHeaders();
self::assertSame(['SomeHeader', 'Some Value'], $headers[0]);
$this->Mail->clearCustomHeaders();
self::assertFalse($this->Mail->addCustomHeader('SomeHeader', "Some\n Value"));
self::assertFalse($this->Mail->addCustomHeader("Some\nHeader", 'Some Value'));
}
/**
* Check whether setting a bad custom header throws exceptions.
*
* @throws Exception
*/
public function testHeaderException()
{
$this->expectException(Exception::class);
$mail = new PHPMailer(true);
$mail->addCustomHeader('SomeHeader', "Some\n Value");
}
}

57
test/PHPMailer/PHPMailerTest.php
View File

@ -1232,19 +1232,6 @@ EOT;
self::assertTrue($this->Mail->send());
}
/**
* Check whether setting a bad custom header throws exceptions.
*
* @throws Exception
*/
public function testHeaderException()
{
$this->expectException(Exception::class);
$mail = new PHPMailer(true);
$mail->addCustomHeader('SomeHeader', "Some\n Value");
}
/**
* Miscellaneous calls to improve test coverage and some small tests.
*/
@ -1272,50 +1259,6 @@ EOT;
self::assertFalse($smtp->mail("somewhere\nbad"), 'Bad SMTP command containing breaks accepted');
}
/**
* Tests the Custom header getter.
*/
public function testCustomHeaderGetter()
{
$this->Mail->addCustomHeader('foo', 'bar');
self::assertSame([['foo', 'bar']], $this->Mail->getCustomHeaders());
$this->Mail->addCustomHeader('foo', 'baz');
self::assertSame(
[
['foo', 'bar'],
['foo', 'baz'],
],
$this->Mail->getCustomHeaders()
);
$this->Mail->clearCustomHeaders();
self::assertEmpty($this->Mail->getCustomHeaders());
$this->Mail->addCustomHeader('yux');
self::assertSame([['yux', '']], $this->Mail->getCustomHeaders());
$this->Mail->addCustomHeader('Content-Type: application/json');
self::assertSame(
[
['yux', ''],
['Content-Type', 'application/json'],
],
$this->Mail->getCustomHeaders()
);
$this->Mail->clearCustomHeaders();
$this->Mail->addCustomHeader('SomeHeader: Some Value');
$headers = $this->Mail->getCustomHeaders();
self::assertSame(['SomeHeader', 'Some Value'], $headers[0]);
$this->Mail->clearCustomHeaders();
$this->Mail->addCustomHeader('SomeHeader', 'Some Value');
$headers = $this->Mail->getCustomHeaders();
self::assertSame(['SomeHeader', 'Some Value'], $headers[0]);
$this->Mail->clearCustomHeaders();
self::assertFalse($this->Mail->addCustomHeader('SomeHeader', "Some\n Value"));
self::assertFalse($this->Mail->addCustomHeader("Some\nHeader", 'Some Value'));
}
/**
* Tests setting and retrieving ConfirmReadingTo address, also known as "read receipt" address.
*/