X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=tests%2Ftest_meta.py;h=e1be51b63681beead721a00952c13a525d8ceff1;hb=703c89bb8361c1d5bc7456ef47a91b5e63dcb74b;hp=a615a18e84279034f7dc574fc61502c78af9056a;hpb=031f1da47546ebf12f6e74467fcf4824ea4a26a3;p=mpd-sima.git

diff --git a/tests/test_meta.py b/tests/test_meta.py
index a615a18..e1be51b 100644
--- a/tests/test_meta.py
+++ b/tests/test_meta.py
@@ -2,7 +2,7 @@
 
 import unittest
 
-from sima.lib.meta import Meta, Artist, MetaContainer, is_uuid4
+from sima.lib.meta import Meta, Artist, Album, MetaContainer, is_uuid4
 from sima.lib.meta import MetaException, SEPARATOR
 
 VALID = '110e8100-e29b-41d1-a716-116655250000'
@@ -13,7 +13,6 @@ class TestMetaObject(unittest.TestCase):
         wrong = VALID +'a'
         self.assertFalse(is_uuid4(wrong))
         #  test UUID4 format validation
-        self.assertFalse(is_uuid4(VALID.replace('4', '3')))
         self.assertFalse(is_uuid4(VALID.replace('a', 'z')))
 
     def test_init(self):
@@ -102,6 +101,22 @@ class TestMetaObject(unittest.TestCase):
         art10._Meta__mbid = None
         self.assertTrue(art01 == art10, 'wrong: %r != %r' % (art00, art01))
 
+    def test_mpd_serialization(self):
+        """Controls serialization of names"""
+        name = "Heaven's Door"
+        heavens_door = Meta(name=name)
+        target = r"Heaven\'s Door"
+        self.assertEqual(heavens_door.name_sz, target)
+        self.assertEqual(heavens_door.name, name)
+        self.assertEqual(heavens_door.names_sz, {target})
+        heavens_door.add_alias(name+" LP")
+        self.assertEqual(heavens_door.aliases_sz, {target+" LP"})
+        # Controls inheritance
+        heavens_door = Album(name=name)
+        self.assertEqual(heavens_door.name_sz, target)
+        heavens_door = Artist(name=name)
+        self.assertEqual(heavens_door.name_sz, target)
+
 
 class TestArtistObject(unittest.TestCase):
 
@@ -109,17 +124,15 @@ class TestArtistObject(unittest.TestCase):
         artist = {'artist': SEPARATOR.join(['Original Name', 'Featuring Nane', 'Feature…']),
                   'albumartist': 'Name',
                   'musicbrainz_artistid': VALID,
-                  'musicbrainz_albumartistid': VALID.replace('11', '22'),
                   }
         art = Artist(**artist)
-        self.assertTrue(art.name == 'Name')
-        self.assertTrue(art.mbid == VALID.replace('11', '22'))
-        artist.pop('musicbrainz_albumartistid')
-        art = Artist(**artist)
+        self.assertEqual(art.name, 'Original Name')
         self.assertTrue(art.mbid == VALID)
+        self.assertEqual(art.albumartist, artist['albumartist'])
         artist.pop('albumartist')
         art = Artist(**artist)
-        self.assertTrue(art.name == 'Original Name', art.name)
+        self.assertTrue(art.name, 'Original Name')
+        self.assertTrue(art.albumartist, 'Original Name')
 
     def test_empty_name(self):
         for args in [