From: Michael M Slusarz Date: Fri, 10 Sep 2010 16:49:08 +0000 (-0600) Subject: Finish converting MIME tests to PHPUnit. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=ac74b5e1c12c6eb0831c1f149d3018ea2d083f08;p=horde.git Finish converting MIME tests to PHPUnit. --- diff --git a/framework/Mime/package.xml b/framework/Mime/package.xml index f47fc3398..39c83f2ef 100644 --- a/framework/Mime/package.xml +++ b/framework/Mime/package.xml @@ -31,7 +31,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> alpha LGPL - * Moved viewer code to horde/Mime_Viewer package. + * Converted tests to PHPUnit. + * Moved viewer code to horde/Mime_Viewer package. * Removed Webcpp and Enscript viewers. Source code highlighting is now exclusively handled by the Srchighlight driver. * No need to generate Content-Transfer-Encoding header if part data is 7bit. @@ -68,24 +69,16 @@ http://pear.php.net/dtd/package-2.0.xsd"> - + + - - - - - - - - - diff --git a/framework/Mime/test/Horde/Mime/MagicTest.php b/framework/Mime/test/Horde/Mime/MagicTest.php index d3d4af800..3b49f561d 100644 --- a/framework/Mime/test/Horde/Mime/MagicTest.php +++ b/framework/Mime/test/Horde/Mime/MagicTest.php @@ -28,7 +28,7 @@ class Horde_Mime_MagicTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'text/plain', - Horde_Mime_Magic::analyzeFile(dirname(__FILE__) . '/fixtures/bug_325.txt') + Horde_Mime_Magic::analyzeFile(dirname(__FILE__) . '/fixtures/flowed_msg.txt') ); } diff --git a/framework/Mime/test/Horde/Mime/MailTest.php b/framework/Mime/test/Horde/Mime/MailTest.php new file mode 100644 index 000000000..188a058f7 --- /dev/null +++ b/framework/Mime/test/Horde/Mime/MailTest.php @@ -0,0 +1,483 @@ + + * @category Horde + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @package Mime + * @subpackage UnitTests + */ + +/** + * @author Michael Slusarz + * @category Horde + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @package Mime + * @subpackage UnitTests + */ +class Horde_Mime_MailTest extends PHPUnit_Framework_TestCase +{ + public function setUp() + { + $_SERVER['SERVER_NAME'] = 'mail.example.com'; + } + + public function testConstructor() + { + $mail = new Horde_Mime_Mail(array( + 'subject' => 'My Subject', + 'body' => "This is\nthe body", + 'to' => 'recipient@example.com', + 'from' => 'sender@example.com', + 'charset' => 'iso-8859-15' + )); + + $dummy = Horde_Mail::factory('Mock'); + $mail->send($dummy); + + // Need PHPUnit 3.5+ + if (method_exists($this, 'assertStringMatchesFormat')) { + $this->assertStringMatchesFormat( +'Subject: My Subject +To: recipient@example.com +From: sender@example.com +Message-ID: <%d.%s@mail.example.com> +User-Agent: Horde Application Framework 4 +Date: %s, %d %s %d %d:%d:%d %s%d +Content-Type: text/plain; charset=iso-8859-15; format=flowed; DelSp=Yes +MIME-Version: 1.0', + $dummy->sentMessages[0]['header_text'] + ); + } else { + $this->markTestSkipped(); + } + + $this->assertEquals( + "This is\nthe body", + $dummy->sentMessages[0]['body'] + ); + } + + public function testMethods() + { + $mail = new Horde_Mime_Mail(); + $mail->addHeader('Subject', 'My Subject'); + $mail->setBody("This is\nthe body", 'iso-8859-15'); + $mail->addHeader('To', 'recipient@example.com'); + $mail->addHeader('Cc', 'null@example.com'); + $mail->addHeader('Bcc', 'invisible@example.com'); + $mail->addHeader('From', 'sender@example.com'); + $mail->removeHeader('Cc'); + + $dummy = Horde_Mail::factory('Mock'); + $mail->send($dummy); + + // Need PHPUnit 3.5+ + if (method_exists($this, 'assertStringMatchesFormat')) { + $this->assertStringMatchesFormat( +'Subject: My Subject +To: recipient@example.com +From: sender@example.com +Message-ID: <%d.%s@mail.example.com> +User-Agent: Horde Application Framework 4 +Date: %s, %d %s %d %d:%d:%d %s%d +Content-Type: text/plain; charset=iso-8859-15; format=flowed; DelSp=Yes +MIME-Version: 1.0', + $dummy->sentMessages[0]['header_text'] + ); + } else { + $this->markTestSkipped(); + } + + $this->assertEquals( + "This is\nthe body", + $dummy->sentMessages[0]['body'] + ); + } + + public function testEncoding() + { + $mail = new Horde_Mime_Mail(array( + 'subject' => 'Schöner Betreff', + 'body' => "Hübsche Umlaute \n und Leerzeichen.", + 'to' => 'Empfänger ', + 'from' => 'sender@example.com', + 'charset' => 'iso-8859-1' + )); + $mail->addHeader('Cc', 'Der schöne Peter ', 'iso-8859-15'); + + $dummy = Horde_Mail::factory('Mock'); + $mail->send($dummy); + + // Need PHPUnit 3.5+ + if (method_exists($this, 'assertStringMatchesFormat')) { + $this->assertStringMatchesFormat( +'Subject: =?iso-8859-1?b?U2No9m5lcg==?= Betreff +To: =?iso-8859-1?b?RW1wZuRuZ2Vy?= +From: sender@example.com +Cc: Der =?iso-8859-15?b?c2No9m5l?= Peter +Message-ID: <%d.%s@mail.example.com> +User-Agent: Horde Application Framework 4 +Date: %s, %d %s %d %d:%d:%d %s%d +Content-Type: text/plain; charset=iso-8859-1; format=flowed; DelSp=Yes +MIME-Version: 1.0 +Content-Transfer-Encoding: quoted-printable', + $dummy->sentMessages[0]['header_text'] + ); + } else { + $this->markTestSkipped(); + } + + $this->assertEquals( + "H=FCbsche Umlaute\n und Leerzeichen.", + $dummy->sentMessages[0]['body'] + ); + } + + public function testAddPart() + { + $mail = new Horde_Mime_Mail(array( + 'subject' => 'My Subject', + 'body' => "This is\nthe body", + 'to' => 'recipient@example.com', + 'from' => 'sender@example.com', + 'charset' => 'iso-8859-15' + )); + $mail->addPart( + 'text/plain', + 'This is a plain text', + 'iso-8859-1', + 'inline' + ); + $mail->addPart( + 'application/octet-stream', + file_get_contents(dirname(__FILE__) . '/fixtures/attachment.bin'), + null, + 'attachment' + ); + + $dummy = Horde_Mail::factory('Mock'); + $mail->send($dummy); + + // Need PHPUnit 3.5+ + if (method_exists($this, 'assertStringMatchesFormat')) { + $this->assertStringMatchesFormat( +'Subject: My Subject +To: recipient@example.com +From: sender@example.com +Message-ID: <%d.%s@mail.example.com> +User-Agent: Horde Application Framework 4 +Date: %s, %d %s %d %d:%d:%d %s%d +Content-Type: multipart/mixed; boundary="=_%s" +MIME-Version: 1.0', + $dummy->sentMessages[0]['header_text'] + ); + } else { + $this->markTestSkipped(); + } + + $this->assertEquals( +"This message is in MIME format. + +--=_%s +Content-Type: text/plain; charset=iso-8859-15; format=flowed; DelSp=Yes + +This is +the body + +--=_%s +Content-Type: text/plain; charset=iso-8859-1 +Content-Disposition: inline + +This is a plain text +--=_%s +Content-Type: application/octet-stream +Content-Disposition: attachment +Content-Transfer-Encoding: base64 + +WnfDtmxmIEJveGvDpG1wZmVyIGphZ2VuIFZpa3RvciBxdWVyIMO8YmVyIGRlbiBncm/Dn2VuIFN5 +bHRlciBEZWljaC4K +--=_%s--", + $dummy->sentMessages[0]['body'] + ); + } + + public function addHtmlTest() + { + $mail = new Horde_Mime_Mail(array( + 'subject' => 'My Subject', + 'to' => 'recipient@example.com', + 'from' => 'sender@example.com' + )); + $mail->setBody("This is\nthe plain text body."); + + $dummy = Horde_Mail::factory('Mock'); + $mail->send($dummy); + + // Need PHPUnit 3.5+ + if (method_exists($this, 'assertStringMatchesFormat')) { + $this->assertStringMatchesFormat( +'Subject: My Subject +To: recipient@example.com +From: sender@example.com +Message-ID: <%d.%s@mail.example.com> +User-Agent: Horde Application Framework 4 +Date: %s, %d %s %d %d:%d:%d %s%d +Content-Type: text/plain; charset=iso-8859-1; format=flowed; DelSp=Yes +MIME-Version: 1.0', + $dummy->sentMessages[0]['header_text'] + ); + } else { + $this->markTestSkipped(); + } + + $this->assertEquals( + "This is\nthe plain text body.", + $dummy->sentMessages[0]['body'] + ); + + $mail = new Horde_Mime_Mail(array( + 'subject' => 'My Subject', + 'to' => 'recipient@example.com', + 'from' => 'sender@example.com' + )); + $mail->setHTMLBody( + "

Header Title

\n

This is
the html text body.

", + 'iso-8859-1', + false + ); + + $dummy = Horde_Mail::factory('Mock'); + $mail->send($dummy); + + // Need PHPUnit 3.5+ + if (method_exists($this, 'assertStringMatchesFormat')) { + $this->assertStringMatchesFormat( +'Subject: My Subject +To: recipient@example.com +From: sender@example.com +Message-ID: <%d.%s@mail.example.com> +User-Agent: Horde Application Framework 4 +Date: %s, %d %s %d %d:%d:%d %s%d +Content-Type: text/html; charset=iso-8859-1 +MIME-Version: 1.0', + $dummy->sentMessages[0]['header_text'] + ); + } else { + $this->markTestSkipped(); + } + + $this->assertEquals( + "

Header Title

\n

This is
the html text body.

", + $dummy->sentMessages[0]['body'] + ); + + $mail = new Horde_Mime_Mail(array( + 'subject' => 'My Subject', + 'to' => 'recipient@example.com', + 'from' => 'sender@example.com' + )); + $mail->setHTMLBody("

Header Title

\n

This is
the html text body.

"); + + $dummy = Horde_Mail::factory('Mock'); + $mail->send($dummy); + + // Need PHPUnit 3.5+ + if (method_exists($this, 'assertStringMatchesFormat')) { + $this->assertStringMatchesFormat( +'Subject: My Subject +To: recipient@example.com +From: sender@example.com +Message-ID: <%d.%s@mail.example.com> +User-Agent: Horde Application Framework 4 +Date: %s, %d %s %d %d:%d:%d %s%d +Content-Type: multipart/alternative; boundary="=_%s" +MIME-Version: 1.0', + $dummy->sentMessages[0]['header_text'] + ); + } else { + $this->markTestSkipped(); + } + + $this->assertEquals( +"This message is in MIME format. + +--=_%s +Content-Type: text/plain; charset=iso-8859-1; format=flowed; DelSp=Yes +Content-Description: Plaintext Version of Message + +HEADER TITLE + +This is +the html text body. + +--=_%s +Content-Type: text/html; charset=iso-8859-1 +Content-Description: HTML Version of Message + +

Header Title

+

This is
the html text body.

+--=_%s--", + $dummy->sentMessages[0]['body'] + ); + } + + public function testAddAttachment() + { + $mail = new Horde_Mime_Mail(array( + 'subject' => 'My Subject', + 'body' => "This is\nthe body", + 'to' => 'recipient@example.com', + 'from' => 'sender@example.com', + 'charset' => 'iso-8859-15' + )); + $mail->addAttachment(dirname(__FILE__) . '/fixtures/attachment.bin'); + $mail->addAttachment( + dirname(__FILE__) . '/fixtures/uudecode.txt', + 'my_name.html', + 'text/html', + 'iso-8859-15' + ); + + $dummy = Horde_Mail::factory('Mock'); + $mail->send($dummy); + + // Need PHPUnit 3.5+ + if (method_exists($this, 'assertStringMatchesFormat')) { + $this->assertStringMatchesFormat( +'Subject: My Subject +To: recipient@example.com +From: sender@example.com +Message-ID: <%d.%s@mail.example.com> +User-Agent: Horde Application Framework 4 +Date: %s, %d %s %d %d:%d:%d %s%d +Content-Type: multipart/mixed; boundary="=_%s" +MIME-Version: 1.0', + $dummy->sentMessages[0]['header_text'] + ); + } else { + $this->markTestSkipped(); + } + + $this->assertEquals( +'This message is in MIME format. + +--=_%s +Content-Type: text/plain; charset=iso-8859-15; format=flowed; DelSp=Yes + +This is +the body + +--=_%s +Content-Type: application/octet-stream; name=attachment.bin +Content-Disposition: attachment; filename=attachment.bin +Content-Transfer-Encoding: base64 + +WnfDtmxmIEJveGvDpG1wZmVyIGphZ2VuIFZpa3RvciBxdWVyIMO8YmVyIGRlbiBncm/Dn2VuIFN5 +bHRlciBEZWljaC4K +--=_%s +Content-Type: text/html; charset=iso-8859-15; name=my_name.html +Content-Disposition: attachment; filename=my_name.html + + +Ignore this text. + +begin 644 test.txt ++5&5S="!S=\')I;F<` +` +end + +More text to ignore. + +begin 755 test2.txt +*,FYD(\'-TsentMessages[0]['body'] + ); + } + + public function testReusing() + { + $mail = new Horde_Mime_Mail(array( + 'subject' => 'My Subject', + 'body' => "This is\nthe body", + 'to' => 'recipient@example.com', + 'from' => 'sender@example.com', + 'charset' => 'iso-8859-15' + )); + + $dummy = Horde_Mail::factory('Mock'); + $mail->send($dummy); + + $mail->addHeader('To', 'recipient2@example.com'); + $mail->send($dummy); + + $hdrs1 = Horde_Mime_Headers::parseHeaders($dummy->sentMessages[0]['header_text']); + $hdrs2 = Horde_Mime_Headers::parseHeaders($dummy->sentMessages[1]['header_text']); + + $this->assertNotEquals($hdrs1->getValue('message-id'), $hdrs2->getValue('message-id')); + } + + public function testFlowedText() + { + $mail = new Horde_Mime_Mail(); + $mail->addHeader('Subject', 'My Subject'); + $mail->addHeader('To', 'recipient@example.com'); + $mail->setBody(file_get_contents(dirname(__FILE__) . '/fixtures/flowed_msg.txt')); + + $dummy = Horde_Mail::factory('Mock'); + $mail->send($dummy); + + // Need PHPUnit 3.5+ + if (method_exists($this, 'assertStringMatchesFormat')) { + $this->assertStringMatchesFormat( +'Subject: My Subject +To: recipient@example.com +Message-ID: <%d.%s@mail.example.com> +User-Agent: Horde Application Framework 4 +Date: %s, %d %s %d %d:%d:%d %s%d +Content-Type: text/plain; charset=iso-8859-1; format=flowed; DelSp=Yes +MIME-Version: 1.0', + $dummy->sentMessages[0]['header_text'] + ); + } else { + $this->markTestSkipped(); + } + + $this->assertEquals( +'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do +eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad +minim veniam, quis nostrud exercitation ullamco laboris nisi ut +aliquip ex ea commodo +consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse +cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat +cupidatat non proident, sunt in culpa qui officia deserunt mollit anim +id est laborum.', + $dummy->sentMessages[0]['body'] + ); + } + + public function testEmptyBody() + { + $mail = new Horde_Mime_Mail(array( + 'subject' => 'My Subject', + 'to' => 'recipient@example.com', + 'from' => 'sender@example.com', + 'charset' => 'iso-8859-15' + )); + + $dummy = Horde_Mail::factory('Mock'); + $mail->send($dummy); + + $this->assertEquals( + "\n", + $dummy->sentMessages[0]['body'] + ); + } + +} diff --git a/framework/Mime/test/Horde/Mime/fixtures/bug_325.txt b/framework/Mime/test/Horde/Mime/fixtures/bug_325.txt deleted file mode 100644 index 0dc0fba09..000000000 --- a/framework/Mime/test/Horde/Mime/fixtures/bug_325.txt +++ /dev/null @@ -1,6 +0,0 @@ -Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod -tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, -quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo -consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse -cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non -proident, sunt in culpa qui officia deserunt mollit anim id est laborum. diff --git a/framework/Mime/test/Horde/Mime/fixtures/flowed_msg.txt b/framework/Mime/test/Horde/Mime/fixtures/flowed_msg.txt new file mode 100644 index 000000000..a58c6ed13 --- /dev/null +++ b/framework/Mime/test/Horde/Mime/fixtures/flowed_msg.txt @@ -0,0 +1,3 @@ +Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo +consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse +cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. diff --git a/framework/Mime/test/Horde/Mime/mail_001.phpt b/framework/Mime/test/Horde/Mime/mail_001.phpt deleted file mode 100644 index b71f5c958..000000000 --- a/framework/Mime/test/Horde/Mime/mail_001.phpt +++ /dev/null @@ -1,31 +0,0 @@ ---TEST-- -Horde_Mime_Mail constructor test ---FILE-- - 'My Subject', - 'body' => "This is\nthe body", - 'to' => 'recipient@example.com', - 'from' => 'sender@example.com', - 'charset' => 'iso-8859-15')); -$dummy = Mail::factory('dummy'); -$mail->send($dummy); -echo $dummy->send_output; - -?> ---EXPECTF-- -Subject: My Subject -To: recipient@example.com -From: sender@example.com -Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 4 -Date: %s, %d %s %d %d:%d:%d %s%d -Content-Type: text/plain; charset=iso-8859-15; format=flowed; DelSp=Yes -MIME-Version: 1.0 - -This is -the body diff --git a/framework/Mime/test/Horde/Mime/mail_002.phpt b/framework/Mime/test/Horde/Mime/mail_002.phpt deleted file mode 100644 index 81b5174c9..000000000 --- a/framework/Mime/test/Horde/Mime/mail_002.phpt +++ /dev/null @@ -1,35 +0,0 @@ ---TEST-- -Horde_Mime_Mail methods test ---FILE-- -addHeader('Subject', 'My Subject'); -$mail->setBody("This is\nthe body", 'iso-8859-15'); -$mail->addHeader('To', 'recipient@example.com'); -$mail->addHeader('Cc', 'null@example.com'); -$mail->addHeader('Bcc', 'invisible@example.com'); -$mail->addHeader('From', 'sender@example.com'); -$mail->removeHeader('Cc'); - -$dummy = Mail::factory('dummy'); -$mail->send($dummy); -echo $dummy->send_output; - -?> ---EXPECTF-- -Subject: My Subject -To: recipient@example.com -From: sender@example.com -Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 4 -Date: %s, %d %s %d %d:%d:%d %s%d -Content-Type: text/plain; charset=iso-8859-15; format=flowed; DelSp=Yes -MIME-Version: 1.0 - -This is -the body diff --git a/framework/Mime/test/Horde/Mime/mail_003.phpt b/framework/Mime/test/Horde/Mime/mail_003.phpt deleted file mode 100644 index cf02b6bd7..000000000 --- a/framework/Mime/test/Horde/Mime/mail_003.phpt +++ /dev/null @@ -1,36 +0,0 @@ ---TEST-- -Horde_Mime_Mail encoding test ---FILE-- - 'Schöner Betreff', - 'body' => "Hübsche Umlaute \n und Leerzeichen.", - 'to' => 'Empfänger ', - 'from' => 'sender@example.com', - 'charset' => 'iso-8859-1')); -$mail->addHeader('Cc', 'Der schöne Peter ', 'iso-8859-15'); - -$dummy = Mail::factory('dummy'); -$mail->send($dummy); -echo $dummy->send_output; - -?> ---EXPECTF-- -Subject: =?iso-8859-1?b?U2No9m5lcg==?= Betreff -To: =?iso-8859-1?b?RW1wZuRuZ2Vy?= -From: sender@example.com -Cc: Der =?iso-8859-15?b?c2No9m5l?= Peter -Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 4 -Date: %s, %d %s %d %d:%d:%d %s%d -Content-Type: text/plain; charset=iso-8859-1; format=flowed; DelSp=Yes -MIME-Version: 1.0 -Content-Transfer-Encoding: quoted-printable - -H=FCbsche Umlaute - und Leerzeichen. diff --git a/framework/Mime/test/Horde/Mime/mail_004.phpt b/framework/Mime/test/Horde/Mime/mail_004.phpt deleted file mode 100644 index 3427a6fef..000000000 --- a/framework/Mime/test/Horde/Mime/mail_004.phpt +++ /dev/null @@ -1,55 +0,0 @@ ---TEST-- -Horde_Mime_Mail::addPart() test ---FILE-- - 'My Subject', - 'body' => "This is\nthe body", - 'to' => 'recipient@example.com', - 'from' => 'sender@example.com', - 'charset' => 'iso-8859-15')); -$mail->addPart('text/plain', 'This is a plain text', 'iso-8859-1', 'inline'); -$mail->addPart('application/octet-stream', - file_get_contents(dirname(__FILE__) . '/fixtures/attachment.bin'), - null, 'attachment'); - -$dummy = Mail::factory('dummy'); -$mail->send($dummy); -echo $dummy->send_output; - -?> ---EXPECTF-- -Subject: My Subject -To: recipient@example.com -From: sender@example.com -Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 4 -Date: %s, %d %s %d %d:%d:%d %s%d -Content-Type: multipart/mixed; boundary="=_%s" -MIME-Version: 1.0 - -This message is in MIME format. - ---=_%s -Content-Type: text/plain; charset=iso-8859-15; format=flowed; DelSp=Yes - -This is -the body - ---=_%s -Content-Type: text/plain; charset=iso-8859-1 -Content-Disposition: inline - -This is a plain text ---=_%s -Content-Type: application/octet-stream -Content-Disposition: attachment -Content-Transfer-Encoding: base64 - -WnfDtmxmIEJveGvDpG1wZmVyIGphZ2VuIFZpa3RvciBxdWVyIMO8YmVyIGRlbiBncm/Dn2VuIFN5 -bHRlciBEZWljaC4K ---=_%s-- diff --git a/framework/Mime/test/Horde/Mime/mail_005.phpt b/framework/Mime/test/Horde/Mime/mail_005.phpt deleted file mode 100644 index 2f8b0f0c6..000000000 --- a/framework/Mime/test/Horde/Mime/mail_005.phpt +++ /dev/null @@ -1,93 +0,0 @@ ---TEST-- -Horde_Mime_Mail HTML test ---FILE-- - 'My Subject', - 'to' => 'recipient@example.com', - 'from' => 'sender@example.com')); -$mail->setBody("This is\nthe plain text body."); -$mail->send($mailer); -echo $mailer->send_output; - -echo "====================================================================\n"; - -$mail = new Horde_Mime_Mail(array('subject' => 'My Subject', - 'to' => 'recipient@example.com', - 'from' => 'sender@example.com')); -$mail->setHTMLBody("

Header Title

\n

This is
the html text body.

", - 'iso-8859-1', false); -$mail->send($mailer); -echo $mailer->send_output; - -echo "====================================================================\n"; - -$mail = new Horde_Mime_Mail(array('subject' => 'My Subject', - 'to' => 'recipient@example.com', - 'from' => 'sender@example.com')); -$mail->setHTMLBody("

Header Title

\n

This is
the html text body.

"); - -$mail->send($mailer); -echo $mailer->send_output; - -?> ---EXPECTF-- -Subject: My Subject -To: recipient@example.com -From: sender@example.com -Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 4 -Date: %s, %d %s %d %d:%d:%d %s%d -Content-Type: text/plain; charset=iso-8859-1; format=flowed; DelSp=Yes -MIME-Version: 1.0 - -This is -the plain text body. -==================================================================== -Subject: My Subject -To: recipient@example.com -From: sender@example.com -Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 4 -Date: %s, %d %s %d %d:%d:%d %s%d -Content-Type: text/html; charset=iso-8859-1 -MIME-Version: 1.0 - -

Header Title

-

This is
the html text body.

-==================================================================== -Subject: My Subject -To: recipient@example.com -From: sender@example.com -Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 4 -Date: %s, %d %s %d %d:%d:%d %s%d -Content-Type: multipart/alternative; boundary="=_%s" -MIME-Version: 1.0 - -This message is in MIME format. - ---=_%s -Content-Type: text/plain; charset=iso-8859-1; format=flowed; DelSp=Yes -Content-Description: Plaintext Version of Message - -HEADER TITLE - -This is -the html text body. - ---=_%s -Content-Type: text/html; charset=iso-8859-1 -Content-Description: HTML Version of Message - -

Header Title

-

This is
the html text body.

---=_%s-- diff --git a/framework/Mime/test/Horde/Mime/mail_006.phpt b/framework/Mime/test/Horde/Mime/mail_006.phpt deleted file mode 100644 index 08c2180e2..000000000 --- a/framework/Mime/test/Horde/Mime/mail_006.phpt +++ /dev/null @@ -1,80 +0,0 @@ ---TEST-- -Horde_Mime_Mail::addAttachment() test ---FILE-- - 'My Subject', - 'body' => "This is\nthe body", - 'to' => 'recipient@example.com', - 'from' => 'sender@example.com', - 'charset' => 'iso-8859-15')); -$mail->addAttachment(dirname(__FILE__) . '/fixtures/attachment.bin'); -$mail->addAttachment(dirname(__FILE__) . '/mail_dummy.inc', 'my_name.html', 'text/html', 'iso-8859-15'); - -$dummy = Mail::factory('dummy'); -$mail->send($dummy); -echo $dummy->send_output; - -?> ---EXPECTF-- -Subject: My Subject -To: recipient@example.com -From: sender@example.com -Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 4 -Date: %s, %d %s %d %d:%d:%d %s%d -Content-Type: multipart/mixed; boundary="=_%s" -MIME-Version: 1.0 - -This message is in MIME format. - ---=_%s -Content-Type: text/plain; charset=iso-8859-15; format=flowed; DelSp=Yes - -This is -the body - ---=_%s -Content-Type: application/octet-stream; name=attachment.bin -Content-Disposition: attachment; filename=attachment.bin -Content-Transfer-Encoding: base64 - -WnfDtmxmIEJveGvDpG1wZmVyIGphZ2VuIFZpa3RvciBxdWVyIMO8YmVyIGRlbiBncm/Dn2VuIFN5 -bHRlciBEZWljaC4K ---=_%s -Content-Type: text/html; charset=iso-8859-15; name=my_name.html -Content-Disposition: attachment; filename=my_name.html - -send_output = $text_headers . "\n\n" . $body; - } -} - ---=_%s-- diff --git a/framework/Mime/test/Horde/Mime/mail_007.phpt b/framework/Mime/test/Horde/Mime/mail_007.phpt deleted file mode 100644 index 9f86bbc3a..000000000 --- a/framework/Mime/test/Horde/Mime/mail_007.phpt +++ /dev/null @@ -1,66 +0,0 @@ ---TEST-- -Horde_Mime_Mail reusing test ---FILE-- - 'My Subject', - 'body' => "This is\nthe body", - 'to' => 'recipient@example.com', - 'from' => 'sender@example.com', - 'charset' => 'iso-8859-15')); - -$mail->send($dummy); -$raw = $dummy->send_output; - -echo $raw; -preg_match('/^Message-ID: (.*)$/m', $raw, $id1); - -echo "====================================================================\n"; - -$mail->addHeader('To', 'Änderung ', 'utf-8'); - -$mail->send($dummy); -$raw = $dummy->send_output; - -echo $raw; -preg_match('/^Message-ID: (.*)$/m', $raw, $id2); - -echo "====================================================================\n"; - -var_dump($id1[1] != $id2[1]); - -?> ---EXPECTF-- -Subject: My Subject -To: recipient@example.com -From: sender@example.com -Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 4 -Date: %s, %d %s %d %d:%d:%d %s%d -Content-Type: text/plain; charset=iso-8859-15; format=flowed; DelSp=Yes -MIME-Version: 1.0 - -This is -the body -==================================================================== -Subject: My Subject -From: sender@example.com -User-Agent: Horde Application Framework 4 -Content-Type: text/plain; charset=iso-8859-15; format=flowed; DelSp=Yes -MIME-Version: 1.0 -To: =?utf-8?b?w4RuZGVydW5n?= -Message-ID: <%d.%s@mail.example.com> -Date: %s, %d %s %d %d:%d:%d %s%d - -This is -the body - -==================================================================== -bool(true) - diff --git a/framework/Mime/test/Horde/Mime/mail_008.phpt b/framework/Mime/test/Horde/Mime/mail_008.phpt deleted file mode 100644 index 4f6e9ee7f..000000000 --- a/framework/Mime/test/Horde/Mime/mail_008.phpt +++ /dev/null @@ -1,38 +0,0 @@ ---TEST-- -Horde_Mime_Mail flowed text test ---FILE-- -addHeader('Subject', 'My Subject'); -$mail->addHeader('To', 'recipient@example.com'); -$mail->setBody('Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo -consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse -cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'); - -$dummy = Mail::factory('dummy'); -$mail->send($dummy); -echo $dummy->send_output; - -?> ---EXPECTF-- -Subject: My Subject -To: recipient@example.com -Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 4 -Date: %s, %d %s %d %d:%d:%d %s%d -Content-Type: text/plain; charset=iso-8859-1; format=flowed; DelSp=Yes -MIME-Version: 1.0 - -Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do -eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad -minim veniam, quis nostrud exercitation ullamco laboris nisi ut -aliquip ex ea commodo -consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse -cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat -cupidatat non proident, sunt in culpa qui officia deserunt mollit anim -id est laborum. diff --git a/framework/Mime/test/Horde/Mime/mail_009.phpt b/framework/Mime/test/Horde/Mime/mail_009.phpt deleted file mode 100644 index 718b1b138..000000000 --- a/framework/Mime/test/Horde/Mime/mail_009.phpt +++ /dev/null @@ -1,27 +0,0 @@ ---TEST-- -Horde_Mime_Mail empty body test. ---FILE-- - 'My Subject', - 'to' => 'recipient@example.com', - 'from' => 'sender@example.com', - 'charset' => 'iso-8859-15')); -$dummy = Mail::factory('dummy'); -$mail->send($dummy); -echo $dummy->send_output; - -?> ---EXPECTF-- -Subject: My Subject -To: recipient@example.com -From: sender@example.com -Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 4 -Date: %s, %d %s %d %d:%d:%d %s%d -Content-Type: application/octet-stream -MIME-Version: 1.0 diff --git a/framework/Mime/test/Horde/Mime/mail_dummy.inc b/framework/Mime/test/Horde/Mime/mail_dummy.inc deleted file mode 100644 index 197d00782..000000000 --- a/framework/Mime/test/Horde/Mime/mail_dummy.inc +++ /dev/null @@ -1,27 +0,0 @@ -send_output = $text_headers . "\n\n" . $body; - } -}