X Tutup
Skip to content

Commit f278075

Browse files
Eldinniejh0ker
Eldinnie
authored and
jh0ker
committed
refactor self.id -> self._id to let pycharms testrunner run (python-telegram-bot#598)
1 parent f3aca42 commit f278075

22 files changed

+70
-70
lines changed

‎tests/test_chat.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ class ChatTest(BaseTest, unittest.TestCase):
3333
"""This object represents Tests for Telegram Chat."""
3434

3535
def setUp(self):
36-
self.id = -28767330
36+
self._id = -28767330
3737
self.title = 'ToledosPalaceBot - Group'
3838
self.type = 'group'
3939
self.all_members_are_administrators = False
4040

4141
self.json_dict = {
42-
'id': self.id,
42+
'id': self._id,
4343
'title': self.title,
4444
'type': self.type,
4545
'all_members_are_administrators': self.all_members_are_administrators
@@ -53,7 +53,7 @@ def test_group_chat_de_json_empty_json(self):
5353
def test_group_chat_de_json(self):
5454
group_chat = telegram.Chat.de_json(self.json_dict, self._bot)
5555

56-
self.assertEqual(group_chat.id, self.id)
56+
self.assertEqual(group_chat.id, self._id)
5757
self.assertEqual(group_chat.title, self.title)
5858
self.assertEqual(group_chat.type, self.type)
5959
self.assertEqual(group_chat.all_members_are_administrators,
@@ -68,7 +68,7 @@ def test_group_chat_to_dict(self):
6868
group_chat = telegram.Chat.de_json(self.json_dict, self._bot)
6969

7070
self.assertTrue(self.is_dict(group_chat.to_dict()))
71-
self.assertEqual(group_chat['id'], self.id)
71+
self.assertEqual(group_chat['id'], self._id)
7272
self.assertEqual(group_chat['title'], self.title)
7373
self.assertEqual(group_chat['type'], self.type)
7474
self.assertEqual(group_chat['all_members_are_administrators'],

‎tests/test_inlinequery.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ def setUp(self):
3535
user = telegram.User(1, 'First name')
3636
location = telegram.Location(8.8, 53.1)
3737

38-
self.id = 'id'
38+
self._id = 'id'
3939
self.from_user = user
4040
self.query = 'query text'
4141
self.offset = 'offset'
4242
self.location = location
4343

4444
self.json_dict = {
45-
'id': self.id,
45+
'id': self._id,
4646
'from': self.from_user.to_dict(),
4747
'query': self.query,
4848
'offset': self.offset,
@@ -52,7 +52,7 @@ def setUp(self):
5252
def test_inlinequery_de_json(self):
5353
inlinequery = telegram.InlineQuery.de_json(self.json_dict, self._bot)
5454

55-
self.assertEqual(inlinequery.id, self.id)
55+
self.assertEqual(inlinequery.id, self._id)
5656
self.assertDictEqual(inlinequery.from_user.to_dict(), self.from_user.to_dict())
5757
self.assertDictEqual(inlinequery.location.to_dict(), self.location.to_dict())
5858
self.assertEqual(inlinequery.query, self.query)

‎tests/test_inlinequeryresultarticle.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class InlineQueryResultArticleTest(BaseTest, unittest.TestCase):
3232
"""This object represents Tests for Telegram InlineQueryResultArticle."""
3333

3434
def setUp(self):
35-
self.id = 'id'
35+
self._id = 'id'
3636
self.type = 'article'
3737
self.title = 'title'
3838
self.input_message_content = telegram.InputTextMessageContent('input_message_content')
@@ -47,7 +47,7 @@ def setUp(self):
4747

4848
self.json_dict = {
4949
'type': self.type,
50-
'id': self.id,
50+
'id': self._id,
5151
'title': self.title,
5252
'input_message_content': self.input_message_content.to_dict(),
5353
'reply_markup': self.reply_markup.to_dict(),
@@ -63,7 +63,7 @@ def test_article_de_json(self):
6363
article = telegram.InlineQueryResultArticle.de_json(self.json_dict, self._bot)
6464

6565
self.assertEqual(article.type, self.type)
66-
self.assertEqual(article.id, self.id)
66+
self.assertEqual(article.id, self._id)
6767
self.assertEqual(article.title, self.title)
6868
self.assertDictEqual(article.input_message_content.to_dict(),
6969
self.input_message_content.to_dict())

‎tests/test_inlinequeryresultaudio.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class InlineQueryResultAudioTest(BaseTest, unittest.TestCase):
3232
"""This object represents Tests for Telegram InlineQueryResultAudio."""
3333

3434
def setUp(self):
35-
self.id = 'id'
35+
self._id = 'id'
3636
self.type = 'audio'
3737
self.audio_url = 'audio url'
3838
self.title = 'title'
@@ -45,7 +45,7 @@ def setUp(self):
4545

4646
self.json_dict = {
4747
'type': self.type,
48-
'id': self.id,
48+
'id': self._id,
4949
'audio_url': self.audio_url,
5050
'title': self.title,
5151
'performer': self.performer,
@@ -59,7 +59,7 @@ def test_audio_de_json(self):
5959
audio = telegram.InlineQueryResultAudio.de_json(self.json_dict, self._bot)
6060

6161
self.assertEqual(audio.type, self.type)
62-
self.assertEqual(audio.id, self.id)
62+
self.assertEqual(audio.id, self._id)
6363
self.assertEqual(audio.audio_url, self.audio_url)
6464
self.assertEqual(audio.title, self.title)
6565
self.assertEqual(audio.performer, self.performer)

‎tests/test_inlinequeryresultcachedaudio.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class InlineQueryResultCachedAudioTest(BaseTest, unittest.TestCase):
3333
InlineQueryResultCachedAudio."""
3434

3535
def setUp(self):
36-
self.id = 'id'
36+
self._id = 'id'
3737
self.type = 'audio'
3838
self.audio_file_id = 'audio file id'
3939
self.caption = 'caption'
@@ -43,7 +43,7 @@ def setUp(self):
4343

4444
self.json_dict = {
4545
'type': self.type,
46-
'id': self.id,
46+
'id': self._id,
4747
'audio_file_id': self.audio_file_id,
4848
'caption': self.caption,
4949
'input_message_content': self.input_message_content.to_dict(),
@@ -54,7 +54,7 @@ def test_audio_de_json(self):
5454
audio = telegram.InlineQueryResultCachedAudio.de_json(self.json_dict, self._bot)
5555

5656
self.assertEqual(audio.type, self.type)
57-
self.assertEqual(audio.id, self.id)
57+
self.assertEqual(audio.id, self._id)
5858
self.assertEqual(audio.audio_file_id, self.audio_file_id)
5959
self.assertEqual(audio.caption, self.caption)
6060
self.assertDictEqual(audio.input_message_content.to_dict(),

‎tests/test_inlinequeryresultcacheddocument.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class InlineQueryResultCachedDocumentTest(BaseTest, unittest.TestCase):
3333
InlineQueryResultCachedDocument."""
3434

3535
def setUp(self):
36-
self.id = 'id'
36+
self._id = 'id'
3737
self.type = 'document'
3838
self.document_file_id = 'document file id'
3939
self.title = 'title'
@@ -43,7 +43,7 @@ def setUp(self):
4343
self.reply_markup = telegram.InlineKeyboardMarkup(
4444
[[telegram.InlineKeyboardButton('reply_markup')]])
4545
self.json_dict = {
46-
'id': self.id,
46+
'id': self._id,
4747
'type': self.type,
4848
'document_file_id': self.document_file_id,
4949
'title': self.title,
@@ -56,7 +56,7 @@ def setUp(self):
5656
def test_document_de_json(self):
5757
document = telegram.InlineQueryResultCachedDocument.de_json(self.json_dict, self._bot)
5858

59-
self.assertEqual(document.id, self.id)
59+
self.assertEqual(document.id, self._id)
6060
self.assertEqual(document.type, self.type)
6161
self.assertEqual(document.document_file_id, self.document_file_id)
6262
self.assertEqual(document.title, self.title)

‎tests/test_inlinequeryresultcachedgif.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class InlineQueryResultCachedGifTest(BaseTest, unittest.TestCase):
3232
"""This object represents Tests for Telegram InlineQueryResultCachedGif."""
3333

3434
def setUp(self):
35-
self.id = 'id'
35+
self._id = 'id'
3636
self.type = 'gif'
3737
self.gif_file_id = 'gif file id'
3838
self.title = 'title'
@@ -43,7 +43,7 @@ def setUp(self):
4343

4444
self.json_dict = {
4545
'type': self.type,
46-
'id': self.id,
46+
'id': self._id,
4747
'gif_file_id': self.gif_file_id,
4848
'title': self.title,
4949
'caption': self.caption,
@@ -55,7 +55,7 @@ def test_gif_de_json(self):
5555
gif = telegram.InlineQueryResultCachedGif.de_json(self.json_dict, self._bot)
5656

5757
self.assertEqual(gif.type, self.type)
58-
self.assertEqual(gif.id, self.id)
58+
self.assertEqual(gif.id, self._id)
5959
self.assertEqual(gif.gif_file_id, self.gif_file_id)
6060
self.assertEqual(gif.title, self.title)
6161
self.assertEqual(gif.caption, self.caption)

‎tests/test_inlinequeryresultcachedmpeg4gif.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class InlineQueryResultCachedMpeg4GifTest(BaseTest, unittest.TestCase):
3333
InlineQueryResultCachedMpeg4Gif."""
3434

3535
def setUp(self):
36-
self.id = 'id'
36+
self._id = 'id'
3737
self.type = 'mpeg4_gif'
3838
self.mpeg4_file_id = 'mpeg4 file id'
3939
self.title = 'title'
@@ -44,7 +44,7 @@ def setUp(self):
4444

4545
self.json_dict = {
4646
'type': self.type,
47-
'id': self.id,
47+
'id': self._id,
4848
'mpeg4_file_id': self.mpeg4_file_id,
4949
'title': self.title,
5050
'caption': self.caption,
@@ -56,7 +56,7 @@ def test_mpeg4_de_json(self):
5656
mpeg4 = telegram.InlineQueryResultCachedMpeg4Gif.de_json(self.json_dict, self._bot)
5757

5858
self.assertEqual(mpeg4.type, self.type)
59-
self.assertEqual(mpeg4.id, self.id)
59+
self.assertEqual(mpeg4.id, self._id)
6060
self.assertEqual(mpeg4.mpeg4_file_id, self.mpeg4_file_id)
6161
self.assertEqual(mpeg4.title, self.title)
6262
self.assertEqual(mpeg4.caption, self.caption)

‎tests/test_inlinequeryresultcachedphoto.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class InlineQueryResultCachedPhotoTest(BaseTest, unittest.TestCase):
3333
InlineQueryResultCachedPhoto."""
3434

3535
def setUp(self):
36-
self.id = 'id'
36+
self._id = 'id'
3737
self.type = 'photo'
3838
self.photo_file_id = 'photo file id'
3939
self.title = 'title'
@@ -45,7 +45,7 @@ def setUp(self):
4545

4646
self.json_dict = {
4747
'type': self.type,
48-
'id': self.id,
48+
'id': self._id,
4949
'photo_file_id': self.photo_file_id,
5050
'title': self.title,
5151
'description': self.description,
@@ -58,7 +58,7 @@ def test_photo_de_json(self):
5858
photo = telegram.InlineQueryResultCachedPhoto.de_json(self.json_dict, self._bot)
5959

6060
self.assertEqual(photo.type, self.type)
61-
self.assertEqual(photo.id, self.id)
61+
self.assertEqual(photo.id, self._id)
6262
self.assertEqual(photo.photo_file_id, self.photo_file_id)
6363
self.assertEqual(photo.title, self.title)
6464
self.assertEqual(photo.description, self.description)

‎tests/test_inlinequeryresultcachedsticker.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class InlineQueryResultCachedStickerTest(BaseTest, unittest.TestCase):
3333
InlineQueryResultCachedSticker."""
3434

3535
def setUp(self):
36-
self.id = 'id'
36+
self._id = 'id'
3737
self.type = 'sticker'
3838
self.sticker_file_id = 'sticker file id'
3939
self.input_message_content = telegram.InputTextMessageContent('input_message_content')
@@ -42,7 +42,7 @@ def setUp(self):
4242

4343
self.json_dict = {
4444
'type': self.type,
45-
'id': self.id,
45+
'id': self._id,
4646
'sticker_file_id': self.sticker_file_id,
4747
'input_message_content': self.input_message_content.to_dict(),
4848
'reply_markup': self.reply_markup.to_dict(),
@@ -52,7 +52,7 @@ def test_sticker_de_json(self):
5252
sticker = telegram.InlineQueryResultCachedSticker.de_json(self.json_dict, self._bot)
5353

5454
self.assertEqual(sticker.type, self.type)
55-
self.assertEqual(sticker.id, self.id)
55+
self.assertEqual(sticker.id, self._id)
5656
self.assertEqual(sticker.sticker_file_id, self.sticker_file_id)
5757
self.assertDictEqual(sticker.input_message_content.to_dict(),
5858
self.input_message_content.to_dict())

0 commit comments

Comments
 (0)
X Tutup