From: Michael M Slusarz Date: Wed, 17 Jun 2009 19:44:25 +0000 (-0600) Subject: Horde_Mime test cleanup X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=9fc97eebefd27f3f030872a96655debaa7e2b20a;p=horde.git Horde_Mime test cleanup Add RFC 2231 test Move static files to fixtures/ Fix include paths --- diff --git a/framework/Mime/package.xml b/framework/Mime/package.xml index 460803740..c23b62c87 100644 --- a/framework/Mime/package.xml +++ b/framework/Mime/package.xml @@ -104,13 +104,33 @@ http://pear.php.net/dtd/package-2.0.xsd"> + + + + + + + + + + + + + + + + + + + + diff --git a/framework/Mime/test/Horde/Mime/attachment.bin b/framework/Mime/test/Horde/Mime/attachment.bin deleted file mode 100644 index a17f84e7d..000000000 --- a/framework/Mime/test/Horde/Mime/attachment.bin +++ /dev/null @@ -1 +0,0 @@ -Zwölf Boxkämpfer jagen Viktor quer über den großen Sylter Deich. diff --git a/framework/Mime/test/Horde/Mime/bug_325.phpt b/framework/Mime/test/Horde/Mime/bug_325.phpt index 210bf5eb0..31543ba92 100644 --- a/framework/Mime/test/Horde/Mime/bug_325.phpt +++ b/framework/Mime/test/Horde/Mime/bug_325.phpt @@ -6,7 +6,7 @@ Bug #338 (fileinfo returning charset) --EXPECT-- text/plain diff --git a/framework/Mime/test/Horde/Mime/bug_325.txt b/framework/Mime/test/Horde/Mime/bug_325.txt deleted file mode 100644 index 0dc0fba09..000000000 --- a/framework/Mime/test/Horde/Mime/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/attachment.bin b/framework/Mime/test/Horde/Mime/fixtures/attachment.bin new file mode 100644 index 000000000..a17f84e7d --- /dev/null +++ b/framework/Mime/test/Horde/Mime/fixtures/attachment.bin @@ -0,0 +1 @@ +Zwölf Boxkämpfer jagen Viktor quer über den großen Sylter Deich. diff --git a/framework/Mime/test/Horde/Mime/fixtures/bug_325.txt b/framework/Mime/test/Horde/Mime/fixtures/bug_325.txt new file mode 100644 index 000000000..0dc0fba09 --- /dev/null +++ b/framework/Mime/test/Horde/Mime/fixtures/bug_325.txt @@ -0,0 +1,6 @@ +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/url1.html b/framework/Mime/test/Horde/Mime/fixtures/url1.html new file mode 100644 index 000000000..0c88c1490 --- /dev/null +++ b/framework/Mime/test/Horde/Mime/fixtures/url1.html @@ -0,0 +1 @@ +link diff --git a/framework/Mime/test/Horde/Mime/fixtures/url2.html b/framework/Mime/test/Horde/Mime/fixtures/url2.html new file mode 100644 index 000000000..94c45a2ca --- /dev/null +++ b/framework/Mime/test/Horde/Mime/fixtures/url2.html @@ -0,0 +1 @@ +link diff --git a/framework/Mime/test/Horde/Mime/fixtures/url3.html b/framework/Mime/test/Horde/Mime/fixtures/url3.html new file mode 100644 index 000000000..4c7eafed9 --- /dev/null +++ b/framework/Mime/test/Horde/Mime/fixtures/url3.html @@ -0,0 +1 @@ +link diff --git a/framework/Mime/test/Horde/Mime/fixtures/url4.html b/framework/Mime/test/Horde/Mime/fixtures/url4.html new file mode 100644 index 000000000..935612578 --- /dev/null +++ b/framework/Mime/test/Horde/Mime/fixtures/url4.html @@ -0,0 +1 @@ +link diff --git a/framework/Mime/test/Horde/Mime/fixtures/url5.html b/framework/Mime/test/Horde/Mime/fixtures/url5.html new file mode 100644 index 000000000..89dfbc68d --- /dev/null +++ b/framework/Mime/test/Horde/Mime/fixtures/url5.html @@ -0,0 +1 @@ +link diff --git a/framework/Mime/test/Horde/Mime/fixtures/url6.html b/framework/Mime/test/Horde/Mime/fixtures/url6.html new file mode 100644 index 000000000..73ad9fc17 --- /dev/null +++ b/framework/Mime/test/Horde/Mime/fixtures/url6.html @@ -0,0 +1 @@ +link diff --git a/framework/Mime/test/Horde/Mime/fixtures/url7.html b/framework/Mime/test/Horde/Mime/fixtures/url7.html new file mode 100644 index 000000000..cb5c80040 --- /dev/null +++ b/framework/Mime/test/Horde/Mime/fixtures/url7.html @@ -0,0 +1 @@ +link diff --git a/framework/Mime/test/Horde/Mime/mail_004.phpt b/framework/Mime/test/Horde/Mime/mail_004.phpt index 5bbecf5b7..5cd089af6 100644 --- a/framework/Mime/test/Horde/Mime/mail_004.phpt +++ b/framework/Mime/test/Horde/Mime/mail_004.phpt @@ -12,7 +12,7 @@ $mail = new Horde_Mime_Mail('My Subject', "This is\nthe body", '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__) . '/attachment.bin'), + file_get_contents(dirname(__FILE__) . '/fixtures/attachment.bin'), null, 'attachment'); 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 fc5b7fc9e..8f9680512 100644 --- a/framework/Mime/test/Horde/Mime/mail_006.phpt +++ b/framework/Mime/test/Horde/Mime/mail_006.phpt @@ -10,7 +10,7 @@ require_once 'Horde/Util.php'; $mail = new Horde_Mime_Mail('My Subject', "This is\nthe body", 'recipient@example.com', 'sender@example.com', 'iso-8859-15'); -$mail->addAttachment(dirname(__FILE__) . '/attachment.bin'); +$mail->addAttachment(dirname(__FILE__) . '/fixtures/attachment.bin'); $mail->addAttachment(dirname(__FILE__) . '/mail_dummy.inc', 'my_name.html', 'text/html', 'iso-8859-15'); echo $mail->send('dummy'); diff --git a/framework/Mime/test/Horde/Mime/rfc2231.phpt b/framework/Mime/test/Horde/Mime/rfc2231.phpt new file mode 100644 index 000000000..e7ef79267 --- /dev/null +++ b/framework/Mime/test/Horde/Mime/rfc2231.phpt @@ -0,0 +1,22 @@ +--TEST-- +Horde_Mime RFC 2231 & workaround for broken MUA's +--FILE-- + +--EXPECT-- +array(3) { + ["test"]=> + string(104) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.txt" + ["test*0"]=> + string(68) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + ["test*1"]=> + string(36) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.txt" +} diff --git a/framework/Mime/test/Horde/Mime/url.phpt b/framework/Mime/test/Horde/Mime/url.phpt index 959f9b0a0..eb08ae29f 100644 --- a/framework/Mime/test/Horde/Mime/url.phpt +++ b/framework/Mime/test/Horde/Mime/url.phpt @@ -40,7 +40,7 @@ $browser = new Browser(); for ($i = 1; $i <= 7; $i++) { $part = new Horde_Mime_Part(); $part->setType('text/html'); - $part->setContents(file_get_contents($dirname . '/url' . $i . '.html')); + $part->setContents(file_get_contents($dirname . '/fixtures/url' . $i . '.html')); $viewer = Horde_Mime_Viewer::factory($part, 'text/html'); echo $viewer->render(); } diff --git a/framework/Mime/test/Horde/Mime/url1.html b/framework/Mime/test/Horde/Mime/url1.html deleted file mode 100644 index 0c88c1490..000000000 --- a/framework/Mime/test/Horde/Mime/url1.html +++ /dev/null @@ -1 +0,0 @@ -link diff --git a/framework/Mime/test/Horde/Mime/url2.html b/framework/Mime/test/Horde/Mime/url2.html deleted file mode 100644 index 94c45a2ca..000000000 --- a/framework/Mime/test/Horde/Mime/url2.html +++ /dev/null @@ -1 +0,0 @@ -link diff --git a/framework/Mime/test/Horde/Mime/url3.html b/framework/Mime/test/Horde/Mime/url3.html deleted file mode 100644 index 4c7eafed9..000000000 --- a/framework/Mime/test/Horde/Mime/url3.html +++ /dev/null @@ -1 +0,0 @@ -link diff --git a/framework/Mime/test/Horde/Mime/url4.html b/framework/Mime/test/Horde/Mime/url4.html deleted file mode 100644 index 935612578..000000000 --- a/framework/Mime/test/Horde/Mime/url4.html +++ /dev/null @@ -1 +0,0 @@ -link diff --git a/framework/Mime/test/Horde/Mime/url5.html b/framework/Mime/test/Horde/Mime/url5.html deleted file mode 100644 index 89dfbc68d..000000000 --- a/framework/Mime/test/Horde/Mime/url5.html +++ /dev/null @@ -1 +0,0 @@ -link diff --git a/framework/Mime/test/Horde/Mime/url6.html b/framework/Mime/test/Horde/Mime/url6.html deleted file mode 100644 index 73ad9fc17..000000000 --- a/framework/Mime/test/Horde/Mime/url6.html +++ /dev/null @@ -1 +0,0 @@ -link diff --git a/framework/Mime/test/Horde/Mime/url7.html b/framework/Mime/test/Horde/Mime/url7.html deleted file mode 100644 index cb5c80040..000000000 --- a/framework/Mime/test/Horde/Mime/url7.html +++ /dev/null @@ -1 +0,0 @@ -link