From: Gunnar Wrobel <p@rdus.de>
Date: Mon, 12 Apr 2010 18:49:47 +0000 (+0200)
Subject: Fix the Horde_String side effect in the Kolab_Format event test. Add corresponding... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=dbf884136eac3745c9dbf86ee778d3ce75308721;p=horde.git

Fix the Horde_String side effect in the Kolab_Format event test. Add corresponding TODO item.
---

diff --git a/framework/Kolab_Format/TODO b/framework/Kolab_Format/TODO
index 152116f01..83b6e188b 100644
--- a/framework/Kolab_Format/TODO
+++ b/framework/Kolab_Format/TODO
@@ -3,3 +3,7 @@
 ====================================
 
  - Find a decent way of handling tags within Horde 4
+
+ - Remove dependency on the Horde_Nls and Horde_String language
+   settings. I currently assume we should only return UTF-8 from this
+   library.
diff --git a/framework/Kolab_Format/test/Horde/Kolab/Format/EventTest.php b/framework/Kolab_Format/test/Horde/Kolab/Format/EventTest.php
index 127c111a6..7d8a1da5e 100644
--- a/framework/Kolab_Format/test/Horde/Kolab/Format/EventTest.php
+++ b/framework/Kolab_Format/test/Horde/Kolab/Format/EventTest.php
@@ -41,6 +41,7 @@ class Horde_Kolab_Format_EventTest extends PHPUnit_Framework_TestCase
     protected function setUp()
     {
         Horde_Nls::setCharset('utf-8');
+        Horde_String::setDefaultCharset('iso-8859-1');
     }
 
 
@@ -57,6 +58,7 @@ class Horde_Kolab_Format_EventTest extends PHPUnit_Framework_TestCase
         $event  = file_get_contents(dirname(__FILE__)
                                     . '/fixtures/event_umlaut.xml');
         $result = $xml->load($event);
+
         // Check that the xml loads fine
         $this->assertEquals(mb_convert_encoding($result['body'], 'UTF-8',
                                                 'ISO-8859-1'), '...übbe...');