From 096889d6cb8cea8f19c9fb2f4046700a9959321d Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Tue, 4 Mar 2025 13:22:29 +0000 Subject: [PATCH] Fix up tests in light of recent changes --- tests/test_file_importer.py | 4 ++-- tests/test_models.py | 21 ++++++++------------- tests/test_playlistmodel.py | 24 ++++++++++++------------ tests/test_ui.py | 19 ++++++++++--------- 4 files changed, 32 insertions(+), 36 deletions(-) diff --git a/tests/test_file_importer.py b/tests/test_file_importer.py index feb9ee5..f49e557 100644 --- a/tests/test_file_importer.py +++ b/tests/test_file_importer.py @@ -57,8 +57,8 @@ class MyTestCase(unittest.TestCase): # Create a playlist for all tests playlist_name = "file importer playlist" with db.Session() as session: - playlist = Playlists(session, playlist_name) - cls.widget.create_playlist_tab(playlist) + playlist = Playlists(session=session, name=playlist_name, template_id=0) + cls.widget._open_playlist(playlist) # Create our musicstore cls.import_source = tempfile.mkdtemp(suffix="_MMsource_pytest", dir="/tmp") diff --git a/tests/test_models.py b/tests/test_models.py index b03eef1..20deaee 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -108,7 +108,7 @@ class TestMMModels(unittest.TestCase): TEMPLATE_NAME = "my template" with db.Session() as session: - playlist = Playlists(session, "my playlist") + playlist = Playlists(session, "my playlist", template_id=0) assert playlist # test repr _ = str(playlist) @@ -119,23 +119,18 @@ class TestMMModels(unittest.TestCase): # create template Playlists.save_as_template(session, playlist.id, TEMPLATE_NAME) - # test create template - _ = Playlists.create_playlist_from_template( - session, playlist, "my new name" - ) - # get all templates all_templates = Playlists.get_all_templates(session) assert len(all_templates) == 1 # Save as template creates new playlist assert all_templates[0] != playlist # test delete playlist - playlist.delete(session) + session.delete(playlist) def test_playlist_open_and_close(self): # We need a playlist with db.Session() as session: - playlist = Playlists(session, "my playlist") + playlist = Playlists(session, "my playlist", template_id=0) assert len(Playlists.get_open(session)) == 0 assert len(Playlists.get_closed(session)) == 1 @@ -155,8 +150,8 @@ class TestMMModels(unittest.TestCase): p1_name = "playlist one" p2_name = "playlist two" with db.Session() as session: - playlist1 = Playlists(session, p1_name) - _ = Playlists(session, p2_name) + playlist1 = Playlists(session, p1_name, template_id=0) + _ = Playlists(session, p2_name, template_id=0) all_playlists = Playlists.get_all(session) assert len(all_playlists) == 2 @@ -254,7 +249,7 @@ class TestMMModels(unittest.TestCase): with db.Session() as session: if Playlists.name_is_available(session, PLAYLIST_NAME): - playlist = Playlists(session, PLAYLIST_NAME) + playlist = Playlists(session, PLAYLIST_NAME, template_id=0) assert playlist assert Playlists.name_is_available(session, PLAYLIST_NAME) is False @@ -266,7 +261,7 @@ class TestMMModels(unittest.TestCase): with db.Session() as session: if Playlists.name_is_available(session, PLAYLIST_NAME): - playlist = Playlists(session, PLAYLIST_NAME) + playlist = Playlists(session=session, name=PLAYLIST_NAME, template_id=0) plr = PlaylistRows(session, playlist.id, 1) assert plr @@ -279,7 +274,7 @@ class TestMMModels(unittest.TestCase): with db.Session() as session: if Playlists.name_is_available(session, PLAYLIST_NAME): - playlist = Playlists(session, PLAYLIST_NAME) + playlist = Playlists(session=session, name=PLAYLIST_NAME, template_id=0) plr = PlaylistRows(session, playlist.id, 1) assert plr diff --git a/tests/test_playlistmodel.py b/tests/test_playlistmodel.py index 42778c0..4791d2c 100644 --- a/tests/test_playlistmodel.py +++ b/tests/test_playlistmodel.py @@ -34,8 +34,8 @@ class TestMMMiscTracks(unittest.TestCase): # Create a playlist and model with db.Session() as session: - self.playlist = Playlists(session, PLAYLIST_NAME) - self.model = playlistmodel.PlaylistModel(self.playlist.id) + self.playlist = Playlists(session, PLAYLIST_NAME, template_id=0) + self.model = playlistmodel.PlaylistModel(self.playlist.id, is_template=False) for row in range(len(self.test_tracks)): track_path = self.test_tracks[row % len(self.test_tracks)] @@ -93,9 +93,9 @@ class TestMMMiscNoPlaylist(unittest.TestCase): def test_insert_track_new_playlist(self): # insert a track into a new playlist with db.Session() as session: - playlist = Playlists(session, self.PLAYLIST_NAME) + playlist = Playlists(session, self.PLAYLIST_NAME, template_id=0) # Create a model - model = playlistmodel.PlaylistModel(playlist.id) + model = playlistmodel.PlaylistModel(playlist.id, is_template=False) # test repr _ = str(model) @@ -124,8 +124,8 @@ class TestMMMiscRowMove(unittest.TestCase): db.create_all() with db.Session() as session: - self.playlist = Playlists(session, self.PLAYLIST_NAME) - self.model = playlistmodel.PlaylistModel(self.playlist.id) + self.playlist = Playlists(session, self.PLAYLIST_NAME, template_id=0) + self.model = playlistmodel.PlaylistModel(self.playlist.id, is_template=False) for row in range(self.ROWS_TO_CREATE): self.model.insert_row(proposed_row_number=row, note=str(row)) @@ -318,8 +318,8 @@ class TestMMMiscRowMove(unittest.TestCase): model_src = self.model with db.Session() as session: - playlist_dst = Playlists(session, destination_playlist) - model_dst = playlistmodel.PlaylistModel(playlist_dst.id) + playlist_dst = Playlists(session, destination_playlist, template_id=0) + model_dst = playlistmodel.PlaylistModel(playlist_dst.id, is_template=False) for row in range(self.ROWS_TO_CREATE): model_dst.insert_row(proposed_row_number=row, note=str(row)) @@ -339,8 +339,8 @@ class TestMMMiscRowMove(unittest.TestCase): model_src = self.model with db.Session() as session: - playlist_dst = Playlists(session, destination_playlist) - model_dst = playlistmodel.PlaylistModel(playlist_dst.id) + playlist_dst = Playlists(session, destination_playlist, template_id=0) + model_dst = playlistmodel.PlaylistModel(playlist_dst.id, is_template=False) for row in range(self.ROWS_TO_CREATE): model_dst.insert_row(proposed_row_number=row, note=str(row)) @@ -366,8 +366,8 @@ class TestMMMiscRowMove(unittest.TestCase): model_src = self.model with db.Session() as session: - playlist_dst = Playlists(session, destination_playlist) - model_dst = playlistmodel.PlaylistModel(playlist_dst.id) + playlist_dst = Playlists(session, destination_playlist, template_id=0) + model_dst = playlistmodel.PlaylistModel(playlist_dst.id, is_template=False) for row in range(self.ROWS_TO_CREATE): model_dst.insert_row(proposed_row_number=row, note=str(row)) diff --git a/tests/test_ui.py b/tests/test_ui.py index 2d6f34b..508c700 100644 --- a/tests/test_ui.py +++ b/tests/test_ui.py @@ -90,8 +90,8 @@ class MyTestCase(unittest.TestCase): playlist_name = "test_init playlist" with db.Session() as session: - playlist = Playlists(session, playlist_name) - self.widget.create_playlist_tab(playlist) + playlist = Playlists(session, playlist_name, template_id=0) + self.widget._open_playlist(playlist, is_template=False) with self.qtbot.waitExposed(self.widget): self.widget.show() @@ -103,8 +103,8 @@ class MyTestCase(unittest.TestCase): playlist_name = "test_save_and_restore playlist" with db.Session() as session: - playlist = Playlists(session, playlist_name) - model = playlistmodel.PlaylistModel(playlist.id) + playlist = Playlists(session, playlist_name, template_id=0) + model = playlistmodel.PlaylistModel(playlist.id, is_template=False) # Add a track with a note model.insert_row( @@ -139,7 +139,7 @@ class MyTestCase(unittest.TestCase): # def test_meta_all_clear(qtbot, session): # # Create playlist -# playlist = models.Playlists(session, "my playlist") +# playlist = models.Playlists(session, "my playlist", template_id=0) # playlist_tab = playlists.PlaylistTab(None, session, playlist.id) # # Add some tracks @@ -167,7 +167,8 @@ class MyTestCase(unittest.TestCase): # def test_meta(qtbot, session): # # Create playlist -# playlist = playlists.Playlists(session, "my playlist") +# playlist = playlists.Playlists(session, "my playlist", +# template_id=0) # playlist_tab = playlists.PlaylistTab(None, session, playlist.id) # # Add some tracks @@ -248,7 +249,7 @@ class MyTestCase(unittest.TestCase): # def test_clear_next(qtbot, session): # # Create playlist -# playlist = models.Playlists(session, "my playlist") +# playlist = models.Playlists(session, "my playlist", template_id=0) # playlist_tab = playlists.PlaylistTab(None, session, playlist.id) # # Add some tracks @@ -274,7 +275,7 @@ class MyTestCase(unittest.TestCase): # # Create playlist and playlist_tab # window = musicmuster.Window() -# playlist = models.Playlists(session, "test playlist") +# playlist = models.Playlists(session, "test playlist", template_id=0) # playlist_tab = playlists.PlaylistTab(window, session, playlist.id) # # Add some tracks @@ -306,7 +307,7 @@ class MyTestCase(unittest.TestCase): # playlist_name = "test playlist" # # Create testing playlist # window = musicmuster.Window() -# playlist = models.Playlists(session, playlist_name) +# playlist = models.Playlists(session, playlist_name, template_id=0) # playlist_tab = playlists.PlaylistTab(window, session, playlist.id) # idx = window.tabPlaylist.addTab(playlist_tab, playlist_name) # window.tabPlaylist.setCurrentIndex(idx)