From 9fc97eebefd27f3f030872a96655debaa7e2b20a Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 17 Jun 2009 13:44:25 -0600
Subject: [PATCH] Horde_Mime test cleanup

Add RFC 2231 test
Move static files to fixtures/
Fix include paths
---
 framework/Mime/package.xml                         | 20 ++++++++++++++++++++
 framework/Mime/test/Horde/Mime/bug_325.phpt        |  2 +-
 .../test/Horde/Mime/{ => fixtures}/attachment.bin  |  0
 .../test/Horde/Mime/{ => fixtures}/bug_325.txt     |  0
 .../Mime/test/Horde/Mime/{ => fixtures}/url1.html  |  0
 .../Mime/test/Horde/Mime/{ => fixtures}/url2.html  |  0
 .../Mime/test/Horde/Mime/{ => fixtures}/url3.html  |  0
 .../Mime/test/Horde/Mime/{ => fixtures}/url4.html  |  0
 .../Mime/test/Horde/Mime/{ => fixtures}/url5.html  |  0
 .../Mime/test/Horde/Mime/{ => fixtures}/url6.html  |  0
 .../Mime/test/Horde/Mime/{ => fixtures}/url7.html  |  0
 framework/Mime/test/Horde/Mime/mail_004.phpt       |  2 +-
 framework/Mime/test/Horde/Mime/mail_006.phpt       |  2 +-
 framework/Mime/test/Horde/Mime/rfc2231.phpt        | 22 ++++++++++++++++++++++
 framework/Mime/test/Horde/Mime/url.phpt            |  2 +-
 15 files changed, 46 insertions(+), 4 deletions(-)
 rename framework/Mime/test/Horde/Mime/{ => fixtures}/attachment.bin (100%)
 rename framework/Mime/test/Horde/Mime/{ => fixtures}/bug_325.txt (100%)
 rename framework/Mime/test/Horde/Mime/{ => fixtures}/url1.html (100%)
 rename framework/Mime/test/Horde/Mime/{ => fixtures}/url2.html (100%)
 rename framework/Mime/test/Horde/Mime/{ => fixtures}/url3.html (100%)
 rename framework/Mime/test/Horde/Mime/{ => fixtures}/url4.html (100%)
 rename framework/Mime/test/Horde/Mime/{ => fixtures}/url5.html (100%)
 rename framework/Mime/test/Horde/Mime/{ => fixtures}/url6.html (100%)
 rename framework/Mime/test/Horde/Mime/{ => fixtures}/url7.html (100%)
 create mode 100644 framework/Mime/test/Horde/Mime/rfc2231.phpt

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">
    <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/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)
 <?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/attachment.bin b/framework/Mime/test/Horde/Mime/fixtures/attachment.bin
similarity index 100%
rename from framework/Mime/test/Horde/Mime/attachment.bin
rename to framework/Mime/test/Horde/Mime/fixtures/attachment.bin
diff --git a/framework/Mime/test/Horde/Mime/bug_325.txt b/framework/Mime/test/Horde/Mime/fixtures/bug_325.txt
similarity index 100%
rename from framework/Mime/test/Horde/Mime/bug_325.txt
rename to framework/Mime/test/Horde/Mime/fixtures/bug_325.txt
diff --git a/framework/Mime/test/Horde/Mime/url1.html b/framework/Mime/test/Horde/Mime/fixtures/url1.html
similarity index 100%
rename from framework/Mime/test/Horde/Mime/url1.html
rename to framework/Mime/test/Horde/Mime/fixtures/url1.html
diff --git a/framework/Mime/test/Horde/Mime/url2.html b/framework/Mime/test/Horde/Mime/fixtures/url2.html
similarity index 100%
rename from framework/Mime/test/Horde/Mime/url2.html
rename to framework/Mime/test/Horde/Mime/fixtures/url2.html
diff --git a/framework/Mime/test/Horde/Mime/url3.html b/framework/Mime/test/Horde/Mime/fixtures/url3.html
similarity index 100%
rename from framework/Mime/test/Horde/Mime/url3.html
rename to framework/Mime/test/Horde/Mime/fixtures/url3.html
diff --git a/framework/Mime/test/Horde/Mime/url4.html b/framework/Mime/test/Horde/Mime/fixtures/url4.html
similarity index 100%
rename from framework/Mime/test/Horde/Mime/url4.html
rename to framework/Mime/test/Horde/Mime/fixtures/url4.html
diff --git a/framework/Mime/test/Horde/Mime/url5.html b/framework/Mime/test/Horde/Mime/fixtures/url5.html
similarity index 100%
rename from framework/Mime/test/Horde/Mime/url5.html
rename to framework/Mime/test/Horde/Mime/fixtures/url5.html
diff --git a/framework/Mime/test/Horde/Mime/url6.html b/framework/Mime/test/Horde/Mime/fixtures/url6.html
similarity index 100%
rename from framework/Mime/test/Horde/Mime/url6.html
rename to framework/Mime/test/Horde/Mime/fixtures/url6.html
diff --git a/framework/Mime/test/Horde/Mime/url7.html b/framework/Mime/test/Horde/Mime/fixtures/url7.html
similarity index 100%
rename from framework/Mime/test/Horde/Mime/url7.html
rename to framework/Mime/test/Horde/Mime/fixtures/url7.html
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--
+<?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 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();
 }
-- 
2.11.0