Remove stop functionality from player

1 files changed, 15 insertions, 41 deletions

diff --git a/solo-tool-project/test/midi_launchpad_mini_integrationtest.py b/solo-tool-project/test/midi_launchpad_mini_integrationtest.py
index 642733d..c731539 100644
--- a/solo-tool-project/test/midi_launchpad_mini_integrationtest.py
+++ b/solo-tool-project/test/midi_launchpad_mini_integrationtest.py
@@ -20,7 +20,7 @@ rwd25PcButton = 49
 previousSongButton = 48
 
 playPauseButton = 112
-stopButton = 96
+jumpToStartButton = 96
 
 nextKeyPositionButton = 119
 previousKeyPositionButton = 118
@@ -67,60 +67,34 @@ def midiWrapperMock():
 def uut(soloTool, midiWrapperMock):
     return MidiController(soloTool, midiWrapperMock)
 
-def test_startStopAndPauseButtons(uut, midiWrapperMock, playerMock):
+def test_startAndPauseButtons(uut, midiWrapperMock, playerMock):
     uut.connect()
 
-    assert playerMock.state == PlayerMock.STOPPED
+    assert not playerMock.playing
     
     midiWrapperMock.simulateInput(playPauseButton)
-    assert playerMock.state == PlayerMock.PLAYING
+    assert playerMock.playing
     assert midiWrapperMock.getLatestMessage() == (playPauseButton, MidiController.LED_GREEN, 0)
 
-    midiWrapperMock.simulateInput(stopButton)
-    assert playerMock.state == PlayerMock.STOPPED
-    assert midiWrapperMock.getLatestMessage() == (playPauseButton, MidiController.LED_YELLOW, 0)
-
-    midiWrapperMock.simulateInput(playPauseButton)
-    assert midiWrapperMock.getLatestMessage() == (playPauseButton, MidiController.LED_GREEN, 0)
-    
     midiWrapperMock.simulateInput(playPauseButton)
+    assert not playerMock.playing
     assert midiWrapperMock.getLatestMessage() == (playPauseButton, MidiController.LED_YELLOW, 0)
-    assert playerMock.state == PlayerMock.PAUSED
-
-    midiWrapperMock.simulateInput(playPauseButton)
-    assert midiWrapperMock.getLatestMessage() == (playPauseButton, MidiController.LED_GREEN, 0)
-    assert playerMock.state == PlayerMock.PLAYING
-
-    midiWrapperMock.simulateInput(playPauseButton)
-    assert midiWrapperMock.getLatestMessage() == (playPauseButton, MidiController.LED_YELLOW, 0)
-
-    midiWrapperMock.simulateInput(stopButton)
-    assert playerMock.state == PlayerMock.STOPPED
 
 def test_startPauseButtonLed(uut, midiWrapperMock, playerMock, soloTool):
     uut.connect()
 
-    assert playerMock.state == PlayerMock.STOPPED
+    assert not playerMock.playing
     
-    playerMock.state = PlayerMock.PLAYING
+    playerMock.playing = True
     playerMock.simulatePlayingStateChanged()
     assert midiWrapperMock.getLatestMessage() == (playPauseButton, MidiController.LED_GREEN, 0)
 
-    playerMock.state = PlayerMock.STOPPED
-    playerMock.simulatePlayingStateChanged()
-    assert midiWrapperMock.getLatestMessage() == (playPauseButton, MidiController.LED_YELLOW, 0)
-
-    playerMock.state = PlayerMock.PAUSED
+    playerMock.playing = False
     playerMock.simulatePlayingStateChanged()
     assert midiWrapperMock.getLatestMessage() == (playPauseButton, MidiController.LED_YELLOW, 0)
 
-    playerMock.state = PlayerMock.PLAYING
-    playerMock.simulatePlayingStateChanged()
-    assert midiWrapperMock.getLatestMessage() == (playPauseButton, MidiController.LED_GREEN, 0)
-
 def test_jumpToKeyPositionButton(uut, midiWrapperMock, soloTool, playerMock):
     soloTool.addSong("test.flac")
-    soloTool.song = 0
     uut.connect()
     
     soloTool.keyPoint = 0.5
@@ -129,6 +103,10 @@ def test_jumpToKeyPositionButton(uut, midiWrapperMock, soloTool, playerMock):
     midiWrapperMock.simulateInput(jumpToKeyPositionButton)
     assert playerMock.position == 0.5
 
+# TODO implement
+def test_jumpToStartButton(uut, midiWrapperMock, soloTool, playerMock):
+    pass
+
 def test_previousAndNextSongButtons(uut, midiWrapperMock, soloTool, playerMock):
     songs = [
         "test.flac",
@@ -156,7 +134,6 @@ def test_previousAndNextKeyPositionButtons(uut, midiWrapperMock, soloTool, playe
     keyPoints = [0.2, 0.1]
 
     soloTool.addSong(song)
-    soloTool.song = 0
     soloTool.keyPoints = keyPoints
 
     uut.connect()
@@ -318,7 +295,7 @@ def test_connectDisconnect(uut, midiWrapperMock):
         [(i, LED_GREEN, 0) for i in range(0, 6)] +                      # volume row
         [(i, LED_YELLOW, 0) for i in range(16, 22)] +                   # playback rate row
         [
-            (stopButton,                LED_RED, 0),
+            (jumpToStartButton,         LED_YELLOW, 0),
             (playPauseButton,           LED_YELLOW, 0),
             (jumpToKeyPositionButton,   LED_YELLOW, 0),
             (previousKeyPositionButton, LED_RED, 0),
@@ -357,19 +334,17 @@ def test_playingFeedbackWhenChangingSong(uut, midiWrapperMock, soloTool, playerM
         soloTool.addSong(s)
     uut.connect()
 
-    soloTool.song = 0
     soloTool.play()
-    assert playerMock.state == PlayerMock.PLAYING
+    assert playerMock.playing
     assert midiWrapperMock.getLatestMessage() == (playPauseButton, LED_GREEN, 0)
 
     soloTool.song = 1
-    assert playerMock.state == PlayerMock.STOPPED
+    assert not playerMock.playing
     assert midiWrapperMock.getLatestMessage() == (playPauseButton, LED_YELLOW, 0)
 
 def test_setKeyPositionButton(uut, midiWrapperMock, soloTool, playerMock):
     song = "test.flac"
     soloTool.addSong(song)
-    soloTool.song = 0
 
     uut.connect()
 
@@ -388,7 +363,6 @@ def test_setKeyPositionButton(uut, midiWrapperMock, soloTool, playerMock):
 def test_seekButtons(uut, midiWrapperMock, soloTool, playerMock):
     song = "test.flac"
     soloTool.addSong(song)
-    soloTool.song = 0
 
     uut.connect()