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 4608037..c23b62c 100644 (file)
--- a/framework/Mime/package.xml
+++ b/framework/Mime/package.xml
@@ -104,13 +104,33 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <dir name="test">
     <dir name="Horde">
      <dir name="Mime">
+      <dir name="fixtures">
+       <file name="attachment.bin" role="test" />
+       <file name="bug_325.txt" role="test" />
+       <file name="url1.html" role="test" />
+       <file name="url2.html" role="test" />
+       <file name="url3.html" role="test" />
+       <file name="url4.html" role="test" />
+       <file name="url5.html" role="test" />
+       <file name="url6.html" role="test" />
+       <file name="url7.html" role="test" />
+      </dir> <!-- /test/Horde/Mime/fixtures -->
+      <file name="AllTests.php" role="test" />
       <file name="bug_325.phpt" role="test" />
+      <file name="bug_4834.phpt" role="test" />
+      <file name="bug_6896.phpt" role="test" />
       <file name="mail_001.phpt" role="test" />
       <file name="mail_002.phpt" role="test" />
       <file name="mail_003.phpt" role="test" />
       <file name="mail_004.phpt" role="test" />
       <file name="mail_005.phpt" role="test" />
+      <file name="mail_006.phpt" role="test" />
+      <file name="mail_007.phpt" role="test" />
+      <file name="mail_008.phpt" role="test" />
       <file name="mail_dummy.inc" role="test" />
+      <file name="rfc2231.phpt" role="test" />
+      <file name="url.phpt" role="test" />
+      <file name="viewer_php.phpt" role="test" />
      </dir> <!-- /test/Horde/Mime -->
     </dir> <!-- /test/Horde -->
    </dir> <!-- /test -->

diff --git a/framework/Mime/test/Horde/Mime/attachment.bin b/framework/Mime/test/Horde/Mime/attachment.bin
deleted file mode 100644 (file)
index a17f84e..0000000
--- 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 210bf5e..31543ba 100644 (file)
--- 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)
 <?php
 require_once 'Horde/Util.php';
 require dirname(__FILE__) . '/../../../lib/Horde/Mime/Magic.php';
-echo Horde_Mime_Magic::analyzeFile(dirname(__FILE__) . '/bug_325.txt');
+echo Horde_Mime_Magic::analyzeFile(dirname(__FILE__) . '/fixtures/bug_325.txt');
 ?>
 --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 (file)
index 0dc0fba..0000000
--- 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 (file)
index 0000000..a17f84e
--- /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 (file)
index 0000000..0dc0fba
--- /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 (file)
index 0000000..0c88c14
--- /dev/null
+++ b/framework/Mime/test/Horde/Mime/fixtures/url1.html
@@ -0,0 +1 @@
+<A HREF=http://66.102.7.147/>link</A>

diff --git a/framework/Mime/test/Horde/Mime/fixtures/url2.html b/framework/Mime/test/Horde/Mime/fixtures/url2.html
new file mode 100644 (file)
index 0000000..94c45a2
--- /dev/null
+++ b/framework/Mime/test/Horde/Mime/fixtures/url2.html
@@ -0,0 +1 @@
+<A HREF=http://%77%77%77%2E%67%6F%6F%67%6C%65%2E%63%6F%6D>link</A>

diff --git a/framework/Mime/test/Horde/Mime/fixtures/url3.html b/framework/Mime/test/Horde/Mime/fixtures/url3.html
new file mode 100644 (file)
index 0000000..4c7eafe
--- /dev/null
+++ b/framework/Mime/test/Horde/Mime/fixtures/url3.html
@@ -0,0 +1 @@
+<A HREF=ht://www.google.com/>link</A>

diff --git a/framework/Mime/test/Horde/Mime/fixtures/url4.html b/framework/Mime/test/Horde/Mime/fixtures/url4.html
new file mode 100644 (file)
index 0000000..9356125
--- /dev/null
+++ b/framework/Mime/test/Horde/Mime/fixtures/url4.html
@@ -0,0 +1 @@
+<A HREF=http://google.com/>link</A>

diff --git a/framework/Mime/test/Horde/Mime/fixtures/url5.html b/framework/Mime/test/Horde/Mime/fixtures/url5.html
new file mode 100644 (file)
index 0000000..89dfbc6
--- /dev/null
+++ b/framework/Mime/test/Horde/Mime/fixtures/url5.html
@@ -0,0 +1 @@
+<A HREF=http://www.google.com./>link</A>

diff --git a/framework/Mime/test/Horde/Mime/fixtures/url6.html b/framework/Mime/test/Horde/Mime/fixtures/url6.html
new file mode 100644 (file)
index 0000000..73ad9fc
--- /dev/null
+++ b/framework/Mime/test/Horde/Mime/fixtures/url6.html
@@ -0,0 +1 @@
+<A HREF="javascript:document.location='http://www.google.com/'">link</A>

diff --git a/framework/Mime/test/Horde/Mime/fixtures/url7.html b/framework/Mime/test/Horde/Mime/fixtures/url7.html
new file mode 100644 (file)
index 0000000..cb5c800
--- /dev/null
+++ b/framework/Mime/test/Horde/Mime/fixtures/url7.html
@@ -0,0 +1 @@
+<A HREF=http://www.gohttp://www.google.com/ogle.com/>link</A>

diff --git a/framework/Mime/test/Horde/Mime/mail_004.phpt b/framework/Mime/test/Horde/Mime/mail_004.phpt
index 5bbecf5..5cd089a 100644 (file)
--- 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 fc5b7fc..8f96805 100644 (file)
--- 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 (file)
index 0000000..e7ef792
--- /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--
+<?php
+
+require dirname(__FILE__) . '/../../../lib/Horde/Mime.php';
+require_once 'Horde/String.php';
+require_once 'Horde/Util.php';
+
+Horde_Mime::$brokenRFC2231 = true;
+var_dump(Horde_Mime::encodeParam('test', str_repeat('a', 100) . '.txt', 'UTF-8'));
+
+?>
+--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 959f9b0..eb08ae2 100644 (file)
--- 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 (file)
index 0c88c14..0000000
--- a/framework/Mime/test/Horde/Mime/url1.html
+++ /dev/null
@@ -1 +0,0 @@
-<A HREF=http://66.102.7.147/>link</A>

diff --git a/framework/Mime/test/Horde/Mime/url2.html b/framework/Mime/test/Horde/Mime/url2.html
deleted file mode 100644 (file)
index 94c45a2..0000000
--- a/framework/Mime/test/Horde/Mime/url2.html
+++ /dev/null
@@ -1 +0,0 @@
-<A HREF=http://%77%77%77%2E%67%6F%6F%67%6C%65%2E%63%6F%6D>link</A>

diff --git a/framework/Mime/test/Horde/Mime/url3.html b/framework/Mime/test/Horde/Mime/url3.html
deleted file mode 100644 (file)
index 4c7eafe..0000000
--- a/framework/Mime/test/Horde/Mime/url3.html
+++ /dev/null
@@ -1 +0,0 @@
-<A HREF=ht://www.google.com/>link</A>

diff --git a/framework/Mime/test/Horde/Mime/url4.html b/framework/Mime/test/Horde/Mime/url4.html
deleted file mode 100644 (file)
index 9356125..0000000
--- a/framework/Mime/test/Horde/Mime/url4.html
+++ /dev/null
@@ -1 +0,0 @@
-<A HREF=http://google.com/>link</A>

diff --git a/framework/Mime/test/Horde/Mime/url5.html b/framework/Mime/test/Horde/Mime/url5.html
deleted file mode 100644 (file)
index 89dfbc6..0000000
--- a/framework/Mime/test/Horde/Mime/url5.html
+++ /dev/null
@@ -1 +0,0 @@
-<A HREF=http://www.google.com./>link</A>

diff --git a/framework/Mime/test/Horde/Mime/url6.html b/framework/Mime/test/Horde/Mime/url6.html
deleted file mode 100644 (file)
index 73ad9fc..0000000
--- a/framework/Mime/test/Horde/Mime/url6.html
+++ /dev/null
@@ -1 +0,0 @@
-<A HREF="javascript:document.location='http://www.google.com/'">link</A>

diff --git a/framework/Mime/test/Horde/Mime/url7.html b/framework/Mime/test/Horde/Mime/url7.html
deleted file mode 100644 (file)
index cb5c800..0000000
--- a/framework/Mime/test/Horde/Mime/url7.html
+++ /dev/null
@@ -1 +0,0 @@
-<A HREF=http://www.gohttp://www.google.com/ogle.com/>link</A>