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

tests: Use assertEqual instead of assertEquals

Browse Source
This commit is contained in:
Stein Magnus Jodal 2015-03-14 23:00:09 +01:00
parent a1e866e46e
commit 336ef4534a
7 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/local/test_tracklist.py
View File

@ -310,7 +310,7 @@ class LocalTracklistProviderTest(unittest.TestCase):
def test_version_does_not_change_when_adding_nothing(self):
version = self.controller.version
self.controller.add([])
self.assertEquals(version, self.controller.version)
self.assertEqual(version, self.controller.version)
def test_version_increases_when_adding_something(self):
version = self.controller.version

4
tests/mpd/protocol/test_command_list.py
View File

@ -6,7 +6,7 @@ from tests.mpd import protocol
class CommandListsTest(protocol.BaseTestCase):
def test_command_list_begin(self):
response = self.send_request('command_list_begin')
self.assertEquals([], response)
self.assertEqual([], response)
def test_command_list_end(self):
self.send_request('command_list_begin')
@ -42,7 +42,7 @@ class CommandListsTest(protocol.BaseTestCase):
def test_command_list_ok_begin(self):
response = self.send_request('command_list_ok_begin')
self.assertEquals([], response)
self.assertEqual([], response)
def test_command_list_ok_with_ping(self):
self.send_request('command_list_ok_begin')

12
tests/mpd/protocol/test_playback.py
View File

@ -273,7 +273,7 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.core.playback.seek(30000)
self.assertGreaterEqual(
self.core.playback.time_position.get(), 30000)
self.assertEquals(PLAYING, self.core.playback.state.get())
self.assertEqual(PLAYING, self.core.playback.state.get())
self.send_request('play "-1"')
self.assertEqual(PLAYING, self.core.playback.state.get())
@ -286,9 +286,9 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.core.playback.seek(30000)
self.assertGreaterEqual(
self.core.playback.time_position.get(), 30000)
self.assertEquals(PLAYING, self.core.playback.state.get())
self.assertEqual(PLAYING, self.core.playback.state.get())
self.core.playback.pause()
self.assertEquals(PAUSED, self.core.playback.state.get())
self.assertEqual(PAUSED, self.core.playback.state.get())
self.send_request('play "-1"')
self.assertEqual(PLAYING, self.core.playback.state.get())
@ -347,7 +347,7 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.core.playback.seek(30000)
self.assertGreaterEqual(
self.core.playback.time_position.get(), 30000)
self.assertEquals(PLAYING, self.core.playback.state.get())
self.assertEqual(PLAYING, self.core.playback.state.get())
self.send_request('playid "-1"')
self.assertEqual(PLAYING, self.core.playback.state.get())
@ -360,9 +360,9 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase):
self.core.playback.seek(30000)
self.assertGreaterEqual(
self.core.playback.time_position.get(), 30000)
self.assertEquals(PLAYING, self.core.playback.state.get())
self.assertEqual(PLAYING, self.core.playback.state.get())
self.core.playback.pause()
self.assertEquals(PAUSED, self.core.playback.state.get())
self.assertEqual(PAUSED, self.core.playback.state.get())
self.send_request('playid "-1"')
self.assertEqual(PLAYING, self.core.playback.state.get())

10
tests/mpd/protocol/test_regression.py
View File

@ -29,21 +29,21 @@ class IssueGH17RegressionTest(protocol.BaseTestCase):
random.seed(1) # Playlist order: abcfde
self.send_request('play')
self.assertEquals(
self.assertEqual(
'dummy:a', self.core.playback.current_track.get().uri)
self.send_request('random "1"')
self.send_request('next')
self.assertEquals(
self.assertEqual(
'dummy:b', self.core.playback.current_track.get().uri)
self.send_request('next')
# Should now be at track 'c', but playback fails and it skips ahead
self.assertEquals(
self.assertEqual(
'dummy:f', self.core.playback.current_track.get().uri)
self.send_request('next')
self.assertEquals(
self.assertEqual(
'dummy:d', self.core.playback.current_track.get().uri)
self.send_request('next')
self.assertEquals(
self.assertEqual(
'dummy:e', self.core.playback.current_track.get().uri)

22
tests/test_models.py
View File

@ -54,7 +54,7 @@ class GenericCopyTest(unittest.TestCase):
def test_copying_track_to_remove(self):
track = Track(name='foo').copy(name=None)
self.assertEquals(track.__dict__, Track().__dict__)
self.assertEqual(track.__dict__, Track().__dict__)
class RefTest(unittest.TestCase):
@ -77,7 +77,7 @@ class RefTest(unittest.TestCase):
Ref(foo='baz')
def test_repr_without_results(self):
self.assertEquals(
self.assertEqual(
"Ref(name=u'foo', type=u'artist', uri=u'uri')",
repr(Ref(uri='uri', name='foo', type='artist')))
@ -189,7 +189,7 @@ class ArtistTest(unittest.TestCase):
Artist(serialize='baz')
def test_repr(self):
self.assertEquals(
self.assertEqual(
"Artist(name=u'name', uri=u'uri')",
repr(Artist(uri='uri', name='name')))
@ -353,12 +353,12 @@ class AlbumTest(unittest.TestCase):
Album(foo='baz')
def test_repr_without_artists(self):
self.assertEquals(
self.assertEqual(
"Album(name=u'name', uri=u'uri')",
repr(Album(uri='uri', name='name')))
def test_repr_with_artists(self):
self.assertEquals(
self.assertEqual(
"Album(artists=[Artist(name=u'foo')], name=u'name', uri=u'uri')",
repr(Album(uri='uri', name='name', artists=[Artist(name='foo')])))
@ -596,12 +596,12 @@ class TrackTest(unittest.TestCase):
Track(foo='baz')
def test_repr_without_artists(self):
self.assertEquals(
self.assertEqual(
"Track(name=u'name', uri=u'uri')",
repr(Track(uri='uri', name='name')))
def test_repr_with_artists(self):
self.assertEquals(
self.assertEqual(
"Track(artists=[Artist(name=u'foo')], name=u'name', uri=u'uri')",
repr(Track(uri='uri', name='name', artists=[Artist(name='foo')])))
@ -830,7 +830,7 @@ class TlTrackTest(unittest.TestCase):
self.assertEqual(track2, track)
def test_repr(self):
self.assertEquals(
self.assertEqual(
"TlTrack(tlid=123, track=Track(uri=u'uri'))",
repr(TlTrack(tlid=123, track=Track(uri='uri'))))
@ -962,12 +962,12 @@ class PlaylistTest(unittest.TestCase):
Playlist(foo='baz')
def test_repr_without_tracks(self):
self.assertEquals(
self.assertEqual(
"Playlist(name=u'name', uri=u'uri')",
repr(Playlist(uri='uri', name='name')))
def test_repr_with_tracks(self):
self.assertEquals(
self.assertEqual(
"Playlist(name=u'name', tracks=[Track(name=u'foo')], uri=u'uri')",
repr(Playlist(uri='uri', name='name', tracks=[Track(name='foo')])))
@ -1098,7 +1098,7 @@ class SearchResultTest(unittest.TestCase):
SearchResult(foo='baz')
def test_repr_without_results(self):
self.assertEquals(
self.assertEqual(
"SearchResult(uri=u'uri')",
repr(SearchResult(uri='uri')))

24
tests/utils/test_deps.py
View File

@ -49,13 +49,13 @@ class DepsTest(unittest.TestCase):
def test_platform_info(self):
result = deps.platform_info()
self.assertEquals('Platform', result['name'])
self.assertEqual('Platform', result['name'])
self.assertIn(platform.platform(), result['version'])
def test_python_info(self):
result = deps.python_info()
self.assertEquals('Python', result['name'])
self.assertEqual('Python', result['name'])
self.assertIn(platform.python_implementation(), result['version'])
self.assertIn(platform.python_version(), result['version'])
self.assertIn('python', result['path'])
@ -64,8 +64,8 @@ class DepsTest(unittest.TestCase):
def test_gstreamer_info(self):
result = deps.gstreamer_info()
self.assertEquals('GStreamer', result['name'])
self.assertEquals(
self.assertEqual('GStreamer', result['name'])
self.assertEqual(
'.'.join(map(str, gst.get_gst_version())), result['version'])
self.assertIn('gst', result['path'])
self.assertNotIn('__init__.py', result['path'])
@ -99,17 +99,17 @@ class DepsTest(unittest.TestCase):
result = deps.pkg_info()
self.assertEquals('Mopidy', result['name'])
self.assertEquals('0.13', result['version'])
self.assertEqual('Mopidy', result['name'])
self.assertEqual('0.13', result['version'])
self.assertIn('mopidy', result['path'])
dep_info_pykka = result['dependencies'][0]
self.assertEquals('Pykka', dep_info_pykka['name'])
self.assertEquals('1.1', dep_info_pykka['version'])
self.assertEqual('Pykka', dep_info_pykka['name'])
self.assertEqual('1.1', dep_info_pykka['version'])
dep_info_setuptools = dep_info_pykka['dependencies'][0]
self.assertEquals('setuptools', dep_info_setuptools['name'])
self.assertEquals('0.6', dep_info_setuptools['version'])
self.assertEqual('setuptools', dep_info_setuptools['name'])
self.assertEqual('0.6', dep_info_setuptools['version'])
@mock.patch('pkg_resources.get_distribution')
def test_pkg_info_for_missing_dist(self, get_distribution_mock):
@ -117,7 +117,7 @@ class DepsTest(unittest.TestCase):
result = deps.pkg_info()
self.assertEquals('Mopidy', result['name'])
self.assertEqual('Mopidy', result['name'])
self.assertNotIn('version', result)
self.assertNotIn('path', result)
@ -127,6 +127,6 @@ class DepsTest(unittest.TestCase):
result = deps.pkg_info()
self.assertEquals('Mopidy', result['name'])
self.assertEqual('Mopidy', result['name'])
self.assertNotIn('version', result)
self.assertNotIn('path', result)

14
tests/utils/test_jsonrpc.py
View File

@ -629,23 +629,23 @@ class JsonRpcInspectorTest(JsonRpcTestBase):
methods = inspector.describe()
self.assertIn('core.get_uri_schemes', methods)
self.assertEquals(len(methods['core.get_uri_schemes']['params']), 0)
self.assertEqual(len(methods['core.get_uri_schemes']['params']), 0)
self.assertIn('core.library.lookup', methods.keys())
self.assertEquals(
self.assertEqual(
methods['core.library.lookup']['params'][0]['name'], 'uri')
self.assertIn('core.playback.next', methods)
self.assertEquals(len(methods['core.playback.next']['params']), 0)
self.assertEqual(len(methods['core.playback.next']['params']), 0)
self.assertIn('core.playlists.get_playlists', methods)
self.assertEquals(
self.assertEqual(
len(methods['core.playlists.get_playlists']['params']), 1)
self.assertIn('core.tracklist.filter', methods.keys())
self.assertEquals(
self.assertEqual(
methods['core.tracklist.filter']['params'][0]['name'], 'criteria')
self.assertEquals(
self.assertEqual(
methods['core.tracklist.filter']['params'][1]['name'], 'kwargs')
self.assertEquals(
self.assertEqual(
methods['core.tracklist.filter']['params'][1]['kwargs'], True)