MPD client: Tries to resolve MusicBrainzArtistID when possible (fixed b36c71a)

[mpd-sima.git] / tests / test_meta.py

diff --git a/tests/test_meta.py b/tests/test_meta.py
index 783f647f52c971565b49816239b296c337c09173..aefd339d83934bc08b414643fbcb02cc4445bbe2 100644 (file)
--- a/tests/test_meta.py
+++ b/tests/test_meta.py
@@ -56,6 +56,15 @@ class TestMetaObject(unittest.TestCase):
         # test equality Obj.__name with OgjBis.__aliases
         self.assertTrue(art0 == Meta(name='A Silver Mt. Zion'))
 
+        art1 = Meta(name='Silver Mt. Zion')
+        art1.add_alias(art0)
+        self.assertIn('A Silver Mt. Zion', art1.aliases)
+
+        art3 = Meta(name='foo')
+        art3.add_alias('Silver Mt. Zion')
+        art1.add_alias(art3)
+        self.assertNotIn('Silver Mt. Zion', art1.aliases)
+
     def test_union(self):
         art00 = Meta(name='Aphex Twin',
                            mbid='f22942a1-6f70-4f48-866e-238cb2308fbd')
@@ -121,24 +130,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},
                 {},
                 ]: