1 files changed, 49 insertions, 30 deletions

diff --git a/solo-tool-project/test/solo_tool_integrationtest.py b/solo-tool-project/test/solo_tool_integrationtest.py
index 94d5cef..2a818ed 100644
--- a/solo-tool-project/test/solo_tool_integrationtest.py
+++ b/solo-tool-project/test/solo_tool_integrationtest.py
@@ -54,35 +54,58 @@ def test_playerControls(uut, mockPlayer):
     assert uut.volume == 0.5
 
 def test_sanitizePlaybackRate(uut):
-    # Valid rates are > 0.0
-    with pytest.raises(ValueError):
-        uut.rate = -0.1
+    # Initial value
+    assert uut.rate == 1.0
 
-    with pytest.raises(ValueError):
-        uut.rate = 0.0
+    # Valid rates are >= 0.0, invalid is ignored
+    uut.rate = -0.1
+    assert uut.rate == 1.0
+
+    uut.rate = 0.0
+    assert uut.rate == 0.0
+    
+    uut.rate = 0.0001
+    assert uut.rate == 0.0001
 
-    uut.rate = 1.0
     uut.rate = 150.0
+    assert uut.rate == 150.0
 
 def test_sanitizePlaybackPosition(uut):
-    # Valid positions are in [0, 1)
-    with pytest.raises(ValueError):
-        uut.position = -0.1
+    # Initial value
+    assert uut.position == 0.0
+
+    # Valid positions are in [0, 1], invalid is limited
+    uut.position = 0.2
+    assert uut.position == 0.2
+
+    uut.position = -0.1
+    assert uut.position == 0.0
+
+    uut.position = 1.0
+    assert uut.position == 1.0
 
-    uut.position = 0.0
-    uut.position = 0.999
+    uut.position = 0.4
+    assert uut.position == 0.4
 
-    with pytest.raises(ValueError):
-        uut.position = 1.0
+    uut.position = 1.5
+    assert uut.position == 1.0
 
 def test_sanitizePlaybackVolume(uut):
-    # Valid volumes are >= 0.0
-    with pytest.raises(ValueError):
-        uut.volume = -0.1
+    # Initial value
+    assert uut.volume == 1.0
+
+    # Valid volumes are >= 0.0, invalid is ignored
+    uut.volume = -0.1
+    assert uut.volume == 1.0
 
     uut.volume = 0.0
+    assert uut.volume == 0.0
+
     uut.volume = 1.0
+    assert uut.volume == 1.0
+
     uut.volume = 150.0
+    assert uut.volume == 150.0
 
 def test_addAndSelectSongs(uut, mockPlayer):
     songs = [
@@ -112,17 +135,14 @@ def test_addAndSelectSongs(uut, mockPlayer):
         assert uut.song == i
 
     # The current song cannot be de-selected
-    with pytest.raises(ValueError):
-        uut.song = None
+    uut.song = None
     assert uut.song == len(uut.songs) - 1
 
     # Non-existent songs cannot be selected
-    with pytest.raises(ValueError):
-        uut.song = -1
+    uut.song = -1
     assert uut.song == len(uut.songs) - 1
 
-    with pytest.raises(ValueError):
-        uut.song = 2
+    uut.song = 2
     assert uut.song == len(uut.songs) - 1
 
 def test_addAndJumpToKeyPoints(uut, mockPlayer):
@@ -174,22 +194,21 @@ def test_sanitizeKeyPoint(uut):
     # Key point and key point list cannot be none
     uut.keyPoint = 0.5
 
-    with pytest.raises(ValueError):
-        uut.keyPoint = None
+    uut.keyPoint = None
     assert uut.keyPoint == 0.5
 
-    with pytest.raises(ValueError):
-        uut.keyPoints = None
+    uut.keyPoints = None
     assert uut.keyPoints == [0.1, 0.2, 0.4]
 
     # Valid key points are in [0, 1)
-    with pytest.raises(ValueError):
-        uut.keyPoint = -0.1
+    uut.keyPoint = -0.1
+    assert uut.keyPoint == 0.5
 
-    with pytest.raises(ValueError):
-        uut.keyPoint = 1.0
+    uut.keyPoint = 1.0
+    assert uut.keyPoint == 0.5
 
     uut.keyPoint = 0.999
+    assert uut.keyPoint == 0.999
 
 def test_keyPointsPerSong(uut, mockPlayer):
     songs = [