Run pyflakes and pep8 and update

This commit is contained in:
hugovk 2014-03-05 18:11:57 +02:00
parent 779af598db
commit 1d532c0363
3 changed files with 999 additions and 663 deletions

2
.build
View file

@ -1 +1 @@
15 16

1176
pylast.py

File diff suppressed because it is too large Load diff

View file

@ -9,6 +9,7 @@ import unittest
import pylast import pylast
def load_secrets(): def load_secrets():
secrets_file = "test_pylast.yaml" secrets_file = "test_pylast.yaml"
if os.path.isfile(secrets_file): if os.path.isfile(secrets_file):
@ -41,9 +42,9 @@ class TestPyLast(unittest.TestCase):
API_KEY = self.__class__.secrets["api_key"] API_KEY = self.__class__.secrets["api_key"]
API_SECRET = self.__class__.secrets["api_secret"] API_SECRET = self.__class__.secrets["api_secret"]
self.network = pylast.LastFMNetwork(api_key = API_KEY, api_secret = self.network = pylast.LastFMNetwork(
API_SECRET, username = self.username, password_hash = password_hash) api_key=API_KEY, api_secret=API_SECRET,
username=self.username, password_hash=password_hash)
def test_scrobble(self): def test_scrobble(self):
# Arrange # Arrange
@ -53,35 +54,36 @@ class TestPyLast(unittest.TestCase):
lastfm_user = self.network.get_user(self.username) lastfm_user = self.network.get_user(self.username)
# Act # Act
self.network.scrobble(artist = artist, title = title, timestamp = timestamp) self.network.scrobble(artist=artist, title=title, timestamp=timestamp)
# Assert # Assert
last_scrobble = lastfm_user.get_recent_tracks(limit = 2)[0] # 2 to ignore now-playing # limit=2 to ignore now-playing:
last_scrobble = lastfm_user.get_recent_tracks(limit=2)[0]
self.assertEqual(str(last_scrobble.track.artist), str(artist)) self.assertEqual(str(last_scrobble.track.artist), str(artist))
self.assertEqual(str(last_scrobble.track.title), str(title)) self.assertEqual(str(last_scrobble.track.title), str(title))
self.assertEqual(str(last_scrobble.timestamp), str(timestamp)) self.assertEqual(str(last_scrobble.timestamp), str(timestamp))
def test_unscrobble(self): def test_unscrobble(self):
# Arrange # Arrange
artist = "Test Artist 2" artist = "Test Artist 2"
title = "Test Title 2" title = "Test Title 2"
timestamp = self.unix_timestamp() timestamp = self.unix_timestamp()
library = pylast.Library(user = self.username, network = self.network) library = pylast.Library(user=self.username, network=self.network)
self.network.scrobble(artist = artist, title = title, timestamp = timestamp) self.network.scrobble(artist=artist, title=title, timestamp=timestamp)
lastfm_user = self.network.get_user(self.username) lastfm_user = self.network.get_user(self.username)
# Act # Act
library.remove_scrobble(artist = artist, title = title, timestamp = timestamp) library.remove_scrobble(
artist=artist, title=title, timestamp=timestamp)
# Assert # Assert
last_scrobble = lastfm_user.get_recent_tracks(limit = 2)[0] # 2 to ignore now-playing # limit=2 to ignore now-playing:
last_scrobble = lastfm_user.get_recent_tracks(limit=2)[0]
self.assertNotEqual(str(last_scrobble.timestamp), str(timestamp)) self.assertNotEqual(str(last_scrobble.timestamp), str(timestamp))
def test_add_album(self): def test_add_album(self):
# Arrange # Arrange
library = pylast.Library(user = self.username, network = self.network) library = pylast.Library(user=self.username, network=self.network)
album = self.network.get_album("Test Artist", "Test Album") album = self.network.get_album("Test Artist", "Test Album")
# Act # Act
@ -95,12 +97,11 @@ class TestPyLast(unittest.TestCase):
break break
self.assertTrue(value) self.assertTrue(value)
def test_remove_album(self): def test_remove_album(self):
# Arrange # Arrange
library = pylast.Library(user = self.username, network = self.network) library = pylast.Library(user=self.username, network=self.network)
# Pick an artist with plenty of albums # Pick an artist with plenty of albums
artist = self.network.get_top_artists(limit = 1)[0].item artist = self.network.get_top_artists(limit=1)[0].item
albums = artist.get_top_albums() albums = artist.get_top_albums()
# Pick a random one to avoid problems running concurrent tests # Pick a random one to avoid problems running concurrent tests
album = choice(albums)[0] album = choice(albums)[0]
@ -117,11 +118,10 @@ class TestPyLast(unittest.TestCase):
break break
self.assertFalse(value) self.assertFalse(value)
def test_add_artist(self): def test_add_artist(self):
# Arrange # Arrange
artist = "Test Artist 2" artist = "Test Artist 2"
library = pylast.Library(user = self.username, network = self.network) library = pylast.Library(user=self.username, network=self.network)
# Act # Act
library.add_artist(artist) library.add_artist(artist)
@ -134,14 +134,13 @@ class TestPyLast(unittest.TestCase):
break break
self.assertTrue(value) self.assertTrue(value)
def test_remove_artist(self): def test_remove_artist(self):
# Arrange # Arrange
# Get plenty of artists # Get plenty of artists
artists = self.network.get_top_artists() artists = self.network.get_top_artists()
# Pick a random one to avoid problems running concurrent tests # Pick a random one to avoid problems running concurrent tests
my_artist = choice(artists).item my_artist = choice(artists).item
library = pylast.Library(user = self.username, network = self.network) library = pylast.Library(user=self.username, network=self.network)
library.add_artist(my_artist) library.add_artist(my_artist)
# Act # Act
@ -155,7 +154,6 @@ class TestPyLast(unittest.TestCase):
break break
self.assertFalse(value) self.assertFalse(value)
def test_get_venue(self): def test_get_venue(self):
# Arrange # Arrange
venue_name = "Last.fm Office" venue_name = "Last.fm Office"
@ -168,7 +166,6 @@ class TestPyLast(unittest.TestCase):
# Assert # Assert
self.assertEqual(str(venue.id), "8778225") self.assertEqual(str(venue.id), "8778225")
def test_get_user_registration(self): def test_get_user_registration(self):
# Arrange # Arrange
username = "RJ" username = "RJ"
@ -181,7 +178,6 @@ class TestPyLast(unittest.TestCase):
# Just check date because of timezones # Just check date because of timezones
self.assertIn(u"2002-11-20 ", registered) self.assertIn(u"2002-11-20 ", registered)
def test_get_user_unixtime_registration(self): def test_get_user_unixtime_registration(self):
# Arrange # Arrange
username = "RJ" username = "RJ"
@ -194,10 +190,10 @@ class TestPyLast(unittest.TestCase):
# Just check date because of timezones # Just check date because of timezones
self.assertEqual(unixtime_registered, u"1037793040") self.assertEqual(unixtime_registered, u"1037793040")
def test_get_genderless_user(self): def test_get_genderless_user(self):
# Arrange # Arrange
lastfm_user = self.network.get_user("test_user") # currently no gender set # Currently test_user has no gender set:
lastfm_user = self.network.get_user("test_user")
# Act # Act
gender = lastfm_user.get_gender() gender = lastfm_user.get_gender()
@ -205,10 +201,10 @@ class TestPyLast(unittest.TestCase):
# Assert # Assert
self.assertIsNone(gender) self.assertIsNone(gender)
def test_get_countryless_user(self): def test_get_countryless_user(self):
# Arrange # Arrange
lastfm_user = self.network.get_user("test_user") # currently no country set # Currently test_user has no country set:
lastfm_user = self.network.get_user("test_user")
# Act # Act
country = lastfm_user.get_country() country = lastfm_user.get_country()
@ -216,7 +212,6 @@ class TestPyLast(unittest.TestCase):
# Assert # Assert
self.assertIsNone(country) self.assertIsNone(country)
def test_love(self): def test_love(self):
# Arrange # Arrange
artist = "Test Artist" artist = "Test Artist"
@ -228,11 +223,10 @@ class TestPyLast(unittest.TestCase):
track.love() track.love()
# Assert # Assert
loved = lastfm_user.get_loved_tracks(limit = 1) loved = lastfm_user.get_loved_tracks(limit=1)
self.assertEqual(str(loved[0].track.artist), "Test Artist") self.assertEqual(str(loved[0].track.artist), "Test Artist")
self.assertEqual(str(loved[0].track.title), "Test Title") self.assertEqual(str(loved[0].track.title), "Test Title")
def test_unlove(self): def test_unlove(self):
# Arrange # Arrange
artist = "Test Artist" artist = "Test Artist"
@ -245,59 +239,55 @@ class TestPyLast(unittest.TestCase):
track.unlove() track.unlove()
# Assert # Assert
loved = lastfm_user.get_loved_tracks(limit = 1) loved = lastfm_user.get_loved_tracks(limit=1)
if len(loved): # OK to be empty but if not: if len(loved): # OK to be empty but if not:
self.assertNotEqual(str(loved.track.artist), "Test Artist") self.assertNotEqual(str(loved.track.artist), "Test Artist")
self.assertNotEqual(str(loved.track.title), "Test Title") self.assertNotEqual(str(loved.track.title), "Test Title")
def test_get_100_albums(self): def test_get_100_albums(self):
# Arrange # Arrange
library = pylast.Library(user = self.username, network = self.network) library = pylast.Library(user=self.username, network=self.network)
# Act # Act
albums = library.get_albums(limit = 100) albums = library.get_albums(limit=100)
# Assert # Assert
self.assertGreaterEqual(len(albums), 0) self.assertGreaterEqual(len(albums), 0)
def test_get_limitless_albums(self): def test_get_limitless_albums(self):
# Arrange # Arrange
library = pylast.Library(user = self.username, network = self.network) library = pylast.Library(user=self.username, network=self.network)
# Act # Act
albums = library.get_albums(limit = None) albums = library.get_albums(limit=None)
# Assert # Assert
self.assertGreaterEqual(len(albums), 0) self.assertGreaterEqual(len(albums), 0)
def test_user_equals_none(self): def test_user_equals_none(self):
# Arrange # Arrange
lastfm_user = self.network.get_user(self.username) lastfm_user = self.network.get_user(self.username)
# Act # Act
value = (lastfm_user == None) value = (lastfm_user is None)
# Assert # Assert
self.assertFalse(value) self.assertFalse(value)
def test_user_not_equal_to_none(self): def test_user_not_equal_to_none(self):
# Arrange # Arrange
lastfm_user = self.network.get_user(self.username) lastfm_user = self.network.get_user(self.username)
# Act # Act
value = (lastfm_user != None) value = (lastfm_user is not None)
# Assert # Assert
self.assertTrue(value) self.assertTrue(value)
def test_now_playing_user_with_no_scrobbles(self): def test_now_playing_user_with_no_scrobbles(self):
# Arrange # Arrange
user = self.network.get_user('test-account') # currently has no scrobbles # Currently test-account has no scrobbles:
user = self.network.get_user('test-account')
# Act # Act
current_track = user.get_now_playing() current_track = user.get_now_playing()
@ -305,10 +295,10 @@ class TestPyLast(unittest.TestCase):
# Assert # Assert
self.assertIsNone(current_track) self.assertIsNone(current_track)
def test_love_limits(self): def test_love_limits(self):
# Arrange # Arrange
user = self.network.get_user("test-user") # currently at least 23 loved tracks # Currently test-account has at least 23 loved tracks:
user = self.network.get_user("test-user")
# Act/Assert # Act/Assert
self.assertEqual(len(user.get_loved_tracks(limit=20)), 20) self.assertEqual(len(user.get_loved_tracks(limit=20)), 20)
@ -316,7 +306,6 @@ class TestPyLast(unittest.TestCase):
self.assertGreaterEqual(len(user.get_loved_tracks(limit=None)), 23) self.assertGreaterEqual(len(user.get_loved_tracks(limit=None)), 23)
self.assertGreaterEqual(len(user.get_loved_tracks(limit=0)), 23) self.assertGreaterEqual(len(user.get_loved_tracks(limit=0)), 23)
def test_update_now_playing(self): def test_update_now_playing(self):
# Arrange # Arrange
artist = "Test Artist" artist = "Test Artist"
@ -326,7 +315,8 @@ class TestPyLast(unittest.TestCase):
lastfm_user = self.network.get_user(self.username) lastfm_user = self.network.get_user(self.username)
# Act # Act
self.network.update_now_playing(artist = artist, title = title, album = album, track_number = track_number) self.network.update_now_playing(
artist=artist, title=title, album=album, track_number=track_number)
# Assert # Assert
current_track = lastfm_user.get_now_playing() current_track = lastfm_user.get_now_playing()
@ -334,33 +324,31 @@ class TestPyLast(unittest.TestCase):
self.assertEqual(str(current_track.title), "Test Title") self.assertEqual(str(current_track.title), "Test Title")
self.assertEqual(str(current_track.artist), "Test Artist") self.assertEqual(str(current_track.artist), "Test Artist")
def test_libre_fm(self): def test_libre_fm(self):
# Arrange # Arrange
username = self.__class__.secrets["username"] username = self.__class__.secrets["username"]
password_hash = self.__class__.secrets["password_hash"] password_hash = self.__class__.secrets["password_hash"]
# Act # Act
network = pylast.LibreFMNetwork(password_hash = password_hash, username = username) network = pylast.LibreFMNetwork(
tags = network.get_top_tags(limit = 1) password_hash=password_hash, username=username)
tags = network.get_top_tags(limit=1)
# Assert # Assert
self.assertGreater(len(tags), 0) self.assertGreater(len(tags), 0)
self.assertEqual(type(tags[0]), pylast.TopItem) self.assertEqual(type(tags[0]), pylast.TopItem)
def test_album_tags_are_topitems(self): def test_album_tags_are_topitems(self):
# Arrange # Arrange
albums = self.network.get_user('RJ').get_top_albums() albums = self.network.get_user('RJ').get_top_albums()
# Act # Act
tags = albums[0].item.get_top_tags(limit = 1) tags = albums[0].item.get_top_tags(limit=1)
# Assert # Assert
self.assertGreater(len(tags), 0) self.assertGreater(len(tags), 0)
self.assertEqual(type(tags[0]), pylast.TopItem) self.assertEqual(type(tags[0]), pylast.TopItem)
def helper_is_thing_hashable(self, thing): def helper_is_thing_hashable(self, thing):
# Arrange # Arrange
things = set() things = set()
@ -379,7 +367,6 @@ class TestPyLast(unittest.TestCase):
# Act/Assert # Act/Assert
self.helper_is_thing_hashable(album) self.helper_is_thing_hashable(album)
def test_artist_is_hashable(self): def test_artist_is_hashable(self):
# Arrange # Arrange
test_artist = self.network.get_artist("Test Artist") test_artist = self.network.get_artist("Test Artist")
@ -389,7 +376,6 @@ class TestPyLast(unittest.TestCase):
# Act/Assert # Act/Assert
self.helper_is_thing_hashable(artist) self.helper_is_thing_hashable(artist)
def test_country_is_hashable(self): def test_country_is_hashable(self):
# Arrange # Arrange
country = self.network.get_country("Italy") country = self.network.get_country("Italy")
@ -397,24 +383,21 @@ class TestPyLast(unittest.TestCase):
# Act/Assert # Act/Assert
self.helper_is_thing_hashable(country) self.helper_is_thing_hashable(country)
def test_metro_is_hashable(self):
def test_country_is_hashable(self):
# Arrange # Arrange
metro = self.network.get_metro("Helsinki", "Finland") metro = self.network.get_metro("Helsinki", "Finland")
# Act/Assert # Act/Assert
self.helper_is_thing_hashable(metro) self.helper_is_thing_hashable(metro)
def test_event_is_hashable(self): def test_event_is_hashable(self):
# Arrange # Arrange
user = self.network.get_user("RJ") user = self.network.get_user("RJ")
event = user.get_past_events(limit = 1)[0] event = user.get_past_events(limit=1)[0]
# Act/Assert # Act/Assert
self.helper_is_thing_hashable(event) self.helper_is_thing_hashable(event)
def test_group_is_hashable(self): def test_group_is_hashable(self):
# Arrange # Arrange
group = self.network.get_group("Audioscrobbler Beta") group = self.network.get_group("Audioscrobbler Beta")
@ -422,31 +405,28 @@ class TestPyLast(unittest.TestCase):
# Act/Assert # Act/Assert
self.helper_is_thing_hashable(group) self.helper_is_thing_hashable(group)
def test_library_is_hashable(self): def test_library_is_hashable(self):
# Arrange # Arrange
library = pylast.Library(user = self.username, network = self.network) library = pylast.Library(user=self.username, network=self.network)
# Act/Assert # Act/Assert
self.helper_is_thing_hashable(library) self.helper_is_thing_hashable(library)
def test_playlist_is_hashable(self): def test_playlist_is_hashable(self):
# Arrange # Arrange
playlist = pylast.Playlist(user = "RJ", id = "1k1qp_doglist", network = self.network) playlist = pylast.Playlist(
user="RJ", id="1k1qp_doglist", network=self.network)
# Act/Assert # Act/Assert
self.helper_is_thing_hashable(playlist) self.helper_is_thing_hashable(playlist)
def test_tag_is_hashable(self): def test_tag_is_hashable(self):
# Arrange # Arrange
tag = self.network.get_top_tags(limit = 1)[0] tag = self.network.get_top_tags(limit=1)[0]
# Act/Assert # Act/Assert
self.helper_is_thing_hashable(tag) self.helper_is_thing_hashable(tag)
def test_track_is_hashable(self): def test_track_is_hashable(self):
# Arrange # Arrange
artist = self.network.get_artist("Test Artist") artist = self.network.get_artist("Test Artist")
@ -456,7 +436,6 @@ class TestPyLast(unittest.TestCase):
# Act/Assert # Act/Assert
self.helper_is_thing_hashable(track) self.helper_is_thing_hashable(track)
def test_user_is_hashable(self): def test_user_is_hashable(self):
# Arrange # Arrange
artist = self.network.get_artist("Test Artist") artist = self.network.get_artist("Test Artist")
@ -466,7 +445,6 @@ class TestPyLast(unittest.TestCase):
# Act/Assert # Act/Assert
self.helper_is_thing_hashable(user) self.helper_is_thing_hashable(user)
def test_venue_is_hashable(self): def test_venue_is_hashable(self):
# Arrange # Arrange
venue_id = "8778225" # Last.fm office venue_id = "8778225" # Last.fm office
@ -475,15 +453,14 @@ class TestPyLast(unittest.TestCase):
# Act/Assert # Act/Assert
self.helper_is_thing_hashable(venue) self.helper_is_thing_hashable(venue)
def test_xspf_is_hashable(self): def test_xspf_is_hashable(self):
# Arrange # Arrange
xspf = pylast.XSPF(uri = "lastfm://playlist/1k1qp_doglist", network = self.network) xspf = pylast.XSPF(
uri="lastfm://playlist/1k1qp_doglist", network=self.network)
# Act/Assert # Act/Assert
self.helper_is_thing_hashable(xspf) self.helper_is_thing_hashable(xspf)
def test_invalid_xml(self): def test_invalid_xml(self):
# Arrange # Arrange
# Currently causes PCDATA invalid Char value 25 # Currently causes PCDATA invalid Char value 25
@ -497,12 +474,13 @@ class TestPyLast(unittest.TestCase):
# Assert # Assert
self.assertGreaterEqual(int(total), 0) self.assertGreaterEqual(int(total), 0)
def test_user_play_count_in_track_info(self): def test_user_play_count_in_track_info(self):
# Arrange # Arrange
artist = "Test Artist" artist = "Test Artist"
title = "Test Title" title = "Test Title"
track = pylast.Track(artist = artist, title = title, network = self.network, username = self.username) track = pylast.Track(
artist=artist, title=title,
network=self.network, username=self.username)
# Act # Act
count = track.get_userplaycount() count = track.get_userplaycount()
@ -510,12 +488,13 @@ class TestPyLast(unittest.TestCase):
# Assert # Assert
self.assertGreaterEqual(count, 0) self.assertGreaterEqual(count, 0)
def test_user_loved_in_track_info(self): def test_user_loved_in_track_info(self):
# Arrange # Arrange
artist = "Test Artist" artist = "Test Artist"
title = "Test Title" title = "Test Title"
track = pylast.Track(artist = artist, title = title, network = self.network, username = self.username) track = pylast.Track(
artist=artist, title=title,
network=self.network, username=self.username)
# Act # Act
loved = track.get_userloved() loved = track.get_userloved()
@ -525,29 +504,27 @@ class TestPyLast(unittest.TestCase):
self.assertIsInstance(loved, bool) self.assertIsInstance(loved, bool)
self.assertNotIsInstance(loved, str) self.assertNotIsInstance(loved, str)
def test_album_in_recent_tracks(self): def test_album_in_recent_tracks(self):
# Arrange # Arrange
lastfm_user = self.network.get_user(self.username) lastfm_user = self.network.get_user(self.username)
# Act # Act
track = lastfm_user.get_recent_tracks(limit = 2)[0] # 2 to ignore now-playing # limit=2 to ignore now-playing:
track = lastfm_user.get_recent_tracks(limit=2)[0]
# Assert # Assert
self.assertTrue(hasattr(track, 'album')) self.assertTrue(hasattr(track, 'album'))
def test_album_in_artist_tracks(self): def test_album_in_artist_tracks(self):
# Arrange # Arrange
lastfm_user = self.network.get_user(self.username) lastfm_user = self.network.get_user(self.username)
# Act # Act
track = lastfm_user.get_artist_tracks(artist = "Test Artist")[0] track = lastfm_user.get_artist_tracks(artist="Test Artist")[0]
# Assert # Assert
self.assertTrue(hasattr(track, 'album')) self.assertTrue(hasattr(track, 'album'))
def test_enable_rate_limiting(self): def test_enable_rate_limiting(self):
# Arrange # Arrange
self.assertFalse(self.network.is_rate_limited()) self.assertFalse(self.network.is_rate_limited())
@ -565,7 +542,6 @@ class TestPyLast(unittest.TestCase):
self.assertTrue(self.network.is_rate_limited()) self.assertTrue(self.network.is_rate_limited())
self.assertGreaterEqual(now - then, 0.2) self.assertGreaterEqual(now - then, 0.2)
def test_disable_rate_limiting(self): def test_disable_rate_limiting(self):
# Arrange # Arrange
self.network.enable_rate_limit() self.network.enable_rate_limit()
@ -573,32 +549,28 @@ class TestPyLast(unittest.TestCase):
# Act # Act
self.network.disable_rate_limit() self.network.disable_rate_limit()
then = time.time()
# Make some network call, limit not applied first time # Make some network call, limit not applied first time
self.network.get_user(self.username) self.network.get_user(self.username)
# Make a second network call, limiting should be applied # Make a second network call, limiting should be applied
self.network.get_top_artists() self.network.get_top_artists()
now = time.time()
# Assert # Assert
self.assertFalse(self.network.is_rate_limited()) self.assertFalse(self.network.is_rate_limited())
# Commented out because (a) it'll take a long time and (b) it strangely
# Commented out because (a) it'll take a long time and # fails due Last.fm's complaining of hitting the rate limit, even when
# (b) it strangely fails due Last.fm's complaining of hitting the rate limit, # limited to one call per second. The ToS allows 5 calls per second.
# even when limited to one call per second. The ToS allows 5 calls per second.
# def test_get_all_scrobbles(self): # def test_get_all_scrobbles(self):
# # Arrange # # Arrange
# lastfm_user = self.network.get_user("RJ") # lastfm_user = self.network.get_user("RJ")
# self.network.enable_rate_limit() # this is going to be slow... # self.network.enable_rate_limit() # this is going to be slow...
# # Act # # Act
# tracks = lastfm_user.get_recent_tracks(limit = None) # tracks = lastfm_user.get_recent_tracks(limit=None)
# # Assert # # Assert
# self.assertGreaterEqual(len(tracks), 0) # self.assertGreaterEqual(len(tracks), 0)
def helper_past_events_have_valid_ids(self, thing): def helper_past_events_have_valid_ids(self, thing):
# Act # Act
events = thing.get_past_events() events = thing.get_past_events()
@ -606,7 +578,6 @@ class TestPyLast(unittest.TestCase):
# Assert # Assert
self.helper_assert_events_have_valid_ids(events) self.helper_assert_events_have_valid_ids(events)
def helper_upcoming_events_have_valid_ids(self, thing): def helper_upcoming_events_have_valid_ids(self, thing):
# Act # Act
events = thing.get_upcoming_events() events = thing.get_upcoming_events()
@ -614,14 +585,13 @@ class TestPyLast(unittest.TestCase):
# Assert # Assert
self.helper_assert_events_have_valid_ids(events) self.helper_assert_events_have_valid_ids(events)
def helper_assert_events_have_valid_ids(self, events): def helper_assert_events_have_valid_ids(self, events):
# Assert # Assert
self.assertGreaterEqual(len(events), 1) # if fails, add past/future event for user/Test Artist # If fails, add past/future event for user/Test Artist:
self.assertGreaterEqual(len(events), 1)
for event in events[:2]: # checking first two should be enough for event in events[:2]: # checking first two should be enough
self.assertIsInstance(event.get_headliner(), pylast.Artist) self.assertIsInstance(event.get_headliner(), pylast.Artist)
def test_artist_upcoming_events_returns_valid_ids(self): def test_artist_upcoming_events_returns_valid_ids(self):
# Arrange # Arrange
artist = pylast.Artist("Test Artist", self.network) artist = pylast.Artist("Test Artist", self.network)
@ -629,7 +599,6 @@ class TestPyLast(unittest.TestCase):
# Act/Assert # Act/Assert
self.helper_upcoming_events_have_valid_ids(artist) self.helper_upcoming_events_have_valid_ids(artist)
def test_user_past_events_returns_valid_ids(self): def test_user_past_events_returns_valid_ids(self):
# Arrange # Arrange
lastfm_user = self.network.get_user(self.username) lastfm_user = self.network.get_user(self.username)
@ -637,7 +606,6 @@ class TestPyLast(unittest.TestCase):
# Act/Assert # Act/Assert
self.helper_past_events_have_valid_ids(lastfm_user) self.helper_past_events_have_valid_ids(lastfm_user)
def test_user_recommended_events_returns_valid_ids(self): def test_user_recommended_events_returns_valid_ids(self):
# Arrange # Arrange
lastfm_user = self.network.get_user(self.username) lastfm_user = self.network.get_user(self.username)
@ -648,7 +616,6 @@ class TestPyLast(unittest.TestCase):
# Assert # Assert
self.helper_assert_events_have_valid_ids(events) self.helper_assert_events_have_valid_ids(events)
def test_user_upcoming_events_returns_valid_ids(self): def test_user_upcoming_events_returns_valid_ids(self):
# Arrange # Arrange
lastfm_user = self.network.get_user(self.username) lastfm_user = self.network.get_user(self.username)
@ -656,7 +623,6 @@ class TestPyLast(unittest.TestCase):
# Act/Assert # Act/Assert
self.helper_upcoming_events_have_valid_ids(lastfm_user) self.helper_upcoming_events_have_valid_ids(lastfm_user)
def test_venue_past_events_returns_valid_ids(self): def test_venue_past_events_returns_valid_ids(self):
# Arrange # Arrange
venue_id = "8778225" # Last.fm office venue_id = "8778225" # Last.fm office
@ -665,7 +631,6 @@ class TestPyLast(unittest.TestCase):
# Act/Assert # Act/Assert
self.helper_past_events_have_valid_ids(venue) self.helper_past_events_have_valid_ids(venue)
def test_venue_upcoming_events_returns_valid_ids(self): def test_venue_upcoming_events_returns_valid_ids(self):
# Arrange # Arrange
venue_id = "8778225" # Last.fm office venue_id = "8778225" # Last.fm office
@ -674,7 +639,6 @@ class TestPyLast(unittest.TestCase):
# Act/Assert # Act/Assert
self.helper_upcoming_events_have_valid_ids(venue) self.helper_upcoming_events_have_valid_ids(venue)
def test_pickle(self): def test_pickle(self):
# Arrange # Arrange
import pickle import pickle
@ -689,31 +653,28 @@ class TestPyLast(unittest.TestCase):
# Assert # Assert
self.assertEqual(lastfm_user, loaded_user) self.assertEqual(lastfm_user, loaded_user)
def test_bio_content(self): def test_bio_content(self):
# Arrange # Arrange
artist = pylast.Artist("Test Artist", self.network) artist = pylast.Artist("Test Artist", self.network)
# Act # Act
bio = artist.get_bio_content(language = "en") bio = artist.get_bio_content(language="en")
# Assert # Assert
self.assertIsNotNone(bio) self.assertIsNotNone(bio)
self.assertGreaterEqual(len(bio), 1) self.assertGreaterEqual(len(bio), 1)
def test_bio_summary(self): def test_bio_summary(self):
# Arrange # Arrange
artist = pylast.Artist("Test Artist", self.network) artist = pylast.Artist("Test Artist", self.network)
# Act # Act
bio = artist.get_bio_summary(language = "en") bio = artist.get_bio_summary(language="en")
# Assert # Assert
self.assertIsNotNone(bio) self.assertIsNotNone(bio)
self.assertGreaterEqual(len(bio), 1) self.assertGreaterEqual(len(bio), 1)
def test_album_wiki_content(self): def test_album_wiki_content(self):
# Arrange # Arrange
album = pylast.Album("Test Artist", "Test Album", self.network) album = pylast.Album("Test Artist", "Test Album", self.network)
@ -725,7 +686,6 @@ class TestPyLast(unittest.TestCase):
self.assertIsNotNone(wiki) self.assertIsNotNone(wiki)
self.assertGreaterEqual(len(wiki), 1) self.assertGreaterEqual(len(wiki), 1)
def test_album_wiki_summary(self): def test_album_wiki_summary(self):
# Arrange # Arrange
album = pylast.Album("Test Artist", "Test Album", self.network) album = pylast.Album("Test Artist", "Test Album", self.network)
@ -737,7 +697,6 @@ class TestPyLast(unittest.TestCase):
self.assertIsNotNone(wiki) self.assertIsNotNone(wiki)
self.assertGreaterEqual(len(wiki), 1) self.assertGreaterEqual(len(wiki), 1)
def test_track_wiki_content(self): def test_track_wiki_content(self):
# Arrange # Arrange
track = pylast.Track("Test Artist", "Test Title", self.network) track = pylast.Track("Test Artist", "Test Title", self.network)
@ -749,7 +708,6 @@ class TestPyLast(unittest.TestCase):
self.assertIsNotNone(wiki) self.assertIsNotNone(wiki)
self.assertGreaterEqual(len(wiki), 1) self.assertGreaterEqual(len(wiki), 1)
def test_track_wiki_summary(self): def test_track_wiki_summary(self):
# Arrange # Arrange
track = pylast.Track("Test Artist", "Test Title", self.network) track = pylast.Track("Test Artist", "Test Title", self.network)
@ -761,7 +719,6 @@ class TestPyLast(unittest.TestCase):
self.assertIsNotNone(wiki) self.assertIsNotNone(wiki)
self.assertGreaterEqual(len(wiki), 1) self.assertGreaterEqual(len(wiki), 1)
def test_lastfm_network_name(self): def test_lastfm_network_name(self):
# Act # Act
name = str(self.network) name = str(self.network)
@ -769,7 +726,6 @@ class TestPyLast(unittest.TestCase):
# Assert # Assert
self.assertEqual(name, "Last.fm Network") self.assertEqual(name, "Last.fm Network")
def test_artist_get_images_deprecated(self): def test_artist_get_images_deprecated(self):
# Arrange # Arrange
artist = self.network.get_artist("Test Artist") artist = self.network.get_artist("Test Artist")
@ -778,7 +734,6 @@ class TestPyLast(unittest.TestCase):
with self.assertRaisesRegexp(pylast.WSError, 'deprecated'): with self.assertRaisesRegexp(pylast.WSError, 'deprecated'):
artist.get_images() artist.get_images()
def helper_validate_results(self, a, b, c): def helper_validate_results(self, a, b, c):
# Assert # Assert
self.assertIsNotNone(a) self.assertIsNotNone(a)
@ -790,21 +745,19 @@ class TestPyLast(unittest.TestCase):
self.assertEqual(a, b) self.assertEqual(a, b)
self.assertEqual(b, c) self.assertEqual(b, c)
def helper_validate_cacheable(self, thing, function_name): def helper_validate_cacheable(self, thing, function_name):
# Arrange # Arrange
# get thing.function_name() # get thing.function_name()
func = getattr(thing, function_name, None) func = getattr(thing, function_name, None)
# Act # Act
result1 = func(limit = 1, cacheable = False) result1 = func(limit=1, cacheable=False)
result2 = func(limit = 1, cacheable = True) result2 = func(limit=1, cacheable=True)
result3 = func(limit = 1) result3 = func(limit=1)
# Assert # Assert
self.helper_validate_results(result1, result2, result3) self.helper_validate_results(result1, result2, result3)
def test_cacheable_artist_get_shouts(self): def test_cacheable_artist_get_shouts(self):
# Arrange # Arrange
artist = self.network.get_artist("Test Artist") artist = self.network.get_artist("Test Artist")
@ -812,16 +765,14 @@ class TestPyLast(unittest.TestCase):
# Act/Assert # Act/Assert
self.helper_validate_cacheable(artist, "get_shouts") self.helper_validate_cacheable(artist, "get_shouts")
def test_cacheable_event_get_shouts(self): def test_cacheable_event_get_shouts(self):
# Arrange # Arrange
user = self.network.get_user("RJ") user = self.network.get_user("RJ")
event = user.get_past_events(limit = 1)[0] event = user.get_past_events(limit=1)[0]
# Act/Assert # Act/Assert
self.helper_validate_cacheable(event, "get_shouts") self.helper_validate_cacheable(event, "get_shouts")
def test_cacheable_track_get_shouts(self): def test_cacheable_track_get_shouts(self):
# Arrange # Arrange
track = self.network.get_top_tracks()[0].item track = self.network.get_top_tracks()[0].item
@ -829,7 +780,6 @@ class TestPyLast(unittest.TestCase):
# Act/Assert # Act/Assert
self.helper_validate_cacheable(track, "get_shouts") self.helper_validate_cacheable(track, "get_shouts")
def test_cacheable_group_get_members(self): def test_cacheable_group_get_members(self):
# Arrange # Arrange
group = self.network.get_group("Audioscrobbler Beta") group = self.network.get_group("Audioscrobbler Beta")
@ -837,7 +787,6 @@ class TestPyLast(unittest.TestCase):
# Act/Assert # Act/Assert
self.helper_validate_cacheable(group, "get_members") self.helper_validate_cacheable(group, "get_members")
def test_cacheable_library(self): def test_cacheable_library(self):
# Arrange # Arrange
library = pylast.Library(self.username, self.network) library = pylast.Library(self.username, self.network)
@ -847,20 +796,18 @@ class TestPyLast(unittest.TestCase):
self.helper_validate_cacheable(library, "get_artists") self.helper_validate_cacheable(library, "get_artists")
self.helper_validate_cacheable(library, "get_tracks") self.helper_validate_cacheable(library, "get_tracks")
def test_cacheable_user_artist_tracks(self): def test_cacheable_user_artist_tracks(self):
# Arrange # Arrange
lastfm_user = self.network.get_authenticated_user() lastfm_user = self.network.get_authenticated_user()
# Act # Act
result1 = lastfm_user.get_artist_tracks(artist = "Test Artist", cacheable = False) result1 = lastfm_user.get_artist_tracks("Test Artist", cacheable=False)
result2 = lastfm_user.get_artist_tracks(artist = "Test Artist", cacheable = True) result2 = lastfm_user.get_artist_tracks("Test Artist", cacheable=True)
result3 = lastfm_user.get_artist_tracks(artist = "Test Artist") result3 = lastfm_user.get_artist_tracks("Test Artist")
# Assert # Assert
self.helper_validate_results(result1, result2, result3) self.helper_validate_results(result1, result2, result3)
def test_cacheable_user(self): def test_cacheable_user(self):
# Arrange # Arrange
lastfm_user = self.network.get_authenticated_user() lastfm_user = self.network.get_authenticated_user()
@ -874,11 +821,11 @@ class TestPyLast(unittest.TestCase):
self.helper_validate_cacheable(lastfm_user, "get_recommended_events") self.helper_validate_cacheable(lastfm_user, "get_recommended_events")
self.helper_validate_cacheable(lastfm_user, "get_shouts") self.helper_validate_cacheable(lastfm_user, "get_shouts")
def test_geo_get_events_in_location(self): def test_geo_get_events_in_location(self):
# Arrange # Arrange
# Act # Act
events = self.network.get_geo_events(location = "London", tag = "blues", limit = 1) events = self.network.get_geo_events(
location="London", tag="blues", limit=1)
# Assert # Assert
self.assertEqual(len(events), 1) self.assertEqual(len(events), 1)
@ -886,11 +833,11 @@ class TestPyLast(unittest.TestCase):
self.assertEqual(type(event), pylast.Event) self.assertEqual(type(event), pylast.Event)
self.assertEqual(event.get_venue().location['city'], "London") self.assertEqual(event.get_venue().location['city'], "London")
def test_geo_get_events_in_latlong(self): def test_geo_get_events_in_latlong(self):
# Arrange # Arrange
# Act # Act
events = self.network.get_geo_events(lat = 40.67, long = -73.94, distance = 5, limit = 1) events = self.network.get_geo_events(
lat=40.67, long=-73.94, distance=5, limit=1)
# Assert # Assert
self.assertEqual(len(events), 1) self.assertEqual(len(events), 1)
@ -898,11 +845,11 @@ class TestPyLast(unittest.TestCase):
self.assertEqual(type(event), pylast.Event) self.assertEqual(type(event), pylast.Event)
self.assertEqual(event.get_venue().location['city'], "New York") self.assertEqual(event.get_venue().location['city'], "New York")
def test_geo_get_events_festival(self): def test_geo_get_events_festival(self):
# Arrange # Arrange
# Act # Act
events = self.network.get_geo_events(location = "Reading", festivalsonly = True, limit = 1) events = self.network.get_geo_events(
location="Reading", festivalsonly=True, limit=1)
# Assert # Assert
self.assertEqual(len(events), 1) self.assertEqual(len(events), 1)
@ -910,7 +857,6 @@ class TestPyLast(unittest.TestCase):
self.assertEqual(type(event), pylast.Event) self.assertEqual(type(event), pylast.Event)
self.assertEqual(event.get_venue().location['city'], "Reading") self.assertEqual(event.get_venue().location['city'], "Reading")
def test_get_metro_weekly_chart_dates(self): def test_get_metro_weekly_chart_dates(self):
# Arrange # Arrange
# Act # Act
@ -922,8 +868,7 @@ class TestPyLast(unittest.TestCase):
(start, end) = dates[0] (start, end) = dates[0]
self.assertLess(start, end) self.assertLess(start, end)
def helper_geo_chart(self, function_name, expected_type=pylast.Artist):
def helper_geo_chart(self, function_name, expected_type = pylast.Artist):
# Arrange # Arrange
metro = self.network.get_metro("Madrid", "Spain") metro = self.network.get_metro("Madrid", "Spain")
dates = self.network.get_metro_weekly_chart_dates() dates = self.network.get_metro_weekly_chart_dates()
@ -933,77 +878,71 @@ class TestPyLast(unittest.TestCase):
func = getattr(metro, function_name, None) func = getattr(metro, function_name, None)
# Act # Act
chart = func(from_date = from_date, to_date = to_date, limit = 1) chart = func(from_date=from_date, to_date=to_date, limit=1)
# Assert # Assert
self.assertEqual(len(chart), 1) self.assertEqual(len(chart), 1)
self.assertEqual(type(chart[0]), pylast.TopItem) self.assertEqual(type(chart[0]), pylast.TopItem)
self.assertEqual(type(chart[0].item), expected_type) self.assertEqual(type(chart[0].item), expected_type)
def test_get_metro_artist_chart(self): def test_get_metro_artist_chart(self):
# Arrange/Act/Assert # Arrange/Act/Assert
self.helper_geo_chart("get_artist_chart") self.helper_geo_chart("get_artist_chart")
def test_get_metro_hype_artist_chart(self): def test_get_metro_hype_artist_chart(self):
# Arrange/Act/Assert # Arrange/Act/Assert
self.helper_geo_chart("get_hype_artist_chart") self.helper_geo_chart("get_hype_artist_chart")
def test_get_metro_unique_artist_chart(self): def test_get_metro_unique_artist_chart(self):
# Arrange/Act/Assert # Arrange/Act/Assert
self.helper_geo_chart("get_unique_artist_chart") self.helper_geo_chart("get_unique_artist_chart")
def test_get_metro_track_chart(self): def test_get_metro_track_chart(self):
# Arrange/Act/Assert # Arrange/Act/Assert
self.helper_geo_chart("get_track_chart", expected_type = pylast.Track) self.helper_geo_chart("get_track_chart", expected_type=pylast.Track)
def test_get_metro_hype_track_chart(self): def test_get_metro_hype_track_chart(self):
# Arrange/Act/Assert # Arrange/Act/Assert
self.helper_geo_chart("get_hype_track_chart", expected_type = pylast.Track) self.helper_geo_chart(
"get_hype_track_chart", expected_type=pylast.Track)
def test_get_metro_unique_track_chart(self): def test_get_metro_unique_track_chart(self):
# Arrange/Act/Assert # Arrange/Act/Assert
self.helper_geo_chart("get_unique_track_chart", expected_type = pylast.Track) self.helper_geo_chart(
"get_unique_track_chart", expected_type=pylast.Track)
def test_geo_get_metros(self): def test_geo_get_metros(self):
# Arrange # Arrange
# Act # Act
metros = self.network.get_metros(country = "Poland") metros = self.network.get_metros(country="Poland")
# Assert # Assert
self.assertGreaterEqual(len(metros), 1) self.assertGreaterEqual(len(metros), 1)
self.assertEqual(type(metros[0]), pylast.Metro) self.assertEqual(type(metros[0]), pylast.Metro)
self.assertEqual(metros[0].get_country(), "Poland") self.assertEqual(metros[0].get_country(), "Poland")
def test_geo_get_top_artists(self): def test_geo_get_top_artists(self):
# Arrange # Arrange
# Act # Act
artists = self.network.get_geo_top_artists(country = "United Kingdom", limit = 1) artists = self.network.get_geo_top_artists(
country="United Kingdom", limit=1)
# Assert # Assert
self.assertEqual(len(artists), 1) self.assertEqual(len(artists), 1)
self.assertEqual(type(artists[0]), pylast.TopItem) self.assertEqual(type(artists[0]), pylast.TopItem)
self.assertEqual(type(artists[0].item), pylast.Artist) self.assertEqual(type(artists[0].item), pylast.Artist)
def test_geo_get_top_tracks(self): def test_geo_get_top_tracks(self):
# Arrange # Arrange
# Act # Act
tracks = self.network.get_geo_top_tracks(country = "United Kingdom", location = "Manchester", limit = 1) tracks = self.network.get_geo_top_tracks(
country="United Kingdom", location="Manchester", limit=1)
# Assert # Assert
self.assertEqual(len(tracks), 1) self.assertEqual(len(tracks), 1)
self.assertEqual(type(tracks[0]), pylast.TopItem) self.assertEqual(type(tracks[0]), pylast.TopItem)
self.assertEqual(type(tracks[0].item), pylast.Track) self.assertEqual(type(tracks[0].item), pylast.Track)
def test_metro_class(self): def test_metro_class(self):
# Arrange # Arrange
# Act # Act
@ -1014,13 +953,14 @@ class TestPyLast(unittest.TestCase):
self.assertEqual(metro.get_country(), "Norway") self.assertEqual(metro.get_country(), "Norway")
self.assertEqual(str(metro), "Bergen, Norway") self.assertEqual(str(metro), "Bergen, Norway")
self.assertEqual(metro, pylast.Metro("Bergen", "Norway", self.network)) self.assertEqual(metro, pylast.Metro("Bergen", "Norway", self.network))
self.assertNotEqual(metro, pylast.Metro("Wellington", "New Zealand", self.network)) self.assertNotEqual(
metro,
pylast.Metro("Wellington", "New Zealand", self.network))
def test_get_album_play_links(self): def test_get_album_play_links(self):
# Arrange # Arrange
album1 = self.network.get_album(artist = "Portishead", title = "Dummy") album1 = self.network.get_album("Portishead", "Dummy")
album2 = self.network.get_album(artist = "Radiohead", title = "OK Computer") album2 = self.network.get_album("Radiohead", "OK Computer")
albums = [album1, album2] albums = [album1, album2]
# Act # Act
@ -1032,7 +972,6 @@ class TestPyLast(unittest.TestCase):
self.assertIn("spotify:album:", links[0]) self.assertIn("spotify:album:", links[0])
self.assertIn("spotify:album:", links[1]) self.assertIn("spotify:album:", links[1])
def test_get_artist_play_links(self): def test_get_artist_play_links(self):
# Arrange # Arrange
artists = ["Portishead", "Radiohead"] artists = ["Portishead", "Radiohead"]
@ -1045,11 +984,10 @@ class TestPyLast(unittest.TestCase):
self.assertIn("spotify:artist:", links[0]) self.assertIn("spotify:artist:", links[0])
self.assertIn("spotify:artist:", links[1]) self.assertIn("spotify:artist:", links[1])
def test_get_track_play_links(self): def test_get_track_play_links(self):
# Arrange # Arrange
track1 = self.network.get_track(artist = "Portishead", title = "Mysterons") track1 = self.network.get_track(artist="Portishead", title="Mysterons")
track2 = self.network.get_track(artist = "Radiohead", title = "Creep") track2 = self.network.get_track(artist="Radiohead", title="Creep")
tracks = [track1, track2] tracks = [track1, track2]
# Act # Act
@ -1061,7 +999,6 @@ class TestPyLast(unittest.TestCase):
self.assertIn("spotify:track:", links[0]) self.assertIn("spotify:track:", links[0])
self.assertIn("spotify:track:", links[1]) self.assertIn("spotify:track:", links[1])
def helper_only_one_thing_in_top_list(self, things, expected_type): def helper_only_one_thing_in_top_list(self, things, expected_type):
# Assert # Assert
self.assertEqual(len(things), 1) self.assertEqual(len(things), 1)
@ -1074,34 +1011,31 @@ class TestPyLast(unittest.TestCase):
user = self.network.get_user("RJ") user = self.network.get_user("RJ")
# Act # Act
tags = user.get_top_tags(limit = 1) tags = user.get_top_tags(limit=1)
# Assert # Assert
self.helper_only_one_thing_in_top_list(tags, pylast.Tag) self.helper_only_one_thing_in_top_list(tags, pylast.Tag)
def test_network_get_top_artists_with_limit(self): def test_network_get_top_artists_with_limit(self):
# Arrange # Arrange
# Act # Act
artists = self.network.get_top_artists(limit = 1) artists = self.network.get_top_artists(limit=1)
# Assert # Assert
self.helper_only_one_thing_in_top_list(artists, pylast.Artist) self.helper_only_one_thing_in_top_list(artists, pylast.Artist)
def test_network_get_top_tags_with_limit(self): def test_network_get_top_tags_with_limit(self):
# Arrange # Arrange
# Act # Act
tags = self.network.get_top_tags(limit = 1) tags = self.network.get_top_tags(limit=1)
# Assert # Assert
self.helper_only_one_thing_in_top_list(tags, pylast.Tag) self.helper_only_one_thing_in_top_list(tags, pylast.Tag)
def test_network_get_top_tracks_with_limit(self): def test_network_get_top_tracks_with_limit(self):
# Arrange # Arrange
# Act # Act
tracks = self.network.get_top_tracks(limit = 1) tracks = self.network.get_top_tracks(limit=1)
# Assert # Assert
self.helper_only_one_thing_in_top_list(tracks, pylast.Track) self.helper_only_one_thing_in_top_list(tracks, pylast.Track)