Convert unicode objects to utf-8 encoded G_STRINGs

2 files changed, 24 insertions, 2 deletions

diff --git a/testsuite/test_struct.py b/testsuite/test_struct.py
index d86339d..5ab75d3 100644
--- a/testsuite/test_struct.py
+++ b/testsuite/test_struct.py
@@ -44,11 +44,11 @@ class StructureTest(TestCase):
 
     def testString(self):
         assert self.struct.has_key('foo')
-        assert isinstance(self.struct['foo'], str)
+        assert isinstance(self.struct['foo'], unicode)
         assert self.struct['foo'] == 'bar', self.struct['foo']
         self.struct['foo'] = 'baz'
         assert self.struct.has_key('foo')
-        assert isinstance(self.struct['foo'], str)
+        assert isinstance(self.struct['foo'], unicode)
         assert self.struct['foo'] == 'baz', self.struct['foo']
 
     def testBoolean(self):
diff --git a/testsuite/test_taglist.py b/testsuite/test_taglist.py
index c9c0a41..227a812 100644
--- a/testsuite/test_taglist.py
+++ b/testsuite/test_taglist.py
@@ -43,3 +43,25 @@ class TestTagList(TestCase):
         keys = taglist.keys()
         keys.sort()
         self.assertEqual(keys, ['key1', 'key2'])
+
+    def testUnicode(self):
+        taglist = gst.TagList()
+
+        # normal ASCII text
+        taglist[gst.TAG_ARTIST] = 'Artist'
+        self.failUnless(isinstance(taglist[gst.TAG_ARTIST], unicode))
+        self.assertEquals(taglist[gst.TAG_ARTIST], u'Artist')
+        self.assertEquals(taglist[gst.TAG_ARTIST], 'Artist')
+
+        # normal ASCII text as unicode
+        taglist[gst.TAG_ARTIST] = u'Artist'
+        self.failUnless(isinstance(taglist[gst.TAG_ARTIST], unicode))
+        self.assertEquals(taglist[gst.TAG_ARTIST], u'Artist')
+        self.assertEquals(taglist[gst.TAG_ARTIST], 'Artist')
+        
+        # real unicode
+        taglist[gst.TAG_ARTIST] = u'S\xc3\xadgur R\xc3\xb3s'
+        self.failUnless(isinstance(taglist[gst.TAG_ARTIST], unicode))
+        self.assertEquals(taglist[gst.TAG_ARTIST], u'S\xc3\xadgur R\xc3\xb3s')
+        
+