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

diff --git a/framework/Kolab_Format/TODO b/framework/Kolab_Format/TODO
index 152116f..83b6e18 100644 (file)
--- 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 127c111..7d8a1da 100644 (file)
--- 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...');