From ccab585fa2fed833b6c8da2fa013007be72d1edc Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Tue, 3 Feb 2009 13:56:58 +0100 Subject: [PATCH] Update tests that never worked with the new Mime library. --- framework/Mime/test/Horde/Mime/bug_4834.phpt | 2 ++ framework/Mime/test/Horde/Mime/mail_001.phpt | 7 ++---- framework/Mime/test/Horde/Mime/mail_002.phpt | 7 ++---- framework/Mime/test/Horde/Mime/mail_003.phpt | 7 ++---- framework/Mime/test/Horde/Mime/mail_004.phpt | 13 ++++------- framework/Mime/test/Horde/Mime/mail_005.phpt | 25 +++++++-------------- framework/Mime/test/Horde/Mime/mail_006.phpt | 31 ++++++++++++--------------- framework/Mime/test/Horde/Mime/mail_007.phpt | 25 ++++++++++----------- framework/Mime/test/Horde/Mime/mail_008.phpt | 7 ++---- framework/Mime/test/Horde/Mime/mail_dummy.inc | 8 ++++++- 10 files changed, 54 insertions(+), 78 deletions(-) diff --git a/framework/Mime/test/Horde/Mime/bug_4834.phpt b/framework/Mime/test/Horde/Mime/bug_4834.phpt index aef61fd69..b06daf1e0 100644 --- a/framework/Mime/test/Horde/Mime/bug_4834.phpt +++ b/framework/Mime/test/Horde/Mime/bug_4834.phpt @@ -3,7 +3,9 @@ Bug #4834 Wrong encoding of email lists with groups. --FILE-- , Group: peter@example.com, jane@example.com;'); ?> diff --git a/framework/Mime/test/Horde/Mime/mail_001.phpt b/framework/Mime/test/Horde/Mime/mail_001.phpt index 275d368eb..5f7d9cbc9 100644 --- a/framework/Mime/test/Horde/Mime/mail_001.phpt +++ b/framework/Mime/test/Horde/Mime/mail_001.phpt @@ -16,13 +16,10 @@ Subject: My Subject To: recipient@example.com From: sender@example.com Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 3.2 +User-Agent: Horde Application Framework 4.0 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 -Content-Type: text/plain; - charset=iso-8859-15; - DelSp="Yes"; - format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit diff --git a/framework/Mime/test/Horde/Mime/mail_002.phpt b/framework/Mime/test/Horde/Mime/mail_002.phpt index abf9a3699..c9b8f26be 100644 --- a/framework/Mime/test/Horde/Mime/mail_002.phpt +++ b/framework/Mime/test/Horde/Mime/mail_002.phpt @@ -22,13 +22,10 @@ Subject: My Subject To: recipient@example.com From: sender@example.com Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 3.2 +User-Agent: Horde Application Framework 4.0 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 -Content-Type: text/plain; - charset=iso-8859-15; - DelSp="Yes"; - format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit diff --git a/framework/Mime/test/Horde/Mime/mail_003.phpt b/framework/Mime/test/Horde/Mime/mail_003.phpt index 48459a148..683262138 100644 --- a/framework/Mime/test/Horde/Mime/mail_003.phpt +++ b/framework/Mime/test/Horde/Mime/mail_003.phpt @@ -19,13 +19,10 @@ 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 3.2 +User-Agent: Horde Application Framework 4.0 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-Type: text/plain; - charset=iso-8859-1; - DelSp="Yes"; - format="flowed" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable diff --git a/framework/Mime/test/Horde/Mime/mail_004.phpt b/framework/Mime/test/Horde/Mime/mail_004.phpt index 55548cf63..15f33969c 100644 --- a/framework/Mime/test/Horde/Mime/mail_004.phpt +++ b/framework/Mime/test/Horde/Mime/mail_004.phpt @@ -21,20 +21,16 @@ Subject: My Subject To: recipient@example.com From: sender@example.com Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 3.2 +User-Agent: Horde Application Framework 4.0 Date: %s, %d %s %d %d:%d:%d %s%d +Content-Type: multipart/mixed; boundary="=_%s" MIME-Version: 1.0 -Content-Type: multipart/mixed; - boundary="=_%s" Content-Transfer-Encoding: 7bit This message is in MIME format. --=_%s -Content-Type: text/plain; - charset=iso-8859-15; - DelSp="Yes"; - format="flowed" +Content-Type: text/plain; charset=iso-8859-15; format=flowed; DelSp=Yes Content-Disposition: inline Content-Transfer-Encoding: 7bit @@ -42,8 +38,7 @@ This is the body --=_%s -Content-Type: text/plain; - charset=iso-8859-1 +Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 7bit diff --git a/framework/Mime/test/Horde/Mime/mail_005.phpt b/framework/Mime/test/Horde/Mime/mail_005.phpt index 4091b7b9c..347fae6dc 100644 --- a/framework/Mime/test/Horde/Mime/mail_005.phpt +++ b/framework/Mime/test/Horde/Mime/mail_005.phpt @@ -31,13 +31,10 @@ Subject: My Subject To: recipient@example.com From: sender@example.com Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 3.2 +User-Agent: Horde Application Framework 4.0 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-Type: text/plain; - charset=iso-8859-1; - DelSp="Yes"; - format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit @@ -48,11 +45,10 @@ Subject: My Subject To: recipient@example.com From: sender@example.com Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 3.2 +User-Agent: Horde Application Framework 4.0 Date: %s, %d %s %d %d:%d:%d %s%d +Content-Type: text/html; charset=iso-8859-1 MIME-Version: 1.0 -Content-Type: text/html; - charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 7bit @@ -63,20 +59,16 @@ Subject: My Subject To: recipient@example.com From: sender@example.com Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 3.2 +User-Agent: Horde Application Framework 4.0 Date: %s, %d %s %d %d:%d:%d %s%d +Content-Type: multipart/alternative; boundary="=_%s" MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="=_%s" Content-Transfer-Encoding: 7bit This message is in MIME format. --=_%s -Content-Type: text/plain; - charset=iso-8859-1; - DelSp="Yes"; - format="flowed" +Content-Type: text/plain; charset=iso-8859-1; format=flowed; DelSp=Yes Content-Description: Plaintext Version of Message Content-Disposition: inline Content-Transfer-Encoding: 7bit @@ -89,8 +81,7 @@ This is the html text body. --=_%s -Content-Type: text/html; - charset=iso-8859-1 +Content-Type: text/html; charset=iso-8859-1 Content-Description: HTML Version of Message Content-Disposition: inline Content-Transfer-Encoding: 7bit diff --git a/framework/Mime/test/Horde/Mime/mail_006.phpt b/framework/Mime/test/Horde/Mime/mail_006.phpt index 468747fb9..c5e2131bf 100644 --- a/framework/Mime/test/Horde/Mime/mail_006.phpt +++ b/framework/Mime/test/Horde/Mime/mail_006.phpt @@ -19,20 +19,16 @@ Subject: My Subject To: recipient@example.com From: sender@example.com Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 3.2 +User-Agent: Horde Application Framework 4.0 Date: %s, %d %s %d %d:%d:%d %s%d +Content-Type: multipart/mixed; boundary="=_%s" MIME-Version: 1.0 -Content-Type: multipart/mixed; - boundary="=_%s" Content-Transfer-Encoding: 7bit This message is in MIME format. --=_%s -Content-Type: text/plain; - charset=iso-8859-15; - DelSp="Yes"; - format="flowed" +Content-Type: text/plain; charset=iso-8859-15; format=flowed; DelSp=Yes Content-Disposition: inline Content-Transfer-Encoding: 7bit @@ -40,21 +36,16 @@ This is the body --=_%s -Content-Type: application/octet-stream; - name="attachment.bin" -Content-Disposition: attachment; - filename="attachment.bin" +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" +Content-Type: text/html; charset=iso-8859-15; name=my_name.html +Content-Disposition: attachment; filename=my_name.html Content-Transfer-Encoding: 7bit send('dummy'); -$id = $mail->_headers->getValue('message-id'); +$raw = $mail->send('dummy'); +echo $raw; +preg_match('/^Message-ID: (.*)$/m', $raw, $id1); echo "====================================================================\n"; $mail->addHeader('To', 'Änderung ', 'utf-8'); -echo $mail->send('dummy'); +$raw = $mail->send('dummy'); +echo $raw; +preg_match('/^Message-ID: (.*)$/m', $raw, $id2); echo "====================================================================\n"; -var_dump($id != $mail->_headers->getValue('message-id')); +var_dump($id1[1] != $id2[1]); ?> --EXPECTF-- @@ -26,13 +29,10 @@ Subject: My Subject To: recipient@example.com From: sender@example.com Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 3.2 +User-Agent: Horde Application Framework 4.0 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 -Content-Type: text/plain; - charset=iso-8859-15; - DelSp="Yes"; - format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit @@ -42,13 +42,10 @@ the body Subject: My Subject From: sender@example.com Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 3.2 +User-Agent: Horde Application Framework 4.0 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 -Content-Type: text/plain; - charset=iso-8859-15; - DelSp="Yes"; - format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit To: =?utf-8?b?w4RuZGVydW5n?= diff --git a/framework/Mime/test/Horde/Mime/mail_008.phpt b/framework/Mime/test/Horde/Mime/mail_008.phpt index 9fd87d675..ae0dd2428 100644 --- a/framework/Mime/test/Horde/Mime/mail_008.phpt +++ b/framework/Mime/test/Horde/Mime/mail_008.phpt @@ -19,13 +19,10 @@ echo $mail->send('dummy'); Subject: My Subject To: recipient@example.com Message-ID: <%d.%s@mail.example.com> -User-Agent: Horde Application Framework 3.2 +User-Agent: Horde Application Framework 4.0 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-Type: text/plain; - charset=iso-8859-1; - DelSp="Yes"; - format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit diff --git a/framework/Mime/test/Horde/Mime/mail_dummy.inc b/framework/Mime/test/Horde/Mime/mail_dummy.inc index b3e9429fa..89c43b5d1 100644 --- a/framework/Mime/test/Horde/Mime/mail_dummy.inc +++ b/framework/Mime/test/Horde/Mime/mail_dummy.inc @@ -3,7 +3,13 @@ * @package Mail */ -require dirname(__FILE__) . '/../../lib/Horde/Mime/Mail.php'; +require_once 'Mail.php'; +require_once 'Horde/Browser.php'; +require dirname(__FILE__) . '/../../../lib/Horde/Mime.php'; +require dirname(__FILE__) . '/../../../lib/Horde/Mime/Address.php'; +require dirname(__FILE__) . '/../../../lib/Horde/Mime/Headers.php'; +require dirname(__FILE__) . '/../../../lib/Horde/Mime/Mail.php'; +require dirname(__FILE__) . '/../../../lib/Horde/Mime/Part.php'; $_SERVER['SERVER_NAME'] = 'mail.example.com'; class Mail_dummy extends Mail { -- 2.11.0