From 7285affbc4b30b3ce9295e694ef64265f8220334 Mon Sep 17 00:00:00 2001 From: Steve Howell Date: Thu, 7 Dec 2017 19:44:38 -0800 Subject: [PATCH] bots: Simplify test_define.py. --- .../zulip_bots/bots/define/test_define.py | 43 ++++--------------- 1 file changed, 8 insertions(+), 35 deletions(-) diff --git a/zulip_bots/zulip_bots/bots/define/test_define.py b/zulip_bots/zulip_bots/bots/define/test_define.py index 614e00c..db90c52 100755 --- a/zulip_bots/zulip_bots/bots/define/test_define.py +++ b/zulip_bots/zulip_bots/bots/define/test_define.py @@ -1,11 +1,8 @@ #!/usr/bin/env python -from __future__ import absolute_import -from __future__ import print_function +from zulip_bots.test_lib import StubBotTestCase -from zulip_bots.test_lib import BotTestCase - -class TestDefineBot(BotTestCase): +class TestDefineBot(StubBotTestCase): bot_name = "define" def test_bot(self): @@ -16,11 +13,7 @@ class TestDefineBot(BotTestCase): "kept as a pet or for catching mice, and many breeds have been " "developed.\n  their pet cat\n\n") with self.mock_http_conversation('test_single_type_word'): - self.assert_bot_response( - message = {'content': 'cat'}, - response = {'content': bot_response}, - expected_method='send_reply' - ) + self.verify_reply('cat', bot_response) # Multi-type word. bot_response = ("**help**:\n\n" @@ -35,41 +28,21 @@ class TestDefineBot(BotTestCase): "* (**exclamation**) used as an appeal for urgent assistance.\n" "  Help! I'm drowning!\n\n") with self.mock_http_conversation('test_multi_type_word'): - self.assert_bot_response( - message = {'content': 'help'}, - response = {'content': bot_response}, - expected_method='send_reply' - ) + self.verify_reply('help', bot_response) # Incorrect word. bot_response = "**foo**:\nCould not load definition." with self.mock_http_conversation('test_incorrect_word'): - self.assert_bot_response( - message = {'content': 'foo'}, - response = {'content': bot_response}, - expected_method='send_reply' - ) + self.verify_reply('foo', bot_response) # Phrases are not defined. No request is sent to the Internet. bot_response = "Definitions for phrases are not available." - self.assert_bot_response( - message = {'content': 'The sky is blue'}, - response = {'content': bot_response}, - expected_method='send_reply' - ) + self.verify_reply('The sky is blue', bot_response) # Symbols are considered invalid for words bot_response = "Definitions of words with symbols are not possible." - self.assert_bot_response( - message = {'content': '#'}, - response = {'content': bot_response}, - expected_method='send_reply' - ) + self.verify_reply('#', bot_response) # Empty messages are returned with a prompt to reply. No request is sent to the Internet. bot_response = "Please enter a word to define." - self.assert_bot_response( - message = {'content': ''}, - response = {'content': bot_response}, - expected_method='send_reply' - ) + self.verify_reply('', bot_response)