Index: /main/waeup.sirp/trunk/src/waeup/sirp/utils/tests/test_helpers.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/utils/tests/test_helpers.py	(revision 5874)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/utils/tests/test_helpers.py	(revision 5875)
@@ -1,2 +1,4 @@
+# -*- coding: utf-8 -*-
+
 ##
 ## test_helpers.py
@@ -133,5 +135,32 @@
         return
 
+class ReST2HTMLTestCase(unittest.TestCase):
 
+    def setUp(self):
+        self.expected = u'<div class="document">\n\n\n<p>Some '
+        self.expected += u'test with \xfcmlaut</p>\n</div>'
+        return
+    
+    def test_ascii_umlauts(self):
+        # Make sure we convert umlauts correctly to unicode.
+        source = 'Some test with ümlaut'
+        result = helpers.ReST2HTML(source)
+        self.assertEqual(result, self.expected)
+
+    def test_unicode_umlauts(self):
+        # Make sure we convert umlauts correctly to unicode.
+        source = u'Some test with ümlaut'
+        result = helpers.ReST2HTML(source)
+        self.assertEqual(result, self.expected)
+
+    def test_unicode_output_from_ascii(self):
+        source = 'Some test with ümlaut'
+        self.assertTrue(isinstance(helpers.ReST2HTML(source), unicode))
+
+    def test_unicode_output_from_unicode(self):
+        source = u'Some test with ümlaut'
+        self.assertTrue(isinstance(helpers.ReST2HTML(source), unicode))
+
+        
 class FactoryBaseTestCase(unittest.TestCase):
 
@@ -148,4 +177,5 @@
     # Register local test cases...
     for testcase in [
+        ReST2HTMLTestCase,
         FactoryBaseTestCase,
         CopyFileSystemTreeTestCase,
