diff options
Diffstat (limited to 'solo-tool-project/test')
3 files changed, 36 insertions, 36 deletions
diff --git a/solo-tool-project/test/midi_launchpad_mini_integrationtest.py b/solo-tool-project/test/midi_launchpad_mini_integrationtest.py index b0105a9..c0d2b47 100644 --- a/solo-tool-project/test/midi_launchpad_mini_integrationtest.py +++ b/solo-tool-project/test/midi_launchpad_mini_integrationtest.py @@ -180,7 +180,7 @@ def test_previousAndNextAbButtons(uut, midiWrapperMock, soloTool, playerMock): ] soloTool.addSong(song) - soloTool.setSong(0) + soloTool.song = 0 soloTool.setAbLimitEnable(True) for ab in abLimits: @@ -397,19 +397,19 @@ def test_playingFeedbackWhenChangingSong(uut, midiWrapperMock, soloTool, playerM soloTool.addSong(s) uut.connect() - soloTool.setSong(0) + soloTool.song = 0 soloTool.play() assert playerMock.state == PlayerMock.PLAYING assert midiWrapperMock.getLatestMessage() == (playPauseButton, LED_GREEN, 0) - soloTool.setSong(1) + soloTool.song = 1 assert playerMock.state == PlayerMock.STOPPED assert midiWrapperMock.getLatestMessage() == (playPauseButton, LED_YELLOW, 0) def test_setAbButtons(uut, midiWrapperMock, soloTool, playerMock): song = "test.flac" soloTool.addSong(song) - soloTool.setSong(0) + soloTool.song = 0 soloTool.setAbLimitEnable(True) abLimits = (0.6, 0.8) soloTool.storeAbLimits(abLimits[0], abLimits[1]) @@ -445,7 +445,7 @@ def test_setAbButtons(uut, midiWrapperMock, soloTool, playerMock): def test_seekButtons(uut, midiWrapperMock, soloTool, playerMock): song = "test.flac" soloTool.addSong(song) - soloTool.setSong(0) + soloTool.song = 0 uut.connect() diff --git a/solo-tool-project/test/solo_tool_controller_integrationtest.py b/solo-tool-project/test/solo_tool_controller_integrationtest.py index c161c70..9311483 100644 --- a/solo-tool-project/test/solo_tool_controller_integrationtest.py +++ b/solo-tool-project/test/solo_tool_controller_integrationtest.py @@ -36,22 +36,22 @@ def test_previousSong(uut, soloTool): soloTool.registerCurrentSongCallback(callback) - soloTool.getCurrentSong() == None + soloTool.song == None assert not called uut.previousSong() - soloTool.getCurrentSong() == 0 + soloTool.song == 0 assert called assert receivedValue == 0 called = False uut.previousSong() - soloTool.getCurrentSong() == 0 + soloTool.song == 0 assert not called - soloTool.setSong(1) + soloTool.song = 1 uut.previousSong() - soloTool.getCurrentSong() == 0 + soloTool.song == 0 assert called assert receivedValue == 0 called = False @@ -66,21 +66,21 @@ def test_nextSong(uut, soloTool): soloTool.registerCurrentSongCallback(callback) - soloTool.getCurrentSong() == None + soloTool.song == None assert not called uut.nextSong() - soloTool.getCurrentSong() == 0 + soloTool.song == 0 assert called assert receivedValue == 0 called = False uut.nextSong() - soloTool.getCurrentSong() == 1 + soloTool.song == 1 assert called assert receivedValue == 1 called = False uut.nextSong() - soloTool.getCurrentSong() == 1 + soloTool.song == 1 assert not called diff --git a/solo-tool-project/test/solo_tool_integrationtest.py b/solo-tool-project/test/solo_tool_integrationtest.py index ee33468..3a15e36 100644 --- a/solo-tool-project/test/solo_tool_integrationtest.py +++ b/solo-tool-project/test/solo_tool_integrationtest.py @@ -70,9 +70,9 @@ def test_addAndSetSongs(uut, mockPlayer): assert mockPlayer.currentSong == None for i, s in enumerate(songs): - uut.setSong(i) + uut.song = i assert mockPlayer.currentSong == songs[i] - assert uut.getCurrentSong() == i + assert uut.song == i def test_addAndSetAbLimits(uut, mockPlayer): song = "test.flac" @@ -82,7 +82,7 @@ def test_addAndSetAbLimits(uut, mockPlayer): ] uut.addSong(song) - uut.setSong(0) + uut.song = 0 for ab in abLimits: uut.storeAbLimits(ab[0], ab[1]) @@ -139,13 +139,13 @@ def test_multipleSongsAndAbLimits(uut, mockPlayer): uut.addSong(s) for i, l in enumerate(abLimits): - uut.setSong(i) + uut.song = i uut.storeAbLimits(l[0], l[1]) uut.setAbLimitEnable(True) for i, l in enumerate(abLimits): - uut.setSong(i) + uut.song = i uut.loadAbLimits(0) mockPlayer.position = l[0] @@ -184,7 +184,7 @@ def test_storeAbLimitsWithoutSong(uut, mockPlayer): assert mockPlayer.position == default mockPlayer.position = overflow - uut.setSong(0) + uut.song = 0 uut.tick() assert mockPlayer.position == default mockPlayer.position = overflow @@ -211,7 +211,7 @@ def test_nextAndPreviousAbLimit(uut, mockPlayer): ] uut.addSong(song) - uut.setSong(0) + uut.song = 0 uut.setAbLimitEnable(True) for ab in abLimits: @@ -249,18 +249,18 @@ def test_abLimitsWhenChangingSongs(uut, mockPlayer): for s in songs: uut.addSong(s) - uut.setSong(0) + uut.song = 0 for ab in abLimits: uut.storeAbLimits(ab[0], ab[1]) - uut.setSong(1) + uut.song = 1 uut.storeAbLimits(abLimits[0][0], abLimits[0][1]) - uut.setSong(0) + uut.song = 0 uut.loadAbLimits(len(abLimits) - 1) checkLimit(uut, mockPlayer, abLimits[-1][0], abLimits[-1][1]) - uut.setSong(1) + uut.song = 1 checkLimit(uut, mockPlayer, abLimits[-1][0], abLimits[-1][1]) uut.previousStoredAbLimits() @@ -289,7 +289,7 @@ def test_addInexistentFile(uut, mockPlayer): song = "not/a/real/file" uut.addSong(song) - uut.setSong(0) + uut.song = 0 assert mockPlayer.currentSong == None @@ -298,10 +298,10 @@ def test_getters(uut, mockPlayer): abLimit = [0.2, 0.4] uut.addSong(song) - uut.setSong(0) + uut.song = 0 uut.storeAbLimits(abLimit[0], abLimit[1]) - assert uut.getSongs() == [song] + assert uut.songList == [song] limits = uut.getStoredAbLimits() assert len(limits) == 1 @@ -328,7 +328,7 @@ def test_setTemporaryLimits(uut, mockPlayer): uut.setAbLimitEnable(True) mockPlayer.position = overflow uut.addSong(song) - uut.setSong(0) + uut.song = 0 uut.storeAbLimits(abLimits[0][0], abLimits[0][1]) uut.loadAbLimits(0) @@ -352,7 +352,7 @@ def test_jumpToA(uut, mockPlayer): def test_playingStateNotification(uut, mockPlayer): song = "test.flac" uut.addSong(song) - uut.setSong(0) + uut.song = 0 called = False receivedValue = None @@ -395,7 +395,7 @@ def test_playingStateNotification(uut, mockPlayer): def test_playbackVolumeNotification(uut, mockPlayer): song = "test.flac" uut.addSong(song) - uut.setSong(0) + uut.song = 0 called = False receivedValue = None @@ -419,7 +419,7 @@ def test_playbackVolumeNotification(uut, mockPlayer): def test_playbackRateNotification(uut, mockPlayer): song = "test.flac" uut.addSong(song) - uut.setSong(0) + uut.song = 0 called = False receivedValue = None @@ -458,7 +458,7 @@ def test_currentSongNotification(uut): uut.addSong(songs[0]) assert not called - uut.setSong(0) + uut.song = 0 assert called assert receivedValue == 0 called = False @@ -466,10 +466,10 @@ def test_currentSongNotification(uut): uut.addSong(songs[1]) assert not called - uut.setSong(0) + uut.song = 0 assert not called - uut.setSong(1) + uut.song = 1 assert called assert receivedValue == 1 called = False @@ -487,7 +487,7 @@ def test_currentAbNotification(uut): song = "test.flac" uut.addSong(song) - uut.setSong(0) + uut.song = 0 abLimits = [ (0.2, 0.3), |