From 8cdb5c1f996ee115cfe07ae9e086cabc08a5b55f Mon Sep 17 00:00:00 2001 From: Lars Noack Date: Tue, 21 May 2024 13:52:20 +0200 Subject: [PATCH] fix: tests were a mess and didn't properly test the functionality but random things that worked with implementation --- music_kraken/objects/collection.py | 20 ----- music_kraken/utils/shared.py | 2 +- tests/test_collection.py | 138 ++++++++++++++--------------- 3 files changed, 66 insertions(+), 94 deletions(-) diff --git a/music_kraken/objects/collection.py b/music_kraken/objects/collection.py index 2e68f54..f1d7e75 100644 --- a/music_kraken/objects/collection.py +++ b/music_kraken/objects/collection.py @@ -115,7 +115,6 @@ class Collection(Generic[T]): self._data.append(other) other._inner._is_in_collection.add(self) - """ for attribute, a in self.sync_on_append.items(): # syncing two collections by reference b = other.__getattribute__(attribute) @@ -134,7 +133,6 @@ class Collection(Generic[T]): a._collection_for[synced_with] = key a.extend(b_data, **kwargs) - """ # all of the existing hooks to get the defined datastructures for collection_attribute, generator in self.extend_object_to_attribute.items(): @@ -162,24 +160,6 @@ class Collection(Generic[T]): object_trace(f"Appending {other.option_string} to {self}") - for attribute, a in self.sync_on_append.items(): - # syncing two collections by reference - b = other.__getattribute__(attribute) - if a is b: - continue - - object_trace(f"Syncing [{a}] = [{b}]") - - b_data = b.data.copy() - b_collection_for = b._collection_for.copy() - - del b - - for synced_with, key in b_collection_for.items(): - synced_with.__setattr__(key, a) - a._collection_for[synced_with] = key - - a.extend(b_data, **kwargs) # switching collection in the case of push to for c in self.push_to: diff --git a/music_kraken/utils/shared.py b/music_kraken/utils/shared.py index 8f671f9..2a5d4a4 100644 --- a/music_kraken/utils/shared.py +++ b/music_kraken/utils/shared.py @@ -15,7 +15,7 @@ __stage__ = os.getenv("STAGE", "prod") DEBUG = (__stage__ == "dev") and True DEBUG_LOGGING = DEBUG and False DEBUG_TRACE = DEBUG and True -DEBUG_OBJECT_TRACE = DEBUG and False +DEBUG_OBJECT_TRACE = DEBUG and True DEBUG_OBJECT_TRACE_CALLSTACK = DEBUG_OBJECT_TRACE and False DEBUG_YOUTUBE_INITIALIZING = DEBUG and False DEBUG_PAGES = DEBUG and False diff --git a/tests/test_collection.py b/tests/test_collection.py index 37b795c..7dfb29e 100644 --- a/tests/test_collection.py +++ b/tests/test_collection.py @@ -3,92 +3,94 @@ import unittest from music_kraken.objects import Song, Album, Artist, Collection, Country class TestCollection(unittest.TestCase): - @staticmethod - def complicated_object() -> Artist: - return Artist( - name="artist", - country=Country.by_alpha_2("DE"), - album_list=[ - Album( - title="album", - song_list=[ - Song( - title="song", - album_list=[ - Album(title="album", albumsort=123), - ], - ), - Song( - title="other_song", - album_list=[ - Album(title="album", albumsort=423), - ], - ), - ] - ), - Album(title="album", barcode="1234567890123"), + def test_song_contains_album(self): + """ + Tests that every song contains the album it is added to in its album_collection + """ + + a_1 = Album( + title="album", + song_list= [ + Song(title="song"), ] ) + a_2 = a_1.song_collection[0].album_collection[0] + self.assertTrue(a_1.id == a_2.id) - def test_song_album_relation(self): + def test_album_contains_song(self): """ - Tests that - album = album.any_song.one_album - is the same object + Tests that every album contains the song it is added to in its song_collection + """ + s_1 = Song( + title="song", + album_list=[ + Album(title="album"), + ] + ) + s_2 = s_1.album_collection[0].song_collection[0] + self.assertTrue(s_1.id == s_2.id) + + + def test_auto_add_artist_to_album_feature_artist(self): + """ + Tests that every artist is added to the album's feature_artist_collection per default """ - a = self.complicated_object().album_collection[0] - b = a.song_collection[0].album_collection[0] - c = a.song_collection[1].album_collection[0] - d = b.song_collection[0].album_collection[0] - e = d.song_collection[0].album_collection[0] - f = e.song_collection[0].album_collection[0] - g = f.song_collection[0].album_collection[0] + a_1 = Artist( + name="artist", + album_list=[ + Album(title="album") + ] + ) + a_2 = a_1.album_collection[0].feature_artist_collection[0] - self.assertTrue(a.id == b.id == c.id == d.id == e.id == f.id == g.id) - self.assertTrue(a.title == b.title == c.title == d.title == e.title == f.title == g.title == "album") - self.assertTrue(a.barcode == b.barcode == c.barcode == d.barcode == e.barcode == f.barcode == g.barcode == "1234567890123") - self.assertTrue(a.albumsort == b.albumsort == c.albumsort == d.albumsort == e.albumsort == f.albumsort == g.albumsort == 123) - - d.title = "new_title" - - self.assertTrue(a.title == b.title == c.title == d.title == e.title == f.title == g.title == "new_title") - - def test_album_artist_relation(self): + self.assertTrue(a_1.id == a_2.id) + + def test_auto_add_artist_to_album_feature_artist_push(self): """ - Tests that - artist = artist.any_album.any_song.one_artist - is the same object + Tests that every artist is added to the album's feature_artist_collection per default but pulled into the album's artist_collection if a merge exitst """ - a = self.complicated_object() - b = a.album_collection[0].artist_collection[0] - c = b.album_collection[0].artist_collection[0] - d = c.album_collection[0].artist_collection[0] - - self.assertTrue(a.id == b.id == c.id == d.id) - self.assertTrue(a.name == b.name == c.name == d.name == "artist") - self.assertTrue(a.country == b.country == c.country == d.country) - - def test_artist_artist_relation(self): - artist = Artist( + a_1 = Artist( name="artist", album_list=[ Album( title="album", - song_list=[ - Song(title="song"), - ], artist_list=[ Artist(name="artist"), ] ) ] ) + a_2 = a_1.album_collection[0].artist_collection[0] - self.assertTrue(artist.id == artist.album_collection[0].song_collection[0].artist_collection[0].id) + self.assertTrue(a_1.id == a_2.id) + + + def test_artist_artist_relation(self): + """ + Tests the proper syncing between album.artist_collection and song.artist_collection + """ + + album = Album( + title="album", + song_list=[ + Song(title="song"), + ], + artist_list=[ + Artist(name="artist"), + ] + ) + a_1 = album.artist_collection[0] + a_2 = album.song_collection[0].artist_collection[0] + + self.assertTrue(a_1.id == a_2.id) def test_artist_collection_sync(self): + """ + tests the actual implementation of the test above + """ + album_1 = Album( title="album", song_list=[ @@ -113,15 +115,5 @@ class TestCollection(unittest.TestCase): self.assertTrue(id(album_1.artist_collection) == id(album_1.artist_collection) == id(album_1.song_collection[0].artist_collection) == id(album_1.song_collection[0].artist_collection)) - def test_song_artist_relations(self): - a = self.complicated_object() - b = a.album_collection[0].song_collection[0].artist_collection[0] - c = b.album_collection[0].song_collection[0].artist_collection[0] - d = c.album_collection[0].song_collection[0].artist_collection[0] - - self.assertTrue(a.id == b.id == c.id == d.id) - self.assertTrue(a.name == b.name == c.name == d.name == "artist") - self.assertTrue(a.country == b.country == c.country == d.country) - if __name__ == "__main__": unittest.main()