Merge pull request #431 from tomgalloway/market_listeners_tests

Market listeners tests

Author: cpacia

market/listeners.py

@@ -3,19 +3,20 @@
 import json
 import time
 import random
+from log import Logger
 from api.utils import sanitize_html
 from interfaces import MessageListener, BroadcastListener, NotificationListener
 from zope.interface import implements
 from protos.objects import PlaintextMessage, Following
 from dht.utils import digest
 
-
 class MessageListenerImpl(object):
     implements(MessageListener)
 
     def __init__(self, web_socket_factory, database):
         self.ws = web_socket_factory
         self.db = database
+        self.log = Logger(system=self)
 
     def notify(self, plaintext, signature):
         try:
@@ -45,9 +46,8 @@ def notify(self, plaintext, signature):
                 if plaintext.handle:
                     message_json["message"]["handle"] = plaintext.handle
                 self.ws.push(json.dumps(sanitize_html(message_json), indent=4))
-        except Exception:
-            pass
-
+        except Exception as e:
+            self.log.error('Market.Listener.notify Exception: %s' % e)
 
 class BroadcastListenerImpl(object):
     implements(BroadcastListener)
@@ -60,6 +60,8 @@ def notify(self, guid, message):
         # pull the metadata for this node from the db
         f = Following()
         ser = self.db.follow.get_following()
+        handle = ""
+        avatar_hash = ""
         if ser is not None:
             f.ParseFromString(ser)
             for user in f.users:

market/tests/test_listeners.py

@@ -1,8 +1,9 @@
 from twisted.trial import unittest
 from twisted.python import log
 from mock import MagicMock
+import mock
 
-from market.listeners import MessageListenerImpl
+from market.listeners import MessageListenerImpl, BroadcastListenerImpl
 from protos.objects import PlaintextMessage
 
 class MarketListenersTest(unittest.TestCase):
@@ -47,6 +48,7 @@ def _create_valid_message_json(handle):
         return message
 
     def test_MarketListeners_notify_without_handle_success(self):
+        '''MessageListenerImpl correctly notify without handle.'''
         p = self._create_valid_plaintext_message('')
         signature = 'test_signature'
         l = MessageListenerImpl(self.ws, self.db)
@@ -61,6 +63,7 @@ def test_MarketListeners_notify_without_handle_success(self):
         self.ws.push.assert_called_with(self._create_valid_message_json(''))
 
     def test_MarketListeners_notify_with_handle_success(self):
+        '''MessageListenerImpl correctly notify with handle.'''
         p = self._create_valid_plaintext_message('test_handle')
         signature = 'test_signature'
         l = MessageListenerImpl(self.ws, self.db)
@@ -74,3 +77,21 @@ def test_MarketListeners_notify_with_handle_success(self):
                                                          'test_avatar_hash',
                                                          signature, False)
         self.ws.push.assert_called_with(self._create_valid_message_json('test_handle'))
+
+    def test_MarketListeners_save_message_exception(self):
+        p = self._create_valid_plaintext_message('test_handle')
+        signature = 'test_signature'
+        l = MessageListenerImpl(self.ws, self.db)
+        self.db.messages.save_message.side_effect = Exception("test_exception")
+        l.notify(p, signature)
+        self.assertEqual('[ERROR] Market.Listener.notify Exception: test_exception', self.catcher[0]['message'][0])
+
+    def test_MarketListeners_broadcast_notify_success(self):
+        '''BroadcastListenerImpl correctly notifies.'''
+        b = BroadcastListenerImpl(self.ws, self.db)
+        b.notify('123', 'test_message')
+        self.db.broadcasts.save_broadcast.assert_called_once_with(mock.ANY,
+                                                                  '313233', '',
+                                                                  'test_message',
+                                                                  mock.ANY, '')
+        self.ws.push.assert_called_once_with(mock.ANY)