X Tutup
Skip to content

Commit ec8cd37

Browse files
tsnoamtsnoam
committed
test_video.py: adapt to latest changes in the API
1 parent ca8404a commit ec8cd37

File tree

2 files changed

+31
-20
lines changed

2 files changed

+31
-20
lines changed

‎telegram/photosize.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@ def __init__(self,
5353
# Optionals
5454
self.file_size = int(kwargs.get('file_size', 0))
5555

56+
def __eq__(self, other):
57+
if not isinstance(other, self.__class__):
58+
return False
59+
return (self.file_id == other.file_id and
60+
self.width == other.width and
61+
self.height == other.height and
62+
self.file_size == other.file_size)
63+
5664
@staticmethod
5765
def de_json(data):
5866
"""

‎tests/test_video.py‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,12 @@ def setUp(self):
3939
self.video_file_url = 'https://raw.githubusercontent.com/python-telegram-bot/python-telegram-bot/master/tests/data/telegram.mp4'
4040
self.width = 360
4141
self.height = 640
42-
self.duration = 4
43-
self.thumb = telegram.PhotoSize.de_json({})
42+
self.duration = 5
43+
self.thumb = telegram.PhotoSize.de_json(
44+
{'file_id': 'AAQBABOMsecvAAQqqoY1Pee_MqcyAAIC',
45+
'file_size': 645,
46+
'height': 90,
47+
'width': 51})
4448
self.mime_type = 'video/mp4'
4549
self.file_size = 326534
4650

@@ -52,7 +56,7 @@ def setUp(self):
5256
'width': self.width,
5357
'height': self.height,
5458
'duration': self.duration,
55-
'thumb': self.thumb,
59+
'thumb': self.thumb.to_dict(),
5660
'mime_type': self.mime_type,
5761
'file_size': self.file_size
5862
}
@@ -67,10 +71,10 @@ def test_send_video_required_args_only(self):
6771

6872
self.assertTrue(isinstance(video.file_id, str))
6973
self.assertNotEqual(video.file_id, '')
70-
self.assertEqual(video.width, 0)
71-
self.assertEqual(video.height, 0)
72-
self.assertEqual(video.duration, 0)
73-
self.assertEqual(video.thumb, None)
74+
self.assertEqual(video.width, self.width)
75+
self.assertEqual(video.height, self.height)
76+
self.assertEqual(video.duration, self.duration)
77+
self.assertEqual(video.thumb, self.thumb)
7478
self.assertEqual(video.mime_type, '')
7579
self.assertEqual(video.file_size, self.file_size)
7680

@@ -86,10 +90,10 @@ def test_send_video_all_args(self):
8690

8791
self.assertTrue(isinstance(video.file_id, str))
8892
self.assertNotEqual(video.file_id, '')
89-
self.assertEqual(video.width, 0)
90-
self.assertEqual(video.height, 0)
93+
self.assertEqual(video.width, self.width)
94+
self.assertEqual(video.height, self.height)
9195
self.assertEqual(video.duration, self.duration)
92-
self.assertEqual(video.thumb, None)
96+
self.assertEqual(video.thumb, self.thumb)
9397
self.assertEqual(video.mime_type, '')
9498
self.assertEqual(video.file_size, self.file_size)
9599

@@ -107,10 +111,10 @@ def test_send_video_mp4_file(self):
107111

108112
self.assertTrue(isinstance(video.file_id, str))
109113
self.assertNotEqual(video.file_id, '')
110-
self.assertEqual(video.width, 0)
111-
self.assertEqual(video.height, 0)
114+
self.assertEqual(video.width, self.width)
115+
self.assertEqual(video.height, self.height)
112116
self.assertEqual(video.duration, self.duration)
113-
self.assertEqual(video.thumb, None)
117+
self.assertEqual(video.thumb, self.thumb)
114118
self.assertEqual(video.mime_type, '')
115119
self.assertEqual(video.file_size, self.file_size)
116120

@@ -129,10 +133,10 @@ def test_send_video_mp4_file_with_custom_filename(self):
129133

130134
self.assertTrue(isinstance(video.file_id, str))
131135
self.assertNotEqual(video.file_id, '')
132-
self.assertEqual(video.width, 0)
133-
self.assertEqual(video.height, 0)
136+
self.assertEqual(video.width, self.width)
137+
self.assertEqual(video.height, self.height)
134138
self.assertEqual(video.duration, self.duration)
135-
self.assertEqual(video.thumb, None)
139+
self.assertEqual(video.thumb, self.thumb)
136140
self.assertEqual(video.mime_type, '')
137141
self.assertEqual(video.file_size, self.file_size)
138142

@@ -150,10 +154,9 @@ def test_send_video_mp4_file_url(self):
150154

151155
self.assertTrue(isinstance(video.file_id, str))
152156
self.assertNotEqual(video.file_id, '')
153-
self.assertEqual(video.width, 0)
154-
self.assertEqual(video.height, 0)
157+
self.assertEqual(video.height, self.height)
155158
self.assertEqual(video.duration, self.duration)
156-
self.assertEqual(video.thumb, None)
159+
self.assertEqual(video.thumb, self.thumb)
157160
self.assertEqual(video.mime_type, '')
158161
self.assertEqual(video.file_size, self.file_size)
159162

@@ -183,7 +186,7 @@ def test_video_de_json(self):
183186
self.assertEqual(video.width, self.width)
184187
self.assertEqual(video.height, self.height)
185188
self.assertEqual(video.duration, self.duration)
186-
self.assertEqual(video.thumb, None)
189+
self.assertEqual(video.thumb, self.thumb)
187190
self.assertEqual(video.mime_type, self.mime_type)
188191
self.assertEqual(video.file_size, self.file_size)
189192

0 commit comments

Comments
 (0)
X Tutup