andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup volume testing from playback tests

Browse Source
This commit is contained in:
Thomas Adamcik 2010-04-06 15:03:25 +02:00
parent 48acbf701c
commit 62684af518
3 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mopidy/backends/gstreamer.py
View File

@ -108,14 +108,6 @@ class GStreamerPlaybackController(BasePlaybackController):
gst.SEEK_FLAG_FLUSH, time_position * gst.MSECOND)
self._set_state(gst.STATE_PLAYING)
@property
def volume(self):
return int(self._bin.get_property('volume') * 100)
@volume.setter
def volume(self, value):
return self._bin.set_property('volume', float(value) / 100)
@property
def time_position(self):
try:

34
tests/backends/base.py
View File

@ -194,7 +194,6 @@ class BaseCurrentPlaylistControllerTest(object):
class BasePlaybackControllerTest(object):
tracks = []
backend_class = None
supports_volume = False
def setUp(self):
self.backend = self.backend_class()
@ -664,22 +663,23 @@ class BasePlaybackControllerTest(object):
self.assertEqual(first, second)
def test_volume(self):
if not self.supports_volume:
self.assertEqual(self.playback.volume, None)
else:
self.assertEqual(self.playback.volume, 100)
self.playback.volume = 50
self.assertEqual(self.playback.volume, 50)
self.playback.volume = 0
self.assertEqual(self.playback.volume, 0)
def test_volume_is_not_float(self):
if not self.supports_volume:
return
self.playback.volume = 1.0 / 3 * 100
self.assertEqual(self.playback.volume, 33)
# FIXME move to mixer tests
# def test_volume(self):
# if not self.supports_volume:
# self.assertEqual(self.playback.volume, None)
# else:
# self.assertEqual(self.playback.volume, 100)
# self.playback.volume = 50
# self.assertEqual(self.playback.volume, 50)
# self.playback.volume = 0
# self.assertEqual(self.playback.volume, 0)
#
# def test_volume_is_not_float(self):
# if not self.supports_volume:
# return
#
# self.playback.volume = 1.0 / 3 * 100
# self.assertEqual(self.playback.volume, 33)
@populate_playlist
def test_play_with_consume(self):

1
tests/backends/gstreamer_test.py
View File

@ -23,7 +23,6 @@ class GStreamerPlaybackControllerTest(BasePlaybackControllerTest, unittest.TestC
tracks = [Track(uri=song % i, id=i, length=4464) for i in range(1, 4)]
backend_class = GStreamerBackend
supports_volume = True
if __name__ == '__main__':
unittest.main()