Skip to content

Commit f59abfe

Browse files
joshthecoderjoshthecoder
committed
Merge Twitter v1.1 support.
2 parents 4e72a02 + ce36f96 commit f59abfe

File tree

4 files changed

+148
-257
lines changed

4 files changed

+148
-257
lines changed

‎tests.py

Lines changed: 48 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
from time import sleep
44
import os
55

6-
from tweepy import (API, BasicAuthHandler, OAuthHandler, Friendship, Cursor,
6+
from nose import SkipTest
7+
8+
from tweepy import (API, OAuthHandler, Friendship, Cursor,
79
MemoryCache, FileCache)
810

911
"""Configurations"""
@@ -43,31 +45,19 @@ def setUp(self):
4345
def testhometimeline(self):
4446
self.api.home_timeline()
4547

46-
def testfriendstimeline(self):
47-
self.api.friends_timeline()
48-
4948
def testusertimeline(self):
5049
self.api.user_timeline()
5150
self.api.user_timeline('twitter')
5251

53-
def testmentions(self):
54-
self.api.mentions()
55-
56-
def testretweetedbyme(self):
57-
self.api.retweeted_by_me()
58-
59-
def testretweetedbyuser(self):
60-
self.api.retweeted_by_user('twitter')
61-
62-
def testretweetedtome(self):
63-
self.api.retweeted_to_me()
52+
def testmentionstimeline(self):
53+
self.api.mentions_timeline()
6454

6555
def testretweetsofme(self):
6656
self.api.retweets_of_me()
6757

6858
def testretweet(self):
69-
s = self.api.retweet(test_tweet_id)
70-
s.destroy()
59+
# TODO(josh): Need a way to get random tweets to retweet.
60+
raise SkipTest()
7161

7262
def testretweets(self):
7363
self.api.retweets(test_tweet_id)
@@ -112,12 +102,6 @@ def testme(self):
112102
me = self.api.me()
113103
self.assertEqual(me.screen_name, username)
114104

115-
def testfriends(self):
116-
self.api.friends()
117-
118-
def testfollowers(self):
119-
self.api.followers()
120-
121105
def testdirectmessages(self):
122106
self.api.direct_messages()
123107

@@ -193,11 +177,11 @@ def testupdateprofilecolors(self):
193177
original.profile_sidebar_border_color
194178
)
195179

196-
self.assertEqual(updated.profile_background_color, '000')
197-
self.assertEqual(updated.profile_text_color, '000')
198-
self.assertEqual(updated.profile_link_color, '000')
199-
self.assertEqual(updated.profile_sidebar_fill_color, '000')
200-
self.assertEqual(updated.profile_sidebar_border_color, '000')
180+
self.assertEqual(updated.profile_background_color, '000000')
181+
self.assertEqual(updated.profile_text_color, '000000')
182+
self.assertEqual(updated.profile_link_color, '000000')
183+
self.assertEqual(updated.profile_sidebar_fill_color, '000000')
184+
self.assertEqual(updated.profile_sidebar_border_color, '000000')
201185

202186
"""
203187
def testupateprofileimage(self):
@@ -232,15 +216,9 @@ def testcreatedestroyfavorite(self):
232216
self.api.create_favorite(4901062372)
233217
self.api.destroy_favorite(4901062372)
234218

235-
def testenabledisablenotifications(self):
236-
self.api.enable_notifications('twitter')
237-
self.api.disable_notifications('twitter')
238-
239219
def testcreatedestroyblock(self):
240220
self.api.create_block('twitter')
241-
self.assertEqual(self.api.exists_block('twitter'), True)
242221
self.api.destroy_block('twitter')
243-
self.assertEqual(self.api.exists_block('twitter'), False)
244222
self.api.create_friendship('twitter') # restore
245223

246224
def testblocks(self):
@@ -250,13 +228,17 @@ def testblocksids(self):
250228
self.api.blocks_ids()
251229

252230
def testcreateupdatedestroylist(self):
253-
self.api.create_list('tweeps')
254-
# XXX: right now twitter throws a 500 here, issue is being looked into by twitter.
255-
#self.api.update_list('tweeps', mode='private')
256-
self.api.destroy_list('tweeps')
231+
params = {
232+
'owner_screen_name': username,
233+
'slug': 'tweeps'
234+
}
235+
l = self.api.create_list(name=params['slug'], **params)
236+
l = self.api.update_list(list_id=l.id, description='updated!')
237+
self.assertEqual(l.description, 'updated!')
238+
self.api.destroy_list(list_id=l.id)
257239

258-
def testlists(self):
259-
self.api.lists()
240+
def testlistsall(self):
241+
self.api.lists_all()
260242

261243
def testlistsmemberships(self):
262244
self.api.lists_memberships()
@@ -268,30 +250,40 @@ def testlisttimeline(self):
268250
self.api.list_timeline('applepie', 'stars')
269251

270252
def testgetlist(self):
271-
self.api.get_list('applepie', 'stars')
253+
self.api.get_list(owner_screen_name='applepie', slug='stars')
272254

273255
def testaddremovelistmember(self):
274-
uid = self.api.get_user('twitter').id
275-
self.api.add_list_member('test', uid)
276-
self.api.remove_list_member('test', uid)
256+
params = {
257+
'slug': 'test',
258+
'owner_screen_name': username,
259+
'screen_name': 'twitter'
260+
}
261+
262+
def assert_list(l):
263+
self.assertEqual(l.name, params['slug'])
264+
265+
assert_list(self.api.add_list_member(**params))
266+
assert_list(self.api.remove_list_member(**params))
277267

278268
def testlistmembers(self):
279269
self.api.list_members('applepie', 'stars')
280270

281-
def testislistmember(self):
282-
uid = self.api.get_user('applepie').id
283-
self.api.is_list_member('applepie', 'stars', uid)
271+
def testshowlistmember(self):
272+
self.assertTrue(self.api.show_list_member(owner_screen_name='applepie', slug='stars', screen_name='NathanFillion'))
284273

285274
def testsubscribeunsubscribelist(self):
286-
self.api.subscribe_list('applepie', 'stars')
287-
self.api.unsubscribe_list('applepie', 'stars')
275+
params = {
276+
'owner_screen_name': 'applepie',
277+
'slug': 'stars'
278+
}
279+
self.api.subscribe_list(**params)
280+
self.api.unsubscribe_list(**params)
288281

289282
def testlistsubscribers(self):
290283
self.api.list_subscribers('applepie', 'stars')
291284

292-
def testissubscribedlist(self):
293-
uid = self.api.get_user('applepie').id
294-
self.api.is_subscribed_list('applepie', 'stars', uid)
285+
def testshowlistsubscriber(self):
286+
self.assertTrue(self.api.show_list_subscriber('applepie', 'stars', username))
295287

296288
def testsavedsearches(self):
297289
s = self.api.create_saved_search('test')
@@ -302,10 +294,6 @@ def testsavedsearches(self):
302294
def testsearch(self):
303295
self.api.search('tweepy')
304296

305-
def testtrends(self):
306-
self.api.trends_daily()
307-
self.api.trends_weekly()
308-
309297
def testgeoapis(self):
310298
def place_name_in_list(place_name, place_list):
311299
"""Return True if a given place_name is in place_list."""
@@ -316,8 +304,6 @@ def place_name_in_list(place_name, place_list):
316304
self.assertEqual(twitter_hq[0].id, '3bdf30ed8b201f31')
317305
# Test various API functions using Austin, TX, USA
318306
self.assertEqual(self.api.geo_id(id='c3f37afa9efcf94b').full_name, 'Austin, TX')
319-
self.assertTrue(place_name_in_list('Austin, TX',
320-
self.api.nearby_places(lat=30.267370168467806, long= -97.74261474609375))) # Austin, TX, USA
321307
self.assertTrue(place_name_in_list('Austin, TX',
322308
self.api.reverse_geocode(lat=30.267370168467806, long= -97.74261474609375))) # Austin, TX, USA
323309

@@ -345,17 +331,17 @@ def testpagecursorpages(self):
345331
self.assert_(len(pages) == 5)
346332

347333
def testcursorcursoritems(self):
348-
items = list(Cursor(self.api.friends).items())
334+
items = list(Cursor(self.api.friends_ids).items())
349335
self.assert_(len(items) > 0)
350336

351-
items = list(Cursor(self.api.followers, 'twitter').items(30))
337+
items = list(Cursor(self.api.followers_ids, 'twitter').items(30))
352338
self.assert_(len(items) == 30)
353339

354340
def testcursorcursorpages(self):
355-
pages = list(Cursor(self.api.friends).pages())
341+
pages = list(Cursor(self.api.friends_ids).pages())
356342
self.assert_(len(pages) > 0)
357343

358-
pages = list(Cursor(self.api.followers, 'twitter').pages(5))
344+
pages = list(Cursor(self.api.followers_ids, 'twitter').pages(5))
359345
self.assert_(len(pages) == 5)
360346

361347
class TweepyAuthTests(unittest.TestCase):

0 commit comments

Comments
 (0)