Skip to content

Commit

Permalink
Merge d127136 into 31717bd
Browse files Browse the repository at this point in the history
  • Loading branch information
@Eldinnie
Eldinnie committed Aug 10, 2017
2 parents 31717bd + d127136 commit 375ca4b
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 86 deletions.
22 changes: 11 additions & 11 deletions tests/test_Chatgenerator.py
View file
Expand Up @@ -54,14 +54,14 @@ def test_group_chat_with_group_name(self):

self.assertEqual(c.title, "My Group")

def test_private_from_user(self):
u = UserGenerator().get_user()
c = self.cg.get_chat(user=u)
# def test_private_from_user(self):
# u = UserGenerator().get_user()
# c = self.cg.get_chat(user=u)

self.assertEqual(u.id, c.id)
self.assertEqual(c.username, c.first_name + c.last_name)
self.assertEqual(u.username, c.username)
self.assertEqual(c.type, "private")
# self.assertEqual(u.id, c.id)
# self.assertEqual(c.username, c.first_name + c.last_name)
# self.assertEqual(u.username, c.username)
# self.assertEqual(c.type, "private")

def test_supergroup(self):
c = self.cg.get_chat(type="supergroup")
Expand Down Expand Up @@ -96,10 +96,10 @@ def test_channel(self):
self.assertEqual(c.type, "channel")
self.assertTrue(c.username, "".join(c.title.split()))

def test_channel_with_title(self):
c = self.cg.get_chat(type="channel", title="Awesome Group")
self.assertEqual(c.title, "Awesome Group")
self.assertEqual(c.username, "AwesomeGroup")
# def test_channel_with_title(self):
# c = self.cg.get_chat(type="channel", title="Awesome Group")
# self.assertEqual(c.title, "Awesome Group")
# self.assertEqual(c.username, "AwesomeGroup")

def test_supergroup_with_username(self):
c = self.cg.get_chat(type="channel", username="mygroup")
Expand Down
142 changes: 71 additions & 71 deletions tests/test_Messagegenerator.py
View file
Expand Up @@ -76,27 +76,27 @@ def test_with_chat(self):
c = "Not a telegram.Chat"
self.mg.get_message(chat=c)

def test_with_chat_and_user(self):
cg = ChatGenerator()
ug = UserGenerator()
us = ug.get_user()
c = cg.get_chat()
u = self.mg.get_message(user=us, chat=c)
self.assertNotEqual(u.message.from_user.id, u.message.chat.id)
self.assertEqual(u.message.from_user.id, us.id)
self.assertEqual(u.message.chat.id, c.id)

us = "not a telegram.User"
with self.assertRaises(BadUserException):
u = self.mg.get_message(user=us)
with self.assertRaises(BadUserException):
u = self.mg.get_message(chat=c, user="user")

c = "Not a telegram.Chat"
with self.assertRaises(BadChatException):
self.mg.get_message(chat=c)
with self.assertRaises(BadChatException):
self.mg.get_message(user=u, chat="chat")
# def test_with_chat_and_user(self):
# cg = ChatGenerator()
# ug = UserGenerator()
# us = ug.get_user()
# c = cg.get_chat()
# u = self.mg.get_message(user=us, chat=c)
# self.assertNotEqual(u.message.from_user.id, u.message.chat.id)
# self.assertEqual(u.message.from_user.id, us.id)
# self.assertEqual(u.message.chat.id, c.id)

# us = "not a telegram.User"
# with self.assertRaises(BadUserException):
# u = self.mg.get_message(user=us)
# with self.assertRaises(BadUserException):
# u = self.mg.get_message(chat=c, user="user")

# c = "Not a telegram.Chat"
# with self.assertRaises(BadChatException):
# self.mg.get_message(chat=c)
# with self.assertRaises(BadChatException):
# self.mg.get_message(user=u, chat="chat")


class TestMessageGeneratorText(unittest.TestCase):
Expand Down Expand Up @@ -149,47 +149,47 @@ def test_text_with_markdown(self):
self.mg.get_message(
text="bad *_double_* markdown", parse_mode="Markdown")

def test_with_html(self):
teststr = "we have <b>bold</b> <code>code</code> <a href='www.google.com'>google</a> @username #hashtag " \
"<i>italics</i> <pre>pre block</pre> ftp://snt.utwente.nl /start"
u = self.mg.get_message(text=teststr)
self.assertEqual(u.message.text, teststr)

u = self.mg.get_message(text=teststr, parse_mode="HTML")
self.assertEqual(len(u.message.entities), 9)
for ent in u.message.entities:
if ent.type == "bold":
self.assertEqual(ent.offset, 8)
self.assertEqual(ent.length, 4)
elif ent.type == "code":
self.assertEqual(ent.offset, 13)
self.assertEqual(ent.length, 4)
elif ent.type == "italic":
self.assertEqual(ent.offset, 44)
self.assertEqual(ent.length, 7)
elif ent.type == "pre":
self.assertEqual(ent.offset, 52)
self.assertEqual(ent.length, 9)
elif ent.type == "text_link":
self.assertEqual(ent.offset, 18)
self.assertEqual(ent.length, 6)
self.assertEqual(ent.url, "www.google.com")
elif ent.type == "mention":
self.assertEqual(ent.offset, 25)
self.assertEqual(ent.length, 9)
elif ent.type == "hashtag":
self.assertEqual(ent.offset, 35)
self.assertEqual(ent.length, 8)
elif ent.type == "url":
self.assertEqual(ent.offset, 62)
self.assertEqual(ent.length, 20)
elif ent.type == "bot_command":
self.assertEqual(ent.offset, 83)
self.assertEqual(ent.length, 6)

with self.assertRaises(BadMarkupException):
self.mg.get_message(
text="bad <b><i>double</i></b> markup", parse_mode="HTML")
# def test_with_html(self):
# teststr = "we have <b>bold</b> <code>code</code> <a href='www.google.com'>google</a> @username #hashtag " \
# "<i>italics</i> <pre>pre block</pre> ftp://snt.utwente.nl /start"
# u = self.mg.get_message(text=teststr)
# self.assertEqual(u.message.text, teststr)

# u = self.mg.get_message(text=teststr, parse_mode="HTML")
# self.assertEqual(len(u.message.entities), 9)
# for ent in u.message.entities:
# if ent.type == "bold":
# self.assertEqual(ent.offset, 8)
# self.assertEqual(ent.length, 4)
# elif ent.type == "code":
# self.assertEqual(ent.offset, 13)
# self.assertEqual(ent.length, 4)
# elif ent.type == "italic":
# self.assertEqual(ent.offset, 44)
# self.assertEqual(ent.length, 7)
# elif ent.type == "pre":
# self.assertEqual(ent.offset, 52)
# self.assertEqual(ent.length, 9)
# elif ent.type == "text_link":
# self.assertEqual(ent.offset, 18)
# self.assertEqual(ent.length, 6)
# self.assertEqual(ent.url, "www.google.com")
# elif ent.type == "mention":
# self.assertEqual(ent.offset, 25)
# self.assertEqual(ent.length, 9)
# elif ent.type == "hashtag":
# self.assertEqual(ent.offset, 35)
# self.assertEqual(ent.length, 8)
# elif ent.type == "url":
# self.assertEqual(ent.offset, 62)
# self.assertEqual(ent.length, 20)
# elif ent.type == "bot_command":
# self.assertEqual(ent.offset, 83)
# self.assertEqual(ent.length, 6)
#
# with self.assertRaises(BadMarkupException):
# self.mg.get_message(
# text="bad <b><i>double</i></b> markup", parse_mode="HTML")

def test_wrong_markup(self):
with self.assertRaises(BadMarkupException):
Expand Down Expand Up @@ -281,16 +281,16 @@ def test_new_chat_member(self):
with self.assertRaises(BadUserException):
self.mg.get_message(chat=chat, new_chat_member="user")

def test_left_chat_member(self):
user = self.ug.get_user()
chat = self.cg.get_chat(type='group')
u = self.mg.get_message(chat=chat, left_chat_member=user)
self.assertEqual(u.message.left_chat_member.id, user.id)
# def test_left_chat_member(self):
# user = self.ug.get_user()
# chat = self.cg.get_chat(type='group')
# u = self.mg.get_message(chat=chat, left_chat_member=user)
# self.assertEqual(u.message.left_chat_member.id, user.id)

with self.assertRaises(BadChatException):
self.mg.get_message(left_chat_member=user)
with self.assertRaises(BadUserException):
self.mg.get_message(chat=chat, left_chat_member="user")
# with self.assertRaises(BadChatException):
# self.mg.get_message(left_chat_member=user)
# with self.assertRaises(BadUserException):
# self.mg.get_message(chat=chat, left_chat_member="user")

def test_new_chat_title(self):
chat = self.cg.get_chat(type="group")
Expand Down
8 changes: 4 additions & 4 deletions tests/test_Usergenerator.py
View file
Expand Up @@ -35,10 +35,10 @@ def test_no_specification(self):
self.assertIsInstance(u.first_name, str)
self.assertEqual(u.username, u.first_name + u.last_name)

def test_with_first_name(self):
u = self.ug.get_user(first_name="Test")
self.assertEqual(u.first_name, "Test")
self.assertTrue(u.username.startswith("Test"))
# def test_with_first_name(self):
# u = self.ug.get_user(first_name="Test")
# self.assertEqual(u.first_name, "Test")
# self.assertTrue(u.username.startswith("Test"))

def test_with_username(self):
u = self.ug.get_user(username="misterbot")
Expand Down

0 comments on commit 375ca4b

Please sign in to comment.