fixes broken test cases with PhotoSize, Game and Animation classes (python-telegram-bot#435)

PH89 · jh0ker · commit 8dc10fc7b218 · 2016-10-10T11:44:40.000+02:00
* fixes broken test with PhotoSize, Game and Animation

However:
testSendGame and test_set_game_score both produces *BadRequest: u'Wrong file identifier/HTTP URL specified'*.

* fixes test_set_game_score

* adds to_dict method to Game to prevent extra collection type checks in base.TelegramObject
diff --git a/telegram/animation.py b/telegram/animation.py
@@ -37,10 +37,6 @@ class Animation(TelegramObject):
 
     def __init__(self,
                  file_id,
-                 thumb=None,
-                 file_name=None,
-                 mime_type=None,
-                 file_size=None,
                  **kwargs):
         self.file_id = file_id
         self.thumb = kwargs.get('thumb')
diff --git a/telegram/game.py b/telegram/game.py
@@ -79,6 +79,18 @@ def de_json(data, bot):
 
         return Game(**data)
 
+    def to_dict(self):
+        """
+        Returns:
+            dict:
+        """
+        data = super(Game, self).to_dict()
+
+        data['photo'] = [p.to_dict() for p in self.photo]
+        data['text_entities'] = [x.to_dict() for x in self.text_entities]
+
+        return data
+
     def parse_text_entity(self, entity):
         """
         Returns the text from a given :class:`telegram.MessageEntity`.
diff --git a/tests/test_bot.py b/tests/test_bot.py
@@ -292,7 +292,7 @@ def test_set_game_score(self):
 
         self.assertTrue(self.is_json(game.to_json()))
         self.assertEqual(message.game.description, game.game.description)
-        self.assertEqual(message.game.animation.file_id, game.game.animation)
+        self.assertEqual(message.game.animation, game.game.animation)
         self.assertEqual(message.game.photo[0].file_size, game.game.photo[0].file_size)
         self.assertNotEqual(message.game.text, game.game.text)
 
diff --git a/tests/test_game.py b/tests/test_game.py
@@ -34,19 +34,33 @@ class GameTest(BaseTest, unittest.TestCase):
     def setUp(self):
         self.title = 'Python-telegram-bot Test Game'
         self.description = 'description'
-        self.photo = [telegram.PhotoSize(file_id='Blah', width=640, height=360)]
+        self.photo = [
+            {
+                'width': 640,
+                'height': 360,
+                'file_id': 'Blah',
+                'file_size': 0
+            }
+        ]
         self.text = 'Other description'
-        self.text_entities = [telegram.MessageEntity(
-            type=telegram.MessageEntity.URL, offset=13, length=17)]
-        self.animation = telegram.Animation(file_id='Bleh')
+        self.text_entities = [
+            {
+                'offset': 13,
+                'length': 17,
+                'type': telegram.MessageEntity.URL
+            }
+        ]
+        self.animation = {
+            'file_id': 'Blah'
+        }
 
         self.json_dict = {
             'title': self.title,
             'description': self.description,
             'photo': self.photo,
             'text': self.text,
-            'text_entities': [e.to_json() for e in self.text_entities],
-            'animation': self.animation.to_json()
+            'text_entities': self.text_entities,
+            'animation': self.animation
         }
 
     def test_game_de_json(self):
@@ -106,7 +120,12 @@ class AnimationTest(BaseTest, unittest.TestCase):
 
     def setUp(self):
         self.file_id = 'thisisafileid'
-        self.thumb = telegram.PhotoSize(file_id='Blah', width=640, height=360)
+        self.thumb = {
+            'width': 640,
+            'height': 360,
+            'file_id': 'Blah',
+            'file_size': 0
+        }
         self.file_name = 'File name'
         self.mime_type = 'something/gif'
         self.file_size = 42
@@ -123,7 +142,7 @@ def test_animation_de_json(self):
         animation = telegram.Animation.de_json(self.json_dict, self._bot)
 
         self.assertEqual(animation.file_id, self.file_id)
-        self.assertEqual(animation.thumb, self.thumb)
+        self.assertTrue(isinstance(animation.thumb, telegram.PhotoSize))
         self.assertEqual(animation.file_name, self.file_name)
         self.assertEqual(animation.mime_type, self.mime_type)
         self.assertEqual(animation.file_size, self.file_size)
