aboutsummaryrefslogtreecommitdiffstats
path: root/solo-tool-project/test
diff options
context:
space:
mode:
Diffstat (limited to 'solo-tool-project/test')
-rw-r--r--solo-tool-project/test/midi_launchpad_mini_integrationtest.py8
-rw-r--r--solo-tool-project/test/session_manager_unittest.py9
-rw-r--r--solo-tool-project/test/test_session.json4
3 files changed, 10 insertions, 11 deletions
diff --git a/solo-tool-project/test/midi_launchpad_mini_integrationtest.py b/solo-tool-project/test/midi_launchpad_mini_integrationtest.py
index 9588f9f..9e8c92e 100644
--- a/solo-tool-project/test/midi_launchpad_mini_integrationtest.py
+++ b/solo-tool-project/test/midi_launchpad_mini_integrationtest.py
@@ -167,16 +167,16 @@ def test_previousAndNextKeyPositionButtons(uut, midiWrapperMock, soloTool, playe
assert soloTool.keyPoint == 0.0
midiWrapperMock.simulateInput(nextKeyPositionButton)
- soloTool.keyPoint == 0.1
+ assert soloTool.keyPoint == 0.1
midiWrapperMock.simulateInput(nextKeyPositionButton)
- soloTool.keyPoint == 0.2
+ assert soloTool.keyPoint == 0.2
midiWrapperMock.simulateInput(previousKeyPositionButton)
- soloTool.keyPoint == 0.1
+ assert soloTool.keyPoint == 0.1
midiWrapperMock.simulateInput(previousKeyPositionButton)
- soloTool.keyPoint == 0.1
+ assert soloTool.keyPoint == 0.1
def test_playbackRateButtons(uut, midiWrapperMock, soloTool, playerMock):
playbackRateOptions = {
diff --git a/solo-tool-project/test/session_manager_unittest.py b/solo-tool-project/test/session_manager_unittest.py
index 0edc252..8658032 100644
--- a/solo-tool-project/test/session_manager_unittest.py
+++ b/solo-tool-project/test/session_manager_unittest.py
@@ -3,8 +3,6 @@ from json import loads
import pathlib
import shutil
-pytestmark = pytest.mark.skip(reason="not yet implemented")
-
from solo_tool.session_manager import loadSession, saveSession
from solo_tool.solo_tool import SoloTool
@@ -25,16 +23,17 @@ def test_loadSession(prepared_tmp_path):
assert soloTool.songs == ["test.flac", "test.mp3"]
soloTool.song = 0
- assert soloTool.keyPositions == []
+ assert soloTool.keyPoints == []
soloTool.song = 1
- assert soloTool.keyPositions == [0.1, 0.3]
+ assert soloTool.keyPoints == [0.1, 0.3]
def test_saveSession(prepared_tmp_path):
soloTool = SoloTool()
soloTool.addSong("test.flac")
soloTool.addSong("test.mp3")
- soloTool.keyPositions = [0.1, 0.3]
+ soloTool.song = 1
+ soloTool.keyPoints = [0.1, 0.3]
testFile = prepared_tmp_path / "test_session_saved.json"
saveSession(soloTool, testFile)
diff --git a/solo-tool-project/test/test_session.json b/solo-tool-project/test/test_session.json
index aed1e11..49c2d42 100644
--- a/solo-tool-project/test/test_session.json
+++ b/solo-tool-project/test/test_session.json
@@ -1,10 +1,10 @@
[
{
"path" : "test.flac",
- "key_positions" : null
+ "key_points" : []
},
{
"path" : "test.mp3",
- "key_positions" : [0.1, 0.3]
+ "key_points" : [0.1, 0.3]
}
]