From b3fcfffce3c5f72e48f70ab4e191080670800d27 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Thu, 11 Dec 2008 15:46:44 -0700 Subject: [PATCH] Updates to new Horde 4 format. --- framework/Mime/test/Horde/Mime/bug_325.phpt | 4 +- framework/Mime/test/Horde/Mime/bug_4834.phpt | 4 +- framework/Mime/test/Horde/Mime/bug_6896.phpt | 4 +- framework/Mime/test/Horde/Mime/contents.phpt | 67 -------------------------- framework/Mime/test/Horde/Mime/mail_001.phpt | 8 +-- framework/Mime/test/Horde/Mime/mail_002.phpt | 4 +- framework/Mime/test/Horde/Mime/mail_003.phpt | 8 +-- framework/Mime/test/Horde/Mime/mail_004.phpt | 8 +-- framework/Mime/test/Horde/Mime/mail_005.phpt | 14 +++--- framework/Mime/test/Horde/Mime/mail_006.phpt | 8 +-- framework/Mime/test/Horde/Mime/mail_007.phpt | 8 +-- framework/Mime/test/Horde/Mime/mail_008.phpt | 6 +-- framework/Mime/test/Horde/Mime/mail_dummy.inc | 2 +- framework/Mime/test/Horde/Mime/url.phpt | 26 ++++++---- framework/Mime/test/Horde/Mime/viewer_php.phpt | 16 +++--- 15 files changed, 65 insertions(+), 122 deletions(-) delete mode 100644 framework/Mime/test/Horde/Mime/contents.phpt diff --git a/framework/Mime/test/Horde/Mime/bug_325.phpt b/framework/Mime/test/Horde/Mime/bug_325.phpt index 16fbaf6a1..8022be676 100644 --- a/framework/Mime/test/Horde/Mime/bug_325.phpt +++ b/framework/Mime/test/Horde/Mime/bug_325.phpt @@ -5,8 +5,8 @@ Bug #338 (fileinfo returning charset) --FILE-- --EXPECT-- text/plain diff --git a/framework/Mime/test/Horde/Mime/bug_4834.phpt b/framework/Mime/test/Horde/Mime/bug_4834.phpt index 6230ff573..aef61fd69 100644 --- a/framework/Mime/test/Horde/Mime/bug_4834.phpt +++ b/framework/Mime/test/Horde/Mime/bug_4834.phpt @@ -3,8 +3,8 @@ Bug #4834 Wrong encoding of email lists with groups. --FILE-- , Group: peter@example.com, jane@example.com;'); +require dirname(__FILE__) . '/../../../lib/Horde/Mime.php'; +echo Horde_Mime::encodeAddress('"John Doe" , Group: peter@example.com, jane@example.com;'); ?> --EXPECT-- diff --git a/framework/Mime/test/Horde/Mime/bug_6896.phpt b/framework/Mime/test/Horde/Mime/bug_6896.phpt index ca2e0240b..930500f7c 100644 --- a/framework/Mime/test/Horde/Mime/bug_6896.phpt +++ b/framework/Mime/test/Horde/Mime/bug_6896.phpt @@ -3,8 +3,8 @@ Bug #6896 MIME::rfc822Explode parsing broken --FILE-- --EXPECT-- diff --git a/framework/Mime/test/Horde/Mime/contents.phpt b/framework/Mime/test/Horde/Mime/contents.phpt deleted file mode 100644 index 809f7748a..000000000 --- a/framework/Mime/test/Horde/Mime/contents.phpt +++ /dev/null @@ -1,67 +0,0 @@ ---TEST-- -MIME_Contents tests. ---FILE-- -getDownloadAllList()); -echo "\n"; -var_export($contents->getAttachmentContents()); - -?> ---EXPECT-- -array ( - 0 => '2.0', -) -array ( - 0 => - array ( - 'name' => 'Weitergeleitete Nachricht: Small message', - 'data' => 'Return-Path: -Received: from neo.wg.de ([unix socket]) - by neo (Cyrus v2.2.13) with LMTPA; - Tue, 11 Mar 2008 17:26:11 +0100 -X-Sieve: CMU Sieve 2.2 -Received: from localhost (localhost [127.0.0.1]) - by neo.wg.de (Postfix) with ESMTP id 142BF32B032 - for ; Tue, 11 Mar 2008 17:26:11 +0100 (CET) -Received: from neo.wg.de ([127.0.0.1]) - by localhost (neo.wg.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP - id 02540-02 for ; Tue, 11 Mar 2008 17:26:02 +0100 (CET) -Received: from localhost (localhost [127.0.0.1]) - by neo.wg.de (Postfix) with ESMTP id 21E2532B037 - for ; Tue, 11 Mar 2008 17:26:02 +0100 (CET) -Received: from 192.168.60.101 ([192.168.60.101]) by neo.wg.de (Horde - Framework) with HTTP; Tue, 11 Mar 2008 17:26:02 +0100 -Message-ID: <20080311172602.12293hbhf6ddsza0@neo.wg.de> -X-Priority: 3 (Normal) -Date: Tue, 11 Mar 2008 17:26:02 +0100 -From: Jan Schneider -To: "jan@localhost" -Subject: Small message -MIME-Version: 1.0 -Content-Type: text/plain; - charset=ISO-8859-1; - DelSp="Yes"; - format="flowed" -Content-Disposition: inline -Content-Transfer-Encoding: 7bit -User-Agent: Internet Messaging Program (IMP) H3 (5.0-cvs) -X-Virus-Scanned: amavisd-new at wg.de -X-Spam-Status: No, score=-4.351 required=5 tests=[ALL_TRUSTED=-1.8, AWL=0.048, - BAYES_00=-2.599] -X-Spam-Score: -4.351 -X-Spam-Level: - -Small message text. - - -', - ), -) diff --git a/framework/Mime/test/Horde/Mime/mail_001.phpt b/framework/Mime/test/Horde/Mime/mail_001.phpt index dfd7cfcd4..275d368eb 100644 --- a/framework/Mime/test/Horde/Mime/mail_001.phpt +++ b/framework/Mime/test/Horde/Mime/mail_001.phpt @@ -1,13 +1,13 @@ --TEST-- -MIME_Mail constructor test +Horde_Mime_Mail constructor test --FILE-- send('dummy'); ?> diff --git a/framework/Mime/test/Horde/Mime/mail_002.phpt b/framework/Mime/test/Horde/Mime/mail_002.phpt index 28d1d9da4..abf9a3699 100644 --- a/framework/Mime/test/Horde/Mime/mail_002.phpt +++ b/framework/Mime/test/Horde/Mime/mail_002.phpt @@ -1,11 +1,11 @@ --TEST-- -MIME_Mail methods 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'); diff --git a/framework/Mime/test/Horde/Mime/mail_003.phpt b/framework/Mime/test/Horde/Mime/mail_003.phpt index a0a3ef1a7..48459a148 100644 --- a/framework/Mime/test/Horde/Mime/mail_003.phpt +++ b/framework/Mime/test/Horde/Mime/mail_003.phpt @@ -1,14 +1,14 @@ --TEST-- -MIME_Mail encoding test +Horde_Mime_Mail encoding test --FILE-- ', - 'sender@example.com', 'iso-8859-1'); +$mail = new Horde_Mime_Mail('Schöner Betreff', "Hübsche Umlaute \n und Leerzeichen.", + 'Empfänger ', + 'sender@example.com', 'iso-8859-1'); $mail->addHeader('Cc', 'Der schöne Peter ', 'iso-8859-15'); echo $mail->send('dummy'); diff --git a/framework/Mime/test/Horde/Mime/mail_004.phpt b/framework/Mime/test/Horde/Mime/mail_004.phpt index 23fd74330..55548cf63 100644 --- a/framework/Mime/test/Horde/Mime/mail_004.phpt +++ b/framework/Mime/test/Horde/Mime/mail_004.phpt @@ -1,13 +1,13 @@ --TEST-- -MIME_Mail::addPart() test +Horde_Mime_Mail::addPart() test --FILE-- addPart('text/plain', 'This is a plain text', 'iso-8859-1', 'inline'); $mail->addPart('application/octet-stream', file_get_contents(dirname(__FILE__) . '/attachment.bin'), diff --git a/framework/Mime/test/Horde/Mime/mail_005.phpt b/framework/Mime/test/Horde/Mime/mail_005.phpt index 5683ec464..4091b7b9c 100644 --- a/framework/Mime/test/Horde/Mime/mail_005.phpt +++ b/framework/Mime/test/Horde/Mime/mail_005.phpt @@ -1,27 +1,27 @@ --TEST-- -MIME_Mail HTML test +Horde_Mime_Mail HTML test --FILE-- setBody("This is\nthe plain text body."); echo $mail->send('dummy'); echo "====================================================================\n"; -$mail = new MIME_Mail('My Subject', null, 'recipient@example.com', - 'sender@example.com'); +$mail = new Horde_Mime_Mail('My Subject', null, 'recipient@example.com', + 'sender@example.com'); $mail->setHTMLBody("

Header Title

\n

This is
the html text body.

", 'iso-8859-1', false); echo $mail->send('dummy'); echo "====================================================================\n"; -$mail = new MIME_Mail('My Subject', null, 'recipient@example.com', - 'sender@example.com'); +$mail = new Horde_Mime_Mail('My Subject', null, 'recipient@example.com', + 'sender@example.com'); $mail->setHTMLBody("

Header Title

\n

This is
the html text body.

"); echo $mail->send('dummy'); diff --git a/framework/Mime/test/Horde/Mime/mail_006.phpt b/framework/Mime/test/Horde/Mime/mail_006.phpt index 8bed4464e..468747fb9 100644 --- a/framework/Mime/test/Horde/Mime/mail_006.phpt +++ b/framework/Mime/test/Horde/Mime/mail_006.phpt @@ -1,13 +1,13 @@ --TEST-- -MIME_Mail::addAttachment() test +Horde_Mime_Mail::addAttachment() test --FILE-- addAttachment(dirname(__FILE__) . '/attachment.bin'); $mail->addAttachment(dirname(__FILE__) . '/mail_dummy.inc', 'my_name.html', 'text/html', 'iso-8859-15'); diff --git a/framework/Mime/test/Horde/Mime/mail_007.phpt b/framework/Mime/test/Horde/Mime/mail_007.phpt index 5deb030f0..c27fb105e 100644 --- a/framework/Mime/test/Horde/Mime/mail_007.phpt +++ b/framework/Mime/test/Horde/Mime/mail_007.phpt @@ -1,13 +1,13 @@ --TEST-- -MIME_Mail reusing test +Horde_Mime_Mail reusing test --FILE-- send('dummy'); $id = $mail->_headers->getValue('message-id'); diff --git a/framework/Mime/test/Horde/Mime/mail_008.phpt b/framework/Mime/test/Horde/Mime/mail_008.phpt index a086b37f7..9fd87d675 100644 --- a/framework/Mime/test/Horde/Mime/mail_008.phpt +++ b/framework/Mime/test/Horde/Mime/mail_008.phpt @@ -1,11 +1,11 @@ --TEST-- -MIME_Mail flowed text 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 @@ -36,4 +36,4 @@ 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. \ No newline at end of file +id est laborum. diff --git a/framework/Mime/test/Horde/Mime/mail_dummy.inc b/framework/Mime/test/Horde/Mime/mail_dummy.inc index b32349931..b3e9429fa 100644 --- a/framework/Mime/test/Horde/Mime/mail_dummy.inc +++ b/framework/Mime/test/Horde/Mime/mail_dummy.inc @@ -3,7 +3,7 @@ * @package Mail */ -require dirname(__FILE__) . '/../MIME/Mail.php'; +require dirname(__FILE__) . '/../../lib/Horde/Mime/Mail.php'; $_SERVER['SERVER_NAME'] = 'mail.example.com'; class Mail_dummy extends Mail { diff --git a/framework/Mime/test/Horde/Mime/url.phpt b/framework/Mime/test/Horde/Mime/url.phpt index d872762c1..07c0ea8c0 100644 --- a/framework/Mime/test/Horde/Mime/url.phpt +++ b/framework/Mime/test/Horde/Mime/url.phpt @@ -1,11 +1,11 @@ --TEST-- -MIME_Viewer_html: URL dereferer tests +Horde_Mime_Viewer_html: URL dereferer tests --FILE-- array( + 'name' => 'www.example.com', + 'port' => 80 + ), + 'use_ssl' => 0 +); $registry = new Registry(); $browser = new Browser(); -$viewer = new MIME_Viewer_html($null); for ($i = 1; $i <= 7; $i++) { - $data = file_get_contents(dirname(__FILE__) . '/url' . $i . '.html'); - echo $viewer->_cleanHTML($data); + $part = new Horde_Mime_Part(); + $part->setType('text/html'); + $part->setContents(file_get_contents($dirname . '/url' . $i . '.html')); + $viewer = Horde_Mime_Viewer::factory($part, 'text/html'); + echo $viewer->render(); } ?> diff --git a/framework/Mime/test/Horde/Mime/viewer_php.phpt b/framework/Mime/test/Horde/Mime/viewer_php.phpt index cceaa9198..158a06de9 100644 --- a/framework/Mime/test/Horde/Mime/viewer_php.phpt +++ b/framework/Mime/test/Horde/Mime/viewer_php.phpt @@ -3,19 +3,23 @@ PHP source viewer --FILE-- lineNumber(str_replace('<?php ', '', highlight_string('setType('application/x-php'); +$part->setContents(str_replace('<?php ', '', highlight_string('render(); ?> --EXPECT--
  1. highlight_file(__FILE__);
    2. -
\ No newline at end of file + -- 2.11.0