X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=tests%2Ftest_meta.py;h=b7782b4129b6fa8aae67b784b6a7d3c6f774ca4c;hb=d1ab072afd8e59267b7cad0e679a4d947fe7fd19;hp=ed241cf1a04f85f9c2ee4db53d1ad148a1f3ef1d;hpb=c562e5def0073de216785ee57085658b0ee441b5;p=mpd-sima.git

diff --git a/tests/test_meta.py b/tests/test_meta.py
index ed241cf..b7782b4 100644
--- a/tests/test_meta.py
+++ b/tests/test_meta.py
@@ -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):
@@ -122,24 +121,24 @@ class TestMetaObject(unittest.TestCase):
 class TestArtistObject(unittest.TestCase):
 
     def test_init(self):
-        artist = {'artist': SEPARATOR.join(['Original Name', 'Featuring Nane', 'Feature…']),
+        artist = {'artist':
+                SEPARATOR.join(['Original Name', 'Featuring Nane', 'Feature…']),
                   'albumartist': 'Name',
-                  'musicbrainz_artistid': VALID,
-                  'musicbrainz_albumartistid': VALID.replace('11', '22'),
+                  'musicbrainz_artistid':
+                  SEPARATOR.join([VALID, VALID.replace('0000', '1312')]),
                   }
         art = Artist(**artist)
-        self.assertTrue(art.name == 'Name')
-        self.assertTrue(art.mbid == VALID.replace('11', '22'))
-        artist.pop('musicbrainz_albumartistid')
-        art = Artist(**artist)
-        self.assertTrue(art.mbid == VALID)
+        self.assertEqual(art.name, 'Original Name')
+        self.assertEqual(art.mbid, VALID)
+        self.assertEqual(art.albumartist, artist['albumartist'])
         artist.pop('albumartist')
         art = Artist(**artist)
-        self.assertTrue(art.name == 'Original Name', art.name)
+        self.assertEqual(art.name, 'Original Name')
+        self.assertEqual(art.albumartist, 'Original Name')
 
     def test_empty_name(self):
         for args in [
-                {'mbid':VALID},
+                {'mbid': VALID},
                 {'name': None},
                 {},
                 ]: