From 20b856a05f509ad738d95107ba115107cf5fab7f Mon Sep 17 00:00:00 2001 From: Leandro Toledo Date: Sun, 12 Jul 2015 10:31:18 -0300 Subject: [PATCH] Update test to support UTF8 text messages --- tests/test_bot.py | 50 +++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/test_bot.py b/tests/test_bot.py index 5f3849aa1..ffbb89313 100644 --- a/tests/test_bot.py +++ b/tests/test_bot.py @@ -11,11 +11,11 @@ class BotTest(unittest.TestCase): def setUp(self): bot = telegram.Bot(token=os.environ.get('TOKEN')) self._bot = bot - print 'Testing the Bot API class' + print('Testing the Bot API class') def testGetMe(self): '''Test the telegram.Bot getMe method''' - print 'Testing getMe' + print('Testing getMe') user = self._bot.getMe() self.assertEqual(120405045, user.id) self.assertEqual('Toledo\'s Palace Bot', user.first_name) @@ -24,92 +24,92 @@ class BotTest(unittest.TestCase): def testSendMessage(self): '''Test the telegram.Bot sendMessage method''' - print 'Testing sendMessage' + print('Testing sendMessage') message = self._bot.sendMessage(chat_id=12173560, - text=u'Моё судно на воздушной подушке полно угрей'.encode('utf8')) - self.assertEqual(u'Моё судно на воздушной подушке полно угрей', message.text) + text='Моё судно на воздушной подушке полно угрей') + self.assertEqual('Моё судно на воздушной подушке полно угрей', message.text) def testGetUpdates(self): '''Test the telegram.Bot getUpdates method''' - print 'Testing getUpdates' + print('Testing getUpdates') updates = self._bot.getUpdates() - self.assertEqual(129566590, updates[0].update_id) + self.assertEqual(129566611, updates[0].update_id) def testForwardMessage(self): '''Test the telegram.Bot forwardMessage method''' - print 'Testing forwardMessage' + print('Testing forwardMessage') message = self._bot.forwardMessage(chat_id=12173560, from_chat_id=12173560, message_id=138) - self.assertEqual(u'Oi', message.text) - self.assertEqual(u'leandrotoledo', message.forward_from.username) + self.assertEqual('Oi', message.text) + self.assertEqual('leandrotoledo', message.forward_from.username) def testSendPhoto(self): '''Test the telegram.Bot sendPhoto method''' - print 'Testing sendPhoto - File' + print('Testing sendPhoto - File') message = self._bot.sendPhoto(photo=open('tests/telegram.png', 'rb'), chat_id=12173560) self.assertEqual(1451, message.photo[0].file_size) def testResendPhoto(self): '''Test the telegram.Bot sendPhoto method''' - print 'Testing sendPhoto - Resend' + print('Testing sendPhoto - Resend') message = self._bot.sendPhoto(photo=str('AgADAQADr6cxGzU8LQe6q0dMJD2rHYkP2ykABFymiQqJgjxRGGMAAgI'), chat_id=12173560) - self.assertEqual(u'AgADAQADr6cxGzU8LQe6q0dMJD2rHYkP2ykABFymiQqJgjxRGGMAAgI', message.photo[0].file_id) + self.assertEqual('AgADAQADr6cxGzU8LQe6q0dMJD2rHYkP2ykABFymiQqJgjxRGGMAAgI', message.photo[0].file_id) def testSendAudio(self): '''Test the telegram.Bot sendAudio method''' - print 'Testing sendAudio - File' + print('Testing sendAudio - File') message = self._bot.sendAudio(audio=open('tests/telegram.ogg', 'rb'), chat_id=12173560) self.assertEqual(9199, message.audio.file_size) def testResendAudio(self): '''Test the telegram.Bot sendAudio method''' - print 'Testing sendAudio - Resend' + print('Testing sendAudio - Resend') message = self._bot.sendAudio(audio=str('AwADAQADIQEAAvjAuQABSAXg_GhkhZcC'), chat_id=12173560) - self.assertEqual(u'AwADAQADIQEAAvjAuQABSAXg_GhkhZcC', message.audio.file_id) + self.assertEqual('AwADAQADIQEAAvjAuQABSAXg_GhkhZcC', message.audio.file_id) def testSendDocument(self): '''Test the telegram.Bot sendDocument method''' - print 'Testing sendDocument - File' + print('Testing sendDocument - File') message = self._bot.sendDocument(document=open('tests/telegram.png', 'rb'), chat_id=12173560) self.assertEqual(12948, message.document.file_size) def testResendDocument(self): '''Test the telegram.Bot sendDocument method''' - print 'Testing sendDocument - Resend' + print('Testing sendDocument - Resend') message = self._bot.sendDocument(document=str('BQADAQADHAADNTwtBxZxUGKyxYbYAg'), chat_id=12173560) - self.assertEqual(u'BQADAQADHAADNTwtBxZxUGKyxYbYAg', message.document.file_id) + self.assertEqual('BQADAQADHAADNTwtBxZxUGKyxYbYAg', message.document.file_id) def testResendSticker(self): '''Test the telegram.Bot sendSticker method''' - print 'Testing sendSticker - Resend' + print('Testing sendSticker - Resend') message = self._bot.sendSticker(sticker=str('BQADAQADHAADyIsGAAFZfq1bphjqlgI'), chat_id=12173560) self.assertEqual(39518, message.sticker.file_size) def testSendVideo(self): '''Test the telegram.Bot sendVideo method''' - print 'Testing sendVideo - File' + print('Testing sendVideo - File') message = self._bot.sendVideo(video=open('tests/telegram.mp4', 'rb'), chat_id=12173560) self.assertEqual(326534, message.video.file_size) def testResendVideo(self): '''Test the telegram.Bot sendVideo method''' - print 'Testing sendVideo - Resend' + print('Testing sendVideo - Resend') message = self._bot.sendVideo(video=str('BAADAQADIgEAAvjAuQABOuTB937fPTgC'), chat_id=12173560) self.assertEqual(4, message.video.duration) def testSendLocation(self): '''Test the telegram.Bot sendLocation method''' - print 'Testing sendLocation' + print('Testing sendLocation') message = self._bot.sendLocation(latitude=-23.558873, longitude=-46.659732, chat_id=12173560) @@ -118,12 +118,12 @@ class BotTest(unittest.TestCase): def testSendChatAction(self): '''Test the telegram.Bot sendChatAction method''' - print 'Testing sendChatAction - ChatAction.TYPING' + print('Testing sendChatAction - ChatAction.TYPING') self._bot.sendChatAction(action=telegram.ChatAction.TYPING, chat_id=12173560) def testGetUserProfilePhotos(self): '''Test the telegram.Bot getUserProfilePhotos method''' - print 'Testing getUserProfilePhotos' + print('Testing getUserProfilePhotos') upf = self._bot.getUserProfilePhotos(user_id=12173560) self.assertEqual(8314, upf.photos[0][0].file_size)