Actition controller prototype

1 files changed, 9 insertions, 9 deletions

diff --git a/solo-tool-project/test/midi_launchpad_mini_integrationtest.py b/solo-tool-project/test/midi_launchpad_mini_integrationtest.py
index 1a99cd4..6841f24 100644
--- a/solo-tool-project/test/midi_launchpad_mini_integrationtest.py
+++ b/solo-tool-project/test/midi_launchpad_mini_integrationtest.py
@@ -1,7 +1,7 @@
 import pytest
 from mido import Message
 
-from solo_tool.midi_controller_launchpad_mini import MidiController
+from solo_tool.midi_controller_launchpad_mini import LaunchpadMiniController
 from fixtures import soloTool, mockPlayer, testSongs
 
 LED_RED = 3
@@ -38,10 +38,10 @@ class MidiWrapperMock:
 
     def disconnect(self):
         self.connectedDevice = None
-    
-    def sendMessage(self, note, velocity, channel):
+
+    def sendNoteOn(self, note, velocity, channel):
         self.sentMessages.append((note, velocity, channel))
-    
+
     def simulateInput(self, note, velocity=127, channel=0):
         if self.callback is not None:
             msg = Message("note_on", note=note, velocity=velocity, channel=channel)
@@ -56,7 +56,7 @@ def midiWrapperMock():
 
 @pytest.fixture
 def uut(soloTool, midiWrapperMock):
-    return MidiController(soloTool, midiWrapperMock)
+    return LaunchpadMiniController(soloTool, midiWrapperMock)
 
 def test_startAndPauseButtons(uut, midiWrapperMock, mockPlayer):
     uut.connect()
@@ -65,11 +65,11 @@ def test_startAndPauseButtons(uut, midiWrapperMock, mockPlayer):
     
     midiWrapperMock.simulateInput(playPauseButton)
     assert mockPlayer.playing
-    assert midiWrapperMock.getLatestMessage() == (playPauseButton, MidiController.LED_GREEN, 0)
+    assert midiWrapperMock.getLatestMessage() == (playPauseButton, LaunchpadMiniController.LED_GREEN, 0)
 
     midiWrapperMock.simulateInput(playPauseButton)
     assert not mockPlayer.playing
-    assert midiWrapperMock.getLatestMessage() == (playPauseButton, MidiController.LED_YELLOW, 0)
+    assert midiWrapperMock.getLatestMessage() == (playPauseButton, LaunchpadMiniController.LED_YELLOW, 0)
 
 def test_startPauseButtonLed(uut, midiWrapperMock, mockPlayer, soloTool):
     uut.connect()
@@ -78,11 +78,11 @@ def test_startPauseButtonLed(uut, midiWrapperMock, mockPlayer, soloTool):
     
     mockPlayer.playing = True
     mockPlayer.simulatePlayingStateChanged()
-    assert midiWrapperMock.getLatestMessage() == (playPauseButton, MidiController.LED_GREEN, 0)
+    assert midiWrapperMock.getLatestMessage() == (playPauseButton, LaunchpadMiniController.LED_GREEN, 0)
 
     mockPlayer.playing = False
     mockPlayer.simulatePlayingStateChanged()
-    assert midiWrapperMock.getLatestMessage() == (playPauseButton, MidiController.LED_YELLOW, 0)
+    assert midiWrapperMock.getLatestMessage() == (playPauseButton, LaunchpadMiniController.LED_YELLOW, 0)
 
 def test_jumpToKeyPositionButton(uut, midiWrapperMock, soloTool, mockPlayer, testSongs):
     soloTool.addSong(testSongs[0])