Merge pull request #139 from nixon/logger_no_msg_handler

klen · klen · commit b97cb76ff30d · 2012-10-22T01:14:38.000-07:00
dont raise an exception when Logger has no message handler
diff --git a/pylibs/ropemode/decorators.py b/pylibs/ropemode/decorators.py
@@ -15,7 +15,7 @@ def __call__(self, message, short=None):
             self._show(short)
 
     def _show(self, message):
-        if message is None:
+        if self.message is None:
             print message
         else:
             self.message(message)
diff --git a/pylibs/ropemode/tests/__init__.py b/pylibs/ropemode/tests/__init__.py
diff --git a/pylibs/ropemode/tests/decorators_test.py b/pylibs/ropemode/tests/decorators_test.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+import os
+import sys
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", ".."))
+
+import unittest
+
+from ropemode.decorators import Logger
+
+
+class LoggerTests(unittest.TestCase):
+    def test_Logger_called_with_no_args_doesnt_raise_TypeError(self):
+        """
+        When not initialized with a message display method, Logger
+        prints the message to stdout without raising an exception.
+        """
+        logger = Logger()
+        try:
+            logger("a message")
+        except TypeError:
+            self.fail("logger raised TypeError unexpectedly")
+
+
+class LoggerMessageHandlerTests(unittest.TestCase):
+    def setUp(self):
+        self.message = ""
+        self.logger = Logger()
+        self.logger.message = self._echo
+
+    def _echo(self, message):
+        self.message += message
+
+    def test_message_handler_with_no_short_message(self):
+        """Test that message handler is called"""
+        self.logger("a message")
+        self.assertEqual(self.message, "a message")
+
+    def test_only_short_True(self):
+        """Test that only_short=True prints only the short message"""
+        self.logger.only_short = True
+        self.logger("a long message", "a short message")
+        self.assertEqual(self.message, "a short message")
+
+    def test_only_short_False(self):
+        """Test that only_short=False prints both messages"""
+        self.logger.only_short = False
+        self.logger("a long message", "a short message")
+        self.assertEqual(self.message, "a long messagea short message")
