X Tutup
Skip to content

Commit f267646

Browse files
jh0kerjh0ker
committed
✅ Fix tests
 python-telegram-bot#494
1 parent 6b7144b commit f267646

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

‎tests/test_audio.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ def test_send_audio_required_args_only(self):
6464
audio = message.audio
6565

6666
self.assertTrue(isinstance(audio.file_id, str))
67-
self.assertNotEqual(audio.file_id, '')
67+
self.assertNotEqual(audio.file_id, None)
6868
# self.assertEqual(audio.duration, 4)
69-
self.assertEqual(audio.performer, '')
70-
self.assertEqual(audio.title, '')
69+
self.assertEqual(audio.performer, None)
70+
self.assertEqual(audio.title, None)
7171
self.assertEqual(audio.mime_type, self.mime_type)
7272
self.assertEqual(audio.file_size, self.file_size)
7373

@@ -89,7 +89,7 @@ def test_send_audio_all_args(self):
8989
audio = message.audio
9090

9191
self.assertTrue(isinstance(audio.file_id, str))
92-
self.assertNotEqual(audio.file_id, '')
92+
self.assertNotEqual(audio.file_id, None)
9393
self.assertEqual(audio.duration, self.duration)
9494
self.assertEqual(audio.performer, self.performer)
9595
self.assertEqual(audio.title, self.title)
@@ -112,7 +112,7 @@ def test_send_audio_mp3_file(self):
112112
audio = message.audio
113113

114114
self.assertTrue(isinstance(audio.file_id, str))
115-
self.assertNotEqual(audio.file_id, '')
115+
self.assertNotEqual(audio.file_id, None)
116116
self.assertEqual(audio.duration, self.duration)
117117
self.assertEqual(audio.performer, self.performer)
118118
self.assertEqual(audio.title, self.title)
@@ -136,7 +136,7 @@ def test_send_audio_mp3_file_custom_filename(self):
136136
audio = message.audio
137137

138138
self.assertTrue(isinstance(audio.file_id, str))
139-
self.assertNotEqual(audio.file_id, '')
139+
self.assertNotEqual(audio.file_id, None)
140140
self.assertEqual(audio.duration, self.duration)
141141
self.assertEqual(audio.performer, self.performer)
142142
self.assertEqual(audio.title, self.title)
@@ -152,7 +152,7 @@ def test_send_audio_mp3_url_file(self):
152152
audio = message.audio
153153

154154
self.assertTrue(isinstance(audio.file_id, str))
155-
self.assertNotEqual(audio.file_id, '')
155+
self.assertNotEqual(audio.file_id, None)
156156
self.assertEqual(audio.duration, self.duration)
157157
self.assertEqual(audio.mime_type, self.mime_type)
158158
self.assertEqual(audio.file_size, self.file_size)
@@ -171,7 +171,7 @@ def test_send_audio_mp3_url_file_with_caption(self):
171171
audio = message.audio
172172

173173
self.assertTrue(isinstance(audio.file_id, str))
174-
self.assertNotEqual(audio.file_id, '')
174+
self.assertNotEqual(audio.file_id, None)
175175
self.assertEqual(audio.duration, self.duration)
176176
self.assertEqual(audio.mime_type, self.mime_type)
177177
self.assertEqual(audio.file_size, self.file_size)
@@ -266,7 +266,7 @@ def test_reply_audio(self):
266266
message = self._bot.sendMessage(self._chat_id, '.')
267267
message = message.reply_audio(self.audio_file)
268268

269-
self.assertNotEqual(message.audio.file_id, '')
269+
self.assertNotEqual(message.audio.file_id, None)
270270

271271

272272
if __name__ == '__main__':

‎tests/test_bot.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ def _testUserEqualsBot(self, user):
422422
"""Tests if user is our trusty @PythonTelegramBot."""
423423
self.assertEqual(user.id, 133505823)
424424
self.assertEqual(user.first_name, 'PythonTelegramBot')
425-
self.assertEqual(user.last_name, '')
425+
self.assertEqual(user.last_name, None)
426426
self.assertEqual(user.username, 'PythonTelegramBot')
427427
self.assertEqual(user.name, '@PythonTelegramBot')
428428

@@ -432,7 +432,7 @@ def test_info(self):
432432
# tests the Bot.info decorator and associated funcs
433433
self.assertEqual(self._bot.id, 133505823)
434434
self.assertEqual(self._bot.first_name, 'PythonTelegramBot')
435-
self.assertEqual(self._bot.last_name, '')
435+
self.assertEqual(self._bot.last_name, None)
436436
self.assertEqual(self._bot.username, 'PythonTelegramBot')
437437
self.assertEqual(self._bot.name, '@PythonTelegramBot')
438438

‎tests/test_video.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ def test_send_video_required_args_only(self):
7676
video = message.video
7777

7878
self.assertTrue(isinstance(video.file_id, str))
79-
self.assertNotEqual(video.file_id, '')
79+
self.assertNotEqual(video.file_id, None)
8080
self.assertEqual(video.width, self.width)
8181
self.assertEqual(video.height, self.height)
8282
self.assertEqual(video.duration, self.duration)
8383
self.assertEqual(video.thumb, self.thumb)
84-
self.assertEqual(video.mime_type, '')
84+
self.assertEqual(video.mime_type, None)
8585
self.assertEqual(video.file_size, self.file_size)
8686

8787
@flaky(3, 1)
@@ -97,12 +97,12 @@ def test_send_video_all_args(self):
9797
video = message.video
9898

9999
self.assertTrue(isinstance(video.file_id, str))
100-
self.assertNotEqual(video.file_id, '')
100+
self.assertNotEqual(video.file_id, None)
101101
self.assertEqual(video.width, self.width)
102102
self.assertEqual(video.height, self.height)
103103
self.assertEqual(video.duration, self.duration)
104104
self.assertEqual(video.thumb, self.thumb)
105-
self.assertEqual(video.mime_type, '')
105+
self.assertEqual(video.mime_type, None)
106106
self.assertEqual(video.file_size, self.file_size)
107107

108108
self.assertEqual(message.caption, self.caption)
@@ -120,12 +120,12 @@ def test_send_video_mp4_file(self):
120120
video = message.video
121121

122122
self.assertTrue(isinstance(video.file_id, str))
123-
self.assertNotEqual(video.file_id, '')
123+
self.assertNotEqual(video.file_id, None)
124124
self.assertEqual(video.width, self.width)
125125
self.assertEqual(video.height, self.height)
126126
self.assertEqual(video.duration, self.duration)
127127
self.assertEqual(video.thumb, self.thumb)
128-
self.assertEqual(video.mime_type, '')
128+
self.assertEqual(video.mime_type, None)
129129
self.assertEqual(video.file_size, self.file_size)
130130

131131
self.assertEqual(message.caption, self.caption)
@@ -149,7 +149,7 @@ def test_send_video_mp4_file_with_custom_filename(self):
149149
self.assertEqual(video.height, self.height)
150150
self.assertEqual(video.duration, self.duration)
151151
self.assertEqual(video.thumb, self.thumb)
152-
self.assertEqual(video.mime_type, '')
152+
self.assertEqual(video.mime_type, None)
153153
self.assertEqual(video.file_size, self.file_size)
154154

155155
self.assertEqual(message.caption, self.caption)
@@ -167,11 +167,11 @@ def test_send_video_mp4_file_url(self):
167167
video = message.video
168168

169169
self.assertTrue(isinstance(video.file_id, str))
170-
self.assertNotEqual(video.file_id, '')
170+
self.assertNotEqual(video.file_id, None)
171171
self.assertEqual(video.height, self.height)
172172
self.assertEqual(video.duration, self.duration)
173173
self.assertEqual(video.thumb, self.thumb_from_url)
174-
self.assertEqual(video.mime_type, '')
174+
self.assertEqual(video.mime_type, None)
175175
self.assertEqual(video.file_size, self.file_size)
176176

177177
self.assertEqual(message.caption, self.caption)
@@ -191,7 +191,7 @@ def test_send_video_resend(self):
191191
self.assertEqual(video.file_id, self.video_file_id)
192192
self.assertEqual(video.duration, 0)
193193
self.assertEqual(video.thumb, None)
194-
self.assertEqual(video.mime_type, '')
194+
self.assertEqual(video.mime_type, None)
195195

196196
self.assertEqual(message.caption, self.caption)
197197

@@ -268,7 +268,7 @@ def test_reply_video(self):
268268
message = self._bot.sendMessage(self._chat_id, '.')
269269
message = message.reply_video(self.video_file)
270270

271-
self.assertNotEqual(message.video.file_id, '')
271+
self.assertNotEqual(message.video.file_id, None)
272272

273273

274274
if __name__ == '__main__':

0 commit comments

Comments
 (0)
X Tutup