2 files changed, 6 insertions, 125 deletions
diff --git a/solo-tool-project/test/playlist_unittest.py b/solo-tool-project/test/playlist_unittest.py
deleted file mode 100644
index 4b0186b..0000000
--- a/solo-tool-project/test/playlist_unittest.py
+++ /dev/null
@@ -1,103 +0,0 @@
-from solo_tool.playlist import Playlist
-
-def test_addAndSelectOneSong():
-    songAddedByUser = "/path/to/song"
-    songSetByCallback = None
-
-    def testCallback(song):
-        nonlocal songSetByCallback
-        songSetByCallback = song
-
-    uut = Playlist(testCallback)
-    uut.addSong(songAddedByUser)
-    uut.setCurrentSong(0)
-
-    assert songAddedByUser == songSetByCallback
-    assert uut.getCurrentSong() == songAddedByUser
-    assert uut.getCurrentSongIndex() == 0
-    assert uut.getSongs() == [songAddedByUser]
-
-def test_addTwoSongsAndSelectBoth():
-    songAddedByUser = ["/path/to/song", "/path/to/second/song"]
-    songSetByCallback = None
-
-    def testCallback(song):
-        nonlocal songSetByCallback
-        songSetByCallback = song
-
-    uut = Playlist(testCallback)
-    uut.addSong(songAddedByUser[0])
-    uut.addSong(songAddedByUser[1])
-    assert uut.getSongs() == songAddedByUser
-
-    uut.setCurrentSong(0)
-    assert songAddedByUser[0] == songSetByCallback
-    assert uut.getCurrentSong() == songAddedByUser[0]
-    assert uut.getCurrentSongIndex() == 0
-
-    uut.setCurrentSong(1)
-    assert songAddedByUser[1] == songSetByCallback
-    assert uut.getCurrentSong() == songAddedByUser[1]
-    assert uut.getCurrentSongIndex() == 1
-
-def test_firstAddedSongIsNotSelected():
-    songAddedByUser = "/path/to/song"
-    songSetByCallback = None
-
-    def testCallback(song):
-        nonlocal songSetByCallback
-        songSetByCallback = song
-
-    uut = Playlist(testCallback)
-    uut.addSong(songAddedByUser)
-
-    assert songSetByCallback == None
-    assert uut.getCurrentSong() == None
-    assert uut.getCurrentSongIndex() == None
-    assert uut.getSongs() == [songAddedByUser]
-
-def test_invalidSongSelection():
-    songAddedByUser = "/path/to/song"
-    songSetByCallback = None
-
-    def testCallback(song):
-        nonlocal songSetByCallback
-        songSetByCallback = song
-
-    uut = Playlist(testCallback)
-    assert songSetByCallback == None
-    assert uut.getCurrentSong() == None
-    assert uut.getCurrentSongIndex() == None
-
-    uut.setCurrentSong(10)
-    assert songSetByCallback == None
-    assert uut.getCurrentSong() == None
-    assert uut.getCurrentSongIndex() == None
-
-    uut.addSong(songAddedByUser)
-    uut.setCurrentSong(10)
-    assert songSetByCallback == None
-    assert uut.getCurrentSong() == None
-    assert uut.getCurrentSongIndex() == None
-    assert uut.getSongs() == [songAddedByUser]
-
-def test_clearPlaylist():
-    songAddedByUser = ["/path/to/song", "/path/to/second/song"]
-
-    def dummy(index):
-        pass
-
-    uut = Playlist(dummy)
-    for s in songAddedByUser:
-        uut.addSong(s)
-    uut.setCurrentSong(0)
-
-    assert uut.getSongs() == songAddedByUser
-    assert uut.getCurrentSong() == songAddedByUser[0]
-    assert uut.getCurrentSongIndex() == 0
-
-    uut.clear()
-
-    assert uut.getSongs() == []
-    assert uut.getCurrentSong() == None
-    assert uut.getCurrentSongIndex() == None
diff --git a/solo-tool-project/test/session_manager_unittest.py b/solo-tool-project/test/session_manager_unittest.py
index d7c5e7f..d89b82a 100644
--- a/solo-tool-project/test/session_manager_unittest.py
+++ b/solo-tool-project/test/session_manager_unittest.py
@@ -23,21 +23,6 @@ testSession = [
     }
 ]
 
-class PlaylistMock:
-    def __init__(self):
-        self.lastAddedSong = None
-        self.songs = list()
-
-    def addSong(self, s):
-        self.songs.append(s)
-        self.lastAddedSong = s
-
-    def getSongs(self):
-        return self.songs
-
-    def clear(self):
-        self.__init__()
-
 class ABControllerMock:
     def __init__(self):
         self.limits = dict()
@@ -68,7 +53,7 @@ class MockFile:
 
 @pytest.fixture
 def playlistMock():
-    return PlaylistMock()
+    return []
 
 @pytest.fixture
 def abControllerMock():
@@ -81,7 +66,7 @@ def test_loadSession(playlistMock, abControllerMock):
     for i, entry in enumerate(testSession):
         expectedSong = entry["path"]
         expectedLimits = entry["ab_limits"]
-        loadedSong = playlistMock.songs[i]
+        loadedSong = playlistMock[i]
         loadedLimits = abControllerMock.limits.get(expectedSong)
 
         assert loadedSong == expectedSong
@@ -90,7 +75,7 @@ def test_loadSession(playlistMock, abControllerMock):
 def test_saveSession(playlistMock, abControllerMock):
     for i, entry in enumerate(testSession):
         song = entry["path"]
-        playlistMock.addSong(song)
+        playlistMock.append(song)
 
         abLimits = entry["ab_limits"]
         if abLimits is not None:
@@ -111,9 +96,8 @@ def test_loadAndSaveEmptySession(playlistMock, abControllerMock):
 
     loadSession(sessionFile, playlistMock, abControllerMock)
 
-    songs = playlistMock.getSongs()
-    assert songs == list()
-    for s in songs:
+    assert playlistMock == list()
+    for s in playlistMock:
         assert abControllerMock.getStoredLimits(s) == None
 
 def test_loadSessionNotAdditive(playlistMock, abControllerMock):
@@ -121,7 +105,7 @@ def test_loadSessionNotAdditive(playlistMock, abControllerMock):
     loadSession(sessionFile, playlistMock, abControllerMock)
     loadSession(sessionFile, playlistMock, abControllerMock)
 
-    songs = playlistMock.getSongs()
+    songs = playlistMock
     assert len(songs) == len(set(songs))
     for s in songs:
         abLimits = abControllerMock.getStoredLimits(s)