From 051d2d7dac92630565b7ed64a785f631e6020b3d Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <adamcik@samfundet.no>
Date: Wed, 7 Apr 2010 02:49:22 +0200
Subject: [PATCH] Clean DenonMixerTest

---
 mopidy/mixers/denon.py     |  4 ++--
 tests/mixers/denon_test.py | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/mopidy/mixers/denon.py b/mopidy/mixers/denon.py
index ae5871d9..9d065d9a 100644
--- a/mopidy/mixers/denon.py
+++ b/mopidy/mixers/denon.py
@@ -26,12 +26,12 @@ class DenonMixer(BaseMixer):
     - :attr:`mopidy.settings.MIXER_EXT_PORT` -- Example: ``/dev/ttyUSB0``
     """
 
-    def __init__(self):
+    def __init__(self, device=None):
         """
         Connects using the serial specifications from Denon's RS-232 Protocol
         specification: 9600bps 8N1.
         """
-        self._device = Serial(port=MIXER_EXT_PORT, timeout=0.2)
+        self._device = device or Serial(port=MIXER_EXT_PORT, timeout=0.2)
         self._levels = ['99'] + ["%(#)02d" % {'#': v} for v in range(0, 99)]
         self._volume = 0
         self._lock = Lock()
diff --git a/tests/mixers/denon_test.py b/tests/mixers/denon_test.py
index d0fb9a46..f0806604 100644
--- a/tests/mixers/denon_test.py
+++ b/tests/mixers/denon_test.py
@@ -25,26 +25,26 @@ class DenonMixerDeviceMock(object):
 
 class DenonMixerTest(unittest.TestCase):
     def setUp(self):
-        self.m = DenonMixer()
-        self.m._device = DenonMixerDeviceMock()
+        self.device = DenonMixerDeviceMock()
+        self.mixer = DenonMixer(device=self.device)
 
     def test_volume_set_to_min(self):
-        self.m.volume = 0
-        self.assertEqual(self.m.volume, 0)
+        self.mixer.volume = 0
+        self.assertEqual(self.mixer.volume, 0)
 
     def test_volume_set_to_max(self):
-        self.m.volume = 100
-        self.assertEqual(self.m.volume, 99)
+        self.mixer.volume = 100
+        self.assertEqual(self.mixer.volume, 99)
 
     def test_volume_set_to_below_min_results_in_min(self):
-        self.m.volume = -10
-        self.assertEqual(self.m.volume, 0)
+        self.mixer.volume = -10
+        self.assertEqual(self.mixer.volume, 0)
 
     def test_volume_set_to_above_max_results_in_max(self):
-        self.m.volume = 110
-        self.assertEqual(self.m.volume, 99)
+        self.mixer.volume = 110
+        self.assertEqual(self.mixer.volume, 99)
 
     def test_reopen_device(self):
-        self.m._device._open = False
-        self.m.volume = 10
-        self.assertTrue(self.m._device._open)
+        self.device._open = False
+        self.mixer.volume = 10
+        self.assertTrue(self.device.isOpen())