Moved nextSong and previousSong to SoloToolController

1 files changed, 1 insertions, 38 deletions

diff --git a/solo-tool-project/test/solo_tool_integrationtest.py b/solo-tool-project/test/solo_tool_integrationtest.py
index 5903abf..ee33468 100644
--- a/solo-tool-project/test/solo_tool_integrationtest.py
+++ b/solo-tool-project/test/solo_tool_integrationtest.py
@@ -72,28 +72,7 @@ def test_addAndSetSongs(uut, mockPlayer):
     for i, s in enumerate(songs):
         uut.setSong(i)
         assert mockPlayer.currentSong == songs[i]
-
-def test_nextAndPreviousSong(uut, mockPlayer):
-    songs = [
-        "test.flac",
-        "test.mp3"
-    ]
-    
-    for s in songs:
-        uut.addSong(s)
-    assert mockPlayer.currentSong == None
-    
-    uut.nextSong()
-    assert mockPlayer.currentSong == songs[0]
-    
-    uut.previousSong()
-    assert mockPlayer.currentSong == songs[0]
-
-    uut.nextSong()
-    assert mockPlayer.currentSong == songs[1]
-
-    uut.nextSong()
-    assert mockPlayer.currentSong == songs[1]
+        assert uut.getCurrentSong() == i
 
 def test_addAndSetAbLimits(uut, mockPlayer):
     song = "test.flac"
@@ -495,22 +474,6 @@ def test_currentSongNotification(uut):
     assert receivedValue == 1
     called = False
 
-    uut.previousSong()
-    assert called
-    assert receivedValue == 0
-    called = False
-
-    uut.previousSong()
-    assert not called
-    
-    uut.nextSong()
-    assert called
-    assert receivedValue == 1
-    called = False
-
-    uut.nextSong()
-    assert not called
-
 def test_currentAbNotification(uut):
     called = False
     receivedValue = None