X Tutup
Skip to content

refactor self.id -> self._id to let pycharms testrunner run #598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jh0ker merged 1 commit into from
May 12, 2017
Merged

refactor self.id -> self._id to let pycharms testrunner run #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tests/test_chat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ class ChatTest(BaseTest, unittest.TestCase):
"""This object represents Tests for Telegram Chat."""

def setUp(self):
self.id = -28767330
self._id = -28767330
self.title = 'ToledosPalaceBot - Group'
self.type = 'group'
self.all_members_are_administrators = False

self.json_dict = {
'id': self.id,
'id': self._id,
'title': self.title,
'type': self.type,
'all_members_are_administrators': self.all_members_are_administrators
Expand All @@ -53,7 +53,7 @@ def test_group_chat_de_json_empty_json(self):
def test_group_chat_de_json(self):
group_chat = telegram.Chat.de_json(self.json_dict, self._bot)

self.assertEqual(group_chat.id, self.id)
self.assertEqual(group_chat.id, self._id)
self.assertEqual(group_chat.title, self.title)
self.assertEqual(group_chat.type, self.type)
self.assertEqual(group_chat.all_members_are_administrators,
Expand All @@ -68,7 +68,7 @@ def test_group_chat_to_dict(self):
group_chat = telegram.Chat.de_json(self.json_dict, self._bot)

self.assertTrue(self.is_dict(group_chat.to_dict()))
self.assertEqual(group_chat['id'], self.id)
self.assertEqual(group_chat['id'], self._id)
self.assertEqual(group_chat['title'], self.title)
self.assertEqual(group_chat['type'], self.type)
self.assertEqual(group_chat['all_members_are_administrators'],
Expand Down
6 changes: 3 additions & 3 deletions tests/test_inlinequery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ def setUp(self):
user = telegram.User(1, 'First name')
location = telegram.Location(8.8, 53.1)

self.id = 'id'
self._id = 'id'
self.from_user = user
self.query = 'query text'
self.offset = 'offset'
self.location = location

self.json_dict = {
'id': self.id,
'id': self._id,
'from': self.from_user.to_dict(),
'query': self.query,
'offset': self.offset,
Expand All @@ -52,7 +52,7 @@ def setUp(self):
def test_inlinequery_de_json(self):
inlinequery = telegram.InlineQuery.de_json(self.json_dict, self._bot)

self.assertEqual(inlinequery.id, self.id)
self.assertEqual(inlinequery.id, self._id)
self.assertDictEqual(inlinequery.from_user.to_dict(), self.from_user.to_dict())
self.assertDictEqual(inlinequery.location.to_dict(), self.location.to_dict())
self.assertEqual(inlinequery.query, self.query)
Expand Down
6 changes: 3 additions & 3 deletions tests/test_inlinequeryresultarticle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class InlineQueryResultArticleTest(BaseTest, unittest.TestCase):
"""This object represents Tests for Telegram InlineQueryResultArticle."""

def setUp(self):
self.id = 'id'
self._id = 'id'
self.type = 'article'
self.title = 'title'
self.input_message_content = telegram.InputTextMessageContent('input_message_content')
Expand All @@ -47,7 +47,7 @@ def setUp(self):

self.json_dict = {
'type': self.type,
'id': self.id,
'id': self._id,
'title': self.title,
'input_message_content': self.input_message_content.to_dict(),
'reply_markup': self.reply_markup.to_dict(),
Expand All @@ -63,7 +63,7 @@ def test_article_de_json(self):
article = telegram.InlineQueryResultArticle.de_json(self.json_dict, self._bot)

self.assertEqual(article.type, self.type)
self.assertEqual(article.id, self.id)
self.assertEqual(article.id, self._id)
self.assertEqual(article.title, self.title)
self.assertDictEqual(article.input_message_content.to_dict(),
self.input_message_content.to_dict())
Expand Down
6 changes: 3 additions & 3 deletions tests/test_inlinequeryresultaudio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class InlineQueryResultAudioTest(BaseTest, unittest.TestCase):
"""This object represents Tests for Telegram InlineQueryResultAudio."""

def setUp(self):
self.id = 'id'
self._id = 'id'
self.type = 'audio'
self.audio_url = 'audio url'
self.title = 'title'
Expand All @@ -45,7 +45,7 @@ def setUp(self):

self.json_dict = {
'type': self.type,
'id': self.id,
'id': self._id,
'audio_url': self.audio_url,
'title': self.title,
'performer': self.performer,
Expand All @@ -59,7 +59,7 @@ def test_audio_de_json(self):
audio = telegram.InlineQueryResultAudio.de_json(self.json_dict, self._bot)

self.assertEqual(audio.type, self.type)
self.assertEqual(audio.id, self.id)
self.assertEqual(audio.id, self._id)
self.assertEqual(audio.audio_url, self.audio_url)
self.assertEqual(audio.title, self.title)
self.assertEqual(audio.performer, self.performer)
Expand Down
6 changes: 3 additions & 3 deletions tests/test_inlinequeryresultcachedaudio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class InlineQueryResultCachedAudioTest(BaseTest, unittest.TestCase):
InlineQueryResultCachedAudio."""

def setUp(self):
self.id = 'id'
self._id = 'id'
self.type = 'audio'
self.audio_file_id = 'audio file id'
self.caption = 'caption'
Expand All @@ -43,7 +43,7 @@ def setUp(self):

self.json_dict = {
'type': self.type,
'id': self.id,
'id': self._id,
'audio_file_id': self.audio_file_id,
'caption': self.caption,
'input_message_content': self.input_message_content.to_dict(),
Expand All @@ -54,7 +54,7 @@ def test_audio_de_json(self):
audio = telegram.InlineQueryResultCachedAudio.de_json(self.json_dict, self._bot)

self.assertEqual(audio.type, self.type)
self.assertEqual(audio.id, self.id)
self.assertEqual(audio.id, self._id)
self.assertEqual(audio.audio_file_id, self.audio_file_id)
self.assertEqual(audio.caption, self.caption)
self.assertDictEqual(audio.input_message_content.to_dict(),
Expand Down
6 changes: 3 additions & 3 deletions tests/test_inlinequeryresultcacheddocument.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class InlineQueryResultCachedDocumentTest(BaseTest, unittest.TestCase):
InlineQueryResultCachedDocument."""

def setUp(self):
self.id = 'id'
self._id = 'id'
self.type = 'document'
self.document_file_id = 'document file id'
self.title = 'title'
Expand All @@ -43,7 +43,7 @@ def setUp(self):
self.reply_markup = telegram.InlineKeyboardMarkup(
[[telegram.InlineKeyboardButton('reply_markup')]])
self.json_dict = {
'id': self.id,
'id': self._id,
'type': self.type,
'document_file_id': self.document_file_id,
'title': self.title,
Expand All @@ -56,7 +56,7 @@ def setUp(self):
def test_document_de_json(self):
document = telegram.InlineQueryResultCachedDocument.de_json(self.json_dict, self._bot)

self.assertEqual(document.id, self.id)
self.assertEqual(document.id, self._id)
self.assertEqual(document.type, self.type)
self.assertEqual(document.document_file_id, self.document_file_id)
self.assertEqual(document.title, self.title)
Expand Down
6 changes: 3 additions & 3 deletions tests/test_inlinequeryresultcachedgif.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class InlineQueryResultCachedGifTest(BaseTest, unittest.TestCase):
"""This object represents Tests for Telegram InlineQueryResultCachedGif."""

def setUp(self):
self.id = 'id'
self._id = 'id'
self.type = 'gif'
self.gif_file_id = 'gif file id'
self.title = 'title'
Expand All @@ -43,7 +43,7 @@ def setUp(self):

self.json_dict = {
'type': self.type,
'id': self.id,
'id': self._id,
'gif_file_id': self.gif_file_id,
'title': self.title,
'caption': self.caption,
Expand All @@ -55,7 +55,7 @@ def test_gif_de_json(self):
gif = telegram.InlineQueryResultCachedGif.de_json(self.json_dict, self._bot)

self.assertEqual(gif.type, self.type)
self.assertEqual(gif.id, self.id)
self.assertEqual(gif.id, self._id)
self.assertEqual(gif.gif_file_id, self.gif_file_id)
self.assertEqual(gif.title, self.title)
self.assertEqual(gif.caption, self.caption)
Expand Down
6 changes: 3 additions & 3 deletions tests/test_inlinequeryresultcachedmpeg4gif.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class InlineQueryResultCachedMpeg4GifTest(BaseTest, unittest.TestCase):
InlineQueryResultCachedMpeg4Gif."""

def setUp(self):
self.id = 'id'
self._id = 'id'
self.type = 'mpeg4_gif'
self.mpeg4_file_id = 'mpeg4 file id'
self.title = 'title'
Expand All @@ -44,7 +44,7 @@ def setUp(self):

self.json_dict = {
'type': self.type,
'id': self.id,
'id': self._id,
'mpeg4_file_id': self.mpeg4_file_id,
'title': self.title,
'caption': self.caption,
Expand All @@ -56,7 +56,7 @@ def test_mpeg4_de_json(self):
mpeg4 = telegram.InlineQueryResultCachedMpeg4Gif.de_json(self.json_dict, self._bot)

self.assertEqual(mpeg4.type, self.type)
self.assertEqual(mpeg4.id, self.id)
self.assertEqual(mpeg4.id, self._id)
self.assertEqual(mpeg4.mpeg4_file_id, self.mpeg4_file_id)
self.assertEqual(mpeg4.title, self.title)
self.assertEqual(mpeg4.caption, self.caption)
Expand Down
6 changes: 3 additions & 3 deletions tests/test_inlinequeryresultcachedphoto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class InlineQueryResultCachedPhotoTest(BaseTest, unittest.TestCase):
InlineQueryResultCachedPhoto."""

def setUp(self):
self.id = 'id'
self._id = 'id'
self.type = 'photo'
self.photo_file_id = 'photo file id'
self.title = 'title'
Expand All @@ -45,7 +45,7 @@ def setUp(self):

self.json_dict = {
'type': self.type,
'id': self.id,
'id': self._id,
'photo_file_id': self.photo_file_id,
'title': self.title,
'description': self.description,
Expand All @@ -58,7 +58,7 @@ def test_photo_de_json(self):
photo = telegram.InlineQueryResultCachedPhoto.de_json(self.json_dict, self._bot)

self.assertEqual(photo.type, self.type)
self.assertEqual(photo.id, self.id)
self.assertEqual(photo.id, self._id)
self.assertEqual(photo.photo_file_id, self.photo_file_id)
self.assertEqual(photo.title, self.title)
self.assertEqual(photo.description, self.description)
Expand Down
6 changes: 3 additions & 3 deletions tests/test_inlinequeryresultcachedsticker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class InlineQueryResultCachedStickerTest(BaseTest, unittest.TestCase):
InlineQueryResultCachedSticker."""

def setUp(self):
self.id = 'id'
self._id = 'id'
self.type = 'sticker'
self.sticker_file_id = 'sticker file id'
self.input_message_content = telegram.InputTextMessageContent('input_message_content')
Expand All @@ -42,7 +42,7 @@ def setUp(self):

self.json_dict = {
'type': self.type,
'id': self.id,
'id': self._id,
'sticker_file_id': self.sticker_file_id,
'input_message_content': self.input_message_content.to_dict(),
'reply_markup': self.reply_markup.to_dict(),
Expand All @@ -52,7 +52,7 @@ def test_sticker_de_json(self):
sticker = telegram.InlineQueryResultCachedSticker.de_json(self.json_dict, self._bot)

self.assertEqual(sticker.type, self.type)
self.assertEqual(sticker.id, self.id)
self.assertEqual(sticker.id, self._id)
self.assertEqual(sticker.sticker_file_id, self.sticker_file_id)
self.assertDictEqual(sticker.input_message_content.to_dict(),
self.input_message_content.to_dict())
Expand Down
6 changes: 3 additions & 3 deletions tests/test_inlinequeryresultcachedvideo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class InlineQueryResultCachedVideoTest(BaseTest, unittest.TestCase):
InlineQueryResultCachedVideo."""

def setUp(self):
self.id = 'id'
self._id = 'id'
self.type = 'video'
self.video_file_id = 'video file id'
self.title = 'title'
Expand All @@ -45,7 +45,7 @@ def setUp(self):

self.json_dict = {
'type': self.type,
'id': self.id,
'id': self._id,
'video_file_id': self.video_file_id,
'title': self.title,
'caption': self.caption,
Expand All @@ -58,7 +58,7 @@ def test_video_de_json(self):
video = telegram.InlineQueryResultCachedVideo.de_json(self.json_dict, self._bot)

self.assertEqual(video.type, self.type)
self.assertEqual(video.id, self.id)
self.assertEqual(video.id, self._id)
self.assertEqual(video.video_file_id, self.video_file_id)
self.assertEqual(video.title, self.title)
self.assertEqual(video.description, self.description)
Expand Down
6 changes: 3 additions & 3 deletions tests/test_inlinequeryresultcachedvoice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class InlineQueryResultCachedVoiceTest(BaseTest, unittest.TestCase):
InlineQueryResultCachedVoice."""

def setUp(self):
self.id = 'id'
self._id = 'id'
self.type = 'voice'
self.voice_file_id = 'voice file id'
self.title = 'title'
Expand All @@ -44,7 +44,7 @@ def setUp(self):

self.json_dict = {
'type': self.type,
'id': self.id,
'id': self._id,
'voice_file_id': self.voice_file_id,
'title': self.title,
'caption': self.caption,
Expand All @@ -56,7 +56,7 @@ def test_voice_de_json(self):
voice = telegram.InlineQueryResultCachedVoice.de_json(self.json_dict, self._bot)

self.assertEqual(voice.type, self.type)
self.assertEqual(voice.id, self.id)
self.assertEqual(voice.id, self._id)
self.assertEqual(voice.voice_file_id, self.voice_file_id)
self.assertEqual(voice.title, self.title)
self.assertEqual(voice.caption, self.caption)
Expand Down
6 changes: 3 additions & 3 deletions tests/test_inlinequeryresultcontact.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class InlineQueryResultContactTest(BaseTest, unittest.TestCase):
"""This object represents Tests for Telegram InlineQueryResultContact."""

def setUp(self):
self.id = 'id'
self._id = 'id'
self.type = 'contact'
self.phone_number = 'phone_number'
self.first_name = 'first_name'
Expand All @@ -44,7 +44,7 @@ def setUp(self):
self.reply_markup = telegram.InlineKeyboardMarkup(
[[telegram.InlineKeyboardButton('reply_markup')]])
self.json_dict = {
'id': self.id,
'id': self._id,
'type': self.type,
'phone_number': self.phone_number,
'first_name': self.first_name,
Expand All @@ -59,7 +59,7 @@ def setUp(self):
def test_contact_de_json(self):
contact = telegram.InlineQueryResultContact.de_json(self.json_dict, self._bot)

self.assertEqual(contact.id, self.id)
self.assertEqual(contact.id, self._id)
self.assertEqual(contact.type, self.type)
self.assertEqual(contact.phone_number, self.phone_number)
self.assertEqual(contact.first_name, self.first_name)
Expand Down
6 changes: 3 additions & 3 deletions tests/test_inlinequeryresultdocument.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class InlineQueryResultDocumentTest(BaseTest, unittest.TestCase):
"""This object represents Tests for Telegram InlineQueryResultDocument."""

def setUp(self):
self.id = 'id'
self._id = 'id'
self.type = 'document'
self.document_url = 'document url'
self.title = 'title'
Expand All @@ -46,7 +46,7 @@ def setUp(self):
self.reply_markup = telegram.InlineKeyboardMarkup(
[[telegram.InlineKeyboardButton('reply_markup')]])
self.json_dict = {
'id': self.id,
'id': self._id,
'type': self.type,
'document_url': self.document_url,
'title': self.title,
Expand All @@ -63,7 +63,7 @@ def setUp(self):
def test_document_de_json(self):
document = telegram.InlineQueryResultDocument.de_json(self.json_dict, self._bot)

self.assertEqual(document.id, self.id)
self.assertEqual(document.id, self._id)
self.assertEqual(document.type, self.type)
self.assertEqual(document.document_url, self.document_url)
self.assertEqual(document.title, self.title)
Expand Down
Loading
X Tutup