From f15b4e732716087a6e40787ab2c718d7a0c8f99b Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sun, 17 Jan 2016 22:14:43 +0100
Subject: [PATCH] mpd: Move setvol tests to its own test case

---
 tests/mpd/protocol/test_playback.py | 77 +++++++++++++++--------------
 1 file changed, 40 insertions(+), 37 deletions(-)

diff --git a/tests/mpd/protocol/test_playback.py b/tests/mpd/protocol/test_playback.py
index b9adb646..470491e9 100644
--- a/tests/mpd/protocol/test_playback.py
+++ b/tests/mpd/protocol/test_playback.py
@@ -80,41 +80,6 @@ class PlaybackOptionsHandlerTest(protocol.BaseTestCase):
         self.assertTrue(self.core.tracklist.repeat.get())
         self.assertInResponse('OK')
 
-    def test_setvol_below_min(self):
-        self.send_request('setvol "-10"')
-        self.assertEqual(0, self.core.mixer.get_volume().get())
-        self.assertInResponse('OK')
-
-    def test_setvol_min(self):
-        self.send_request('setvol "0"')
-        self.assertEqual(0, self.core.mixer.get_volume().get())
-        self.assertInResponse('OK')
-
-    def test_setvol_middle(self):
-        self.send_request('setvol "50"')
-        self.assertEqual(50, self.core.mixer.get_volume().get())
-        self.assertInResponse('OK')
-
-    def test_setvol_max(self):
-        self.send_request('setvol "100"')
-        self.assertEqual(100, self.core.mixer.get_volume().get())
-        self.assertInResponse('OK')
-
-    def test_setvol_above_max(self):
-        self.send_request('setvol "110"')
-        self.assertEqual(100, self.core.mixer.get_volume().get())
-        self.assertInResponse('OK')
-
-    def test_setvol_plus_is_ignored(self):
-        self.send_request('setvol "+10"')
-        self.assertEqual(10, self.core.mixer.get_volume().get())
-        self.assertInResponse('OK')
-
-    def test_setvol_without_quotes(self):
-        self.send_request('setvol 50')
-        self.assertEqual(50, self.core.mixer.get_volume().get())
-        self.assertInResponse('OK')
-
     def test_single_off(self):
         self.send_request('single "0"')
         self.assertFalse(self.core.tracklist.single.get())
@@ -451,9 +416,47 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
         self.assertInResponse('OK')
 
 
-class PlaybackOptionsHandlerNoneMixerTest(protocol.BaseTestCase):
+class VolumeTest(protocol.BaseTestCase):
+
+    def test_setvol_below_min(self):
+        self.send_request('setvol "-10"')
+        self.assertEqual(0, self.core.mixer.get_volume().get())
+        self.assertInResponse('OK')
+
+    def test_setvol_min(self):
+        self.send_request('setvol "0"')
+        self.assertEqual(0, self.core.mixer.get_volume().get())
+        self.assertInResponse('OK')
+
+    def test_setvol_middle(self):
+        self.send_request('setvol "50"')
+        self.assertEqual(50, self.core.mixer.get_volume().get())
+        self.assertInResponse('OK')
+
+    def test_setvol_max(self):
+        self.send_request('setvol "100"')
+        self.assertEqual(100, self.core.mixer.get_volume().get())
+        self.assertInResponse('OK')
+
+    def test_setvol_above_max(self):
+        self.send_request('setvol "110"')
+        self.assertEqual(100, self.core.mixer.get_volume().get())
+        self.assertInResponse('OK')
+
+    def test_setvol_plus_is_ignored(self):
+        self.send_request('setvol "+10"')
+        self.assertEqual(10, self.core.mixer.get_volume().get())
+        self.assertInResponse('OK')
+
+    def test_setvol_without_quotes(self):
+        self.send_request('setvol 50')
+        self.assertEqual(50, self.core.mixer.get_volume().get())
+        self.assertInResponse('OK')
+
+
+class VolumeWithNoMixerTest(protocol.BaseTestCase):
     enable_mixer = False
 
-    def test_setvol_max_error(self):
+    def test_setvol_without_mixer_fails(self):
         self.send_request('setvol "100"')
         self.assertInResponse('ACK [52@0] {setvol} problems setting volume')