Fix tests.

diff --git a/framework/Mime/test/Horde/Mime/mail_001.phpt b/framework/Mime/test/Horde/Mime/mail_001.phpt
index 25c21e2..b71f5c9 100644 (file)
--- a/framework/Mime/test/Horde/Mime/mail_001.phpt
+++ b/framework/Mime/test/Horde/Mime/mail_001.phpt
@@ -22,12 +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 4.0
+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
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
 
 This is
 the body

diff --git a/framework/Mime/test/Horde/Mime/mail_002.phpt b/framework/Mime/test/Horde/Mime/mail_002.phpt
index 8df2e23..81b5174 100644 (file)
--- a/framework/Mime/test/Horde/Mime/mail_002.phpt
+++ b/framework/Mime/test/Horde/Mime/mail_002.phpt
@@ -26,12 +26,10 @@ Subject: My Subject
 To: recipient@example.com
 From: sender@example.com
 Message-ID: <%d.%s@mail.example.com>
-User-Agent: Horde Application Framework 4.0
+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
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
 
 This is
 the body

diff --git a/framework/Mime/test/Horde/Mime/mail_003.phpt b/framework/Mime/test/Horde/Mime/mail_003.phpt
index dfd2c24..cf02b6b 100644 (file)
--- a/framework/Mime/test/Horde/Mime/mail_003.phpt
+++ b/framework/Mime/test/Horde/Mime/mail_003.phpt
@@ -26,11 +26,10 @@ To: =?iso-8859-1?b?RW1wZuRuZ2Vy?= <recipient@example.com>
 From: sender@example.com
 Cc: Der =?iso-8859-15?b?c2No9m5l?= Peter <peter@example.com>
 Message-ID: <%d.%s@mail.example.com>
-User-Agent: Horde Application Framework 4.0
+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-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 H=FCbsche Umlaute

diff --git a/framework/Mime/test/Horde/Mime/mail_004.phpt b/framework/Mime/test/Horde/Mime/mail_004.phpt
index e4d340d..3427a6f 100644 (file)
--- a/framework/Mime/test/Horde/Mime/mail_004.phpt
+++ b/framework/Mime/test/Horde/Mime/mail_004.phpt
@@ -27,18 +27,15 @@ Subject: My Subject
 To: recipient@example.com
 From: sender@example.com
 Message-ID: <%d.%s@mail.example.com>
-User-Agent: Horde Application Framework 4.0
+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
-Content-Transfer-Encoding: 7bit
 
 This message is in MIME format.
 
 --=_%s
 Content-Type: text/plain; charset=iso-8859-15; format=flowed; DelSp=Yes
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
 
 This is
 the body
@@ -46,7 +43,6 @@ the body
 --=_%s
 Content-Type: text/plain; charset=iso-8859-1
 Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
 
 This is a plain text
 --=_%s

diff --git a/framework/Mime/test/Horde/Mime/mail_005.phpt b/framework/Mime/test/Horde/Mime/mail_005.phpt
index 82f0f52..2f8b0f0 100644 (file)
--- a/framework/Mime/test/Horde/Mime/mail_005.phpt
+++ b/framework/Mime/test/Horde/Mime/mail_005.phpt
@@ -6,14 +6,17 @@ Horde_Mime_Mail HTML test
 require dirname(__FILE__) . '/mail_dummy.inc';
 require_once 'Horde/String.php';
 require_once 'Horde/Text/Filter.php';
+require_once 'Horde/Text/Filter/Base.php';
 require_once 'Horde/Text/Filter/Html2text.php';
 require_once 'Horde/Util.php';
+$mailer = new Mail_dummy();
 
 $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.");
-echo $mail->send(array('type' => 'dummy'));
+$mail->send($mailer);
+echo $mailer->send_output;
 
 echo "====================================================================\n";
 
@@ -22,7 +25,8 @@ $mail = new Horde_Mime_Mail(array('subject' => 'My Subject',
                                   'from' => 'sender@example.com'));
 $mail->setHTMLBody("<h1>Header Title</h1>\n<p>This is<br />the html text body.</p>",
                    'iso-8859-1', false);
-echo $mail->send(array('type' => 'dummy'));
+$mail->send($mailer);
+echo $mailer->send_output;
 
 echo "====================================================================\n";
 
@@ -31,9 +35,8 @@ $mail = new Horde_Mime_Mail(array('subject' => 'My Subject',
                                   'from' => 'sender@example.com'));
 $mail->setHTMLBody("<h1>Header Title</h1>\n<p>This is<br />the html text body.</p>");
 
-$dummy = Mail::factory('dummy');
-$mail->send($dummy);
-echo $dummy->send_output;
+$mail->send($mailer);
+echo $mailer->send_output;
 
 ?>
 --EXPECTF--
@@ -41,12 +44,10 @@ Subject: My Subject
 To: recipient@example.com
 From: sender@example.com
 Message-ID: <%d.%s@mail.example.com>
-User-Agent: Horde Application Framework 4.0
+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-Disposition: inline
-Content-Transfer-Encoding: 7bit
 
 This is
 the plain text body.
@@ -55,12 +56,10 @@ Subject: My Subject
 To: recipient@example.com
 From: sender@example.com
 Message-ID: <%d.%s@mail.example.com>
-User-Agent: Horde Application Framework 4.0
+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
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
 
 <h1>Header Title</h1>
 <p>This is<br />the html text body.</p>
@@ -69,21 +68,16 @@ Subject: My Subject
 To: recipient@example.com
 From: sender@example.com
 Message-ID: <%d.%s@mail.example.com>
-User-Agent: Horde Application Framework 4.0
+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
-Content-Transfer-Encoding: 7bit
 
 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
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-
-
 
 HEADER TITLE
 
@@ -93,8 +87,6 @@ the html text body.
 --=_%s
 Content-Type: text/html; charset=iso-8859-1
 Content-Description: HTML Version of Message
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
 
 <h1>Header Title</h1>
 <p>This is<br />the html text body.</p>

diff --git a/framework/Mime/test/Horde/Mime/mail_006.phpt b/framework/Mime/test/Horde/Mime/mail_006.phpt
index 20d86bd..08c2180 100644 (file)
--- a/framework/Mime/test/Horde/Mime/mail_006.phpt
+++ b/framework/Mime/test/Horde/Mime/mail_006.phpt
@@ -25,18 +25,15 @@ Subject: My Subject
 To: recipient@example.com
 From: sender@example.com
 Message-ID: <%d.%s@mail.example.com>
-User-Agent: Horde Application Framework 4.0
+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
-Content-Transfer-Encoding: 7bit
 
 This message is in MIME format.
 
 --=_%s
 Content-Type: text/plain; charset=iso-8859-15; format=flowed; DelSp=Yes
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
 
 This is
 the body
@@ -51,7 +48,6 @@ bHRlciBEZWljaC4K
 --=_%s
 Content-Type: text/html; charset=iso-8859-15; name=my_name.html
 Content-Disposition: attachment; filename=my_name.html
-Content-Transfer-Encoding: 7bit
 
 <?php
 /**
@@ -70,11 +66,14 @@ 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 {
-    function send($recipients, $headers, $body)
+class Mail_dummy extends Mail
+{
+    public $send_output;
+
+    public function send($recipients, $headers, $body)
     {
         list(,$text_headers) = Mail::prepareHeaders($headers);
-        return $text_headers . "\n\n" . $body;
+        $this->send_output = $text_headers . "\n\n" . $body;
     }
 }
 

diff --git a/framework/Mime/test/Horde/Mime/mail_007.phpt b/framework/Mime/test/Horde/Mime/mail_007.phpt
index ac902e7..9f86bbc 100644 (file)
--- a/framework/Mime/test/Horde/Mime/mail_007.phpt
+++ b/framework/Mime/test/Horde/Mime/mail_007.phpt
@@ -7,7 +7,7 @@ require dirname(__FILE__) . '/mail_dummy.inc';
 require_once 'Horde/String.php';
 require_once 'Horde/Util.php';
 
-$dummy = Mail::factory('dummy');
+$dummy = new Mail_dummy();
 
 $mail = new Horde_Mime_Mail(array('subject' => 'My Subject',
                                   'body' => "This is\nthe body",
@@ -24,11 +24,11 @@ preg_match('/^Message-ID: (.*)$/m', $raw, $id1);
 echo "====================================================================\n";
 
 $mail->addHeader('To', 'Änderung <other@example.com>', 'utf-8');
-$raw = $mail->send(array('type' => 'dummy'));
 
 $mail->send($dummy);
 $raw = $dummy->send_output;
 
+echo $raw;
 preg_match('/^Message-ID: (.*)$/m', $raw, $id2);
 
 echo "====================================================================\n";
@@ -41,23 +41,19 @@ Subject: My Subject
 To: recipient@example.com
 From: sender@example.com
 Message-ID: <%d.%s@mail.example.com>
-User-Agent: Horde Application Framework 4.0
+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
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
 
 This is
 the body
 ====================================================================
 Subject: My Subject
 From: sender@example.com
-User-Agent: Horde Application Framework 4.0
+User-Agent: Horde Application Framework 4
 Content-Type: text/plain; charset=iso-8859-15; format=flowed; DelSp=Yes
 MIME-Version: 1.0
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
 To: =?utf-8?b?w4RuZGVydW5n?= <other@example.com>
 Message-ID: <%d.%s@mail.example.com>
 Date: %s, %d %s %d %d:%d:%d %s%d

diff --git a/framework/Mime/test/Horde/Mime/mail_008.phpt b/framework/Mime/test/Horde/Mime/mail_008.phpt
index ca21f70..4f6e9ee 100644 (file)
--- a/framework/Mime/test/Horde/Mime/mail_008.phpt
+++ b/framework/Mime/test/Horde/Mime/mail_008.phpt
@@ -23,12 +23,10 @@ echo $dummy->send_output;
 Subject: My Subject
 To: recipient@example.com
 Message-ID: <%d.%s@mail.example.com>
-User-Agent: Horde Application Framework 4.0
+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-Disposition: inline
-Content-Transfer-Encoding: 7bit
 
 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do  
 eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad  

diff --git a/framework/Mime/test/Horde/Mime/mail_dummy.inc b/framework/Mime/test/Horde/Mime/mail_dummy.inc
index 0b0e822..197d007 100644 (file)
--- a/framework/Mime/test/Horde/Mime/mail_dummy.inc
+++ b/framework/Mime/test/Horde/Mime/mail_dummy.inc
@@ -17,9 +17,9 @@ $_SERVER['SERVER_NAME'] = 'mail.example.com';
 
 class Mail_dummy extends Mail
 {
-    var $send_output;
+    public $send_output;
 
-    function send($recipients, $headers, $body)
+    public function send($recipients, $headers, $body)
     {
         list(,$text_headers) = Mail::prepareHeaders($headers);
         $this->send_output = $text_headers . "\n\n" . $body;