From 1b62efa31de829074c1c452f123d21b62d5415d5 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 6 Apr 2010 22:25:54 +0200 Subject: [PATCH 1/5] docs: Remove a misplaced half-sentence --- docs/installation/despotify.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/installation/despotify.rst b/docs/installation/despotify.rst index f00a4dee..ef47ca64 100644 --- a/docs/installation/despotify.rst +++ b/docs/installation/despotify.rst @@ -75,5 +75,3 @@ The test script should ask for your username and password (which must be for a Spotify Premium account), ask for a search query, list all your playlists with tracks, play 10s from a random song from the search result, pause for two seconds, play for five more seconds, and quit. -o stop Mopidy, press ``CTRL+C``. - From 04b6535d958729969a82d3fdf96fd49c62dce10c Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 6 Apr 2010 22:39:30 +0200 Subject: [PATCH 2/5] Ready for 0.1.0a1 development --- docs/changes.rst | 5 +++++ mopidy/__init__.py | 2 +- tests/version_test.py | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/changes.rst b/docs/changes.rst index cd54336c..54cd8b1f 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -4,6 +4,11 @@ Changes This change log is used to track all major changes to Mopidy. +0.1.0a1 (unreleased) +==================== + +- Changed backend API for get/filter/find_exact/search. + 0.1.0a0 (2010-03-27) ==================== diff --git a/mopidy/__init__.py b/mopidy/__init__.py index d94913b0..711a6242 100644 --- a/mopidy/__init__.py +++ b/mopidy/__init__.py @@ -1,7 +1,7 @@ from mopidy import settings as raw_settings def get_version(): - return u'0.1.0a0' + return u'0.1.0a1' def get_mpd_protocol_version(): return u'0.16.0' diff --git a/tests/version_test.py b/tests/version_test.py index 4a9b948d..f6d6cfb3 100644 --- a/tests/version_test.py +++ b/tests/version_test.py @@ -8,7 +8,8 @@ class VersionTest(unittest.TestCase): SV(get_version()) def test_versions_can_be_strictly_ordered(self): - self.assert_(SV(get_version()) < SV('0.1.0a1')) + self.assert_(SV(get_version()) > SV('0.1.0a0')) + self.assert_(SV(get_version()) < SV('0.1.0a2')) self.assert_(SV('0.1.0a1') < SV('0.1.0')) self.assert_(SV('0.1.0') < SV('0.1.1')) self.assert_(SV('0.1.1') < SV('0.2.0')) From 051d2d7dac92630565b7ed64a785f631e6020b3d Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Wed, 7 Apr 2010 02:49:22 +0200 Subject: [PATCH 3/5] 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()) From 660e21971c362cbc446b34815a261604c1f0acb9 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Wed, 7 Apr 2010 02:52:35 +0200 Subject: [PATCH 4/5] Clean BaseMixerTest --- tests/mixers/dummy_test.py | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/tests/mixers/dummy_test.py b/tests/mixers/dummy_test.py index 00d748fe..742bccf3 100644 --- a/tests/mixers/dummy_test.py +++ b/tests/mixers/dummy_test.py @@ -3,24 +3,30 @@ import unittest from mopidy.mixers.dummy import DummyMixer class BaseMixerTest(unittest.TestCase): + MIN = 0 + MAX = 100 + + ACTUAL_MIN = MIN + ACTUAL_MAX = MAX + def setUp(self): - self.m = DummyMixer() + self.mixer = DummyMixer() def test_volume_is_None_initially(self): - self.assertEqual(self.m.volume, None) + self.assertEqual(self.mixer.volume, None) def test_volume_set_to_min(self): - self.m.volume = 0 - self.assertEqual(self.m.volume, 0) + self.mixer.volume = self.MIN + self.assertEqual(self.mixer.volume, self.ACTUAL_MIN) def test_volume_set_to_max(self): - self.m.volume = 100 - self.assertEqual(self.m.volume, 100) + self.mixer.volume = self.MAX + self.assertEqual(self.mixer.volume, self.ACTUAL_MAX) 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, self.ACTUAL_MIN) def test_volume_set_to_above_max_results_in_max(self): - self.m.volume = 110 - self.assertEqual(self.m.volume, 100) + self.mixer.volume = self.MAX + 10 + self.assertEqual(self.mixer.volume, self.ACTUAL_MAX) From bc09acf8c65e5454e9e07a0625fdbc821e54bc25 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Wed, 7 Apr 2010 02:57:17 +0200 Subject: [PATCH 5/5] Refactor DenonMixerTest to use new BaseMixerTest --- tests/mixers/denon_test.py | 23 ++++++----------------- tests/mixers/dummy_test.py | 6 ++++-- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/tests/mixers/denon_test.py b/tests/mixers/denon_test.py index f0806604..82e813e9 100644 --- a/tests/mixers/denon_test.py +++ b/tests/mixers/denon_test.py @@ -1,6 +1,7 @@ import unittest from mopidy.mixers.denon import DenonMixer +from tests.mixers.dummy_test import BaseMixerTest class DenonMixerDeviceMock(object): def __init__(self): @@ -23,27 +24,15 @@ class DenonMixerDeviceMock(object): def open(self): self._open = True -class DenonMixerTest(unittest.TestCase): +class DenonMixerTest(BaseMixerTest): + ACTUAL_MAX = 99 + + INITIAL = 1 + def setUp(self): self.device = DenonMixerDeviceMock() self.mixer = DenonMixer(device=self.device) - def test_volume_set_to_min(self): - self.mixer.volume = 0 - self.assertEqual(self.mixer.volume, 0) - - def test_volume_set_to_max(self): - self.mixer.volume = 100 - self.assertEqual(self.mixer.volume, 99) - - def test_volume_set_to_below_min_results_in_min(self): - self.mixer.volume = -10 - self.assertEqual(self.mixer.volume, 0) - - def test_volume_set_to_above_max_results_in_max(self): - self.mixer.volume = 110 - self.assertEqual(self.mixer.volume, 99) - def test_reopen_device(self): self.device._open = False self.mixer.volume = 10 diff --git a/tests/mixers/dummy_test.py b/tests/mixers/dummy_test.py index 742bccf3..35944e14 100644 --- a/tests/mixers/dummy_test.py +++ b/tests/mixers/dummy_test.py @@ -9,11 +9,13 @@ class BaseMixerTest(unittest.TestCase): ACTUAL_MIN = MIN ACTUAL_MAX = MAX + INITIAL = None + def setUp(self): self.mixer = DummyMixer() - def test_volume_is_None_initially(self): - self.assertEqual(self.mixer.volume, None) + def test_initial_volume(self): + self.assertEqual(self.mixer.volume, self.INITIAL) def test_volume_set_to_min(self): self.mixer.volume = self.MIN