xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

matrix tests: Refactor zulip message validity tests.

Browse source
This commit is contained in:
neiljp (Neil Pilgrim) 2018-06-17 12:11:00 -07:00 committed by Tim Abbott
parent 02799315ea
commit 4b50ea2569
1 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
zulip/integrations/matrix/test_matrix.py
View file

@ -81,17 +81,22 @@ class MatrixBridgeScriptTests(TestCase):
class MatrixBridgeZulipToMatrixTests(TestCase): class MatrixBridgeZulipToMatrixTests(TestCase):
def test_zulip_message_validity_success(self): valid_zulip_config = dict(
# type: () -> None stream="some stream",
zulip_config = dict(stream="some stream",
topic="some topic", topic="some topic",
email="some@email") email="some@email"
msg = dict( )
valid_msg = dict(
sender_email="John@Smith.smith", # must not be equal to config:email sender_email="John@Smith.smith", # must not be equal to config:email
type="stream", # Can only mirror Zulip streams type="stream", # Can only mirror Zulip streams
display_recipient=zulip_config['stream'], display_recipient=valid_zulip_config['stream'],
subject=zulip_config['topic'] subject=valid_zulip_config['topic']
) )
def test_zulip_message_validity_success(self):
# type: () -> None
zulip_config = self.valid_zulip_config
msg = self.valid_msg
# Ensure the test inputs are valid for success # Ensure the test inputs are valid for success
assert msg['sender_email'] != zulip_config['email'] assert msg['sender_email'] != zulip_config['email']
@ -99,24 +104,16 @@ class MatrixBridgeZulipToMatrixTests(TestCase):
def test_zulip_message_validity_failure(self): def test_zulip_message_validity_failure(self):
# type: () -> None # type: () -> None
zulip_config = dict(stream="some stream", zulip_config = self.valid_zulip_config
topic="some topic",
email="some@email")
msg = dict(
sender_email="John@Smith.smith", # must not be equal to config:email
type="stream", # Can only mirror Zulip streams
display_recipient=zulip_config['stream'],
subject=zulip_config['topic']
)
msg_wrong_stream = dict(msg, display_recipient='foo') msg_wrong_stream = dict(self.valid_msg, display_recipient='foo')
self.assertFalse(check_zulip_message_validity(msg_wrong_stream, zulip_config)) self.assertFalse(check_zulip_message_validity(msg_wrong_stream, zulip_config))
msg_wrong_topic = dict(msg, subject='foo') msg_wrong_topic = dict(self.valid_msg, subject='foo')
self.assertFalse(check_zulip_message_validity(msg_wrong_topic, zulip_config)) self.assertFalse(check_zulip_message_validity(msg_wrong_topic, zulip_config))
msg_not_stream = dict(msg, type="private") msg_not_stream = dict(self.valid_msg, type="private")
self.assertFalse(check_zulip_message_validity(msg_not_stream, zulip_config)) self.assertFalse(check_zulip_message_validity(msg_not_stream, zulip_config))
msg_from_bot = dict(msg, sender_email=zulip_config['email']) msg_from_bot = dict(self.valid_msg, sender_email=zulip_config['email'])
self.assertFalse(check_zulip_message_validity(msg_from_bot, zulip_config)) self.assertFalse(check_zulip_message_validity(msg_from_bot, zulip_config))