Changeset 9126

Timestamp:

30 Aug 2012, 08:11:58 (12 years ago)

Author:

Henrik Bettermann

Message:

Catch errors and return message removed.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• objecthistory.py (modified) (1 diff)
• tests/test_objecthistory.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/objecthistory.py

@@ -98 +98 @@
         """
         msgs = self._getMessages()
+        if not isinstance(number, int):
+            return False, 'Not a number'
+        try:
+            line = msgs[number]
+        except IndexError:
+            return False, 'Number out of range'
         msgs.pop(number)
         self._annotations[self.history_key] = msgs
-        return
+        return True, line

main/waeup.kofa/trunk/src/waeup/kofa/tests/test_objecthistory.py

@@ -108 +108 @@
         hist.addMessage('blah')
         hist.addMessage('blow')
-        self.assertEqual(len(hist._getMessages()),2)
+        self.assertEqual(len(hist._getMessages()), 2)
         result = ' '.join(hist.messages)
         self.assertTrue('blah by Bob' in result)
         self.assertTrue('blow by Bob' in result)
-        hist.removeMessage(1)
-        self.assertEqual(len(hist._getMessages()),1)
+        success, text = hist.removeMessage('xyz')
+        self.assertFalse(success)
+        self.assertEqual(text, 'Not a number')
+        success, text = hist.removeMessage(100)
+        self.assertFalse(success)
+        self.assertEqual(text, 'Number out of range')
+        success, text = hist.removeMessage(1)
+        self.assertTrue(success)
+        self.assertMatches('<YYYY-MM-DD hh:mm:ss> UTC - blow by Bob', text)
+        self.assertEqual(len(hist.messages), 1)
         result = ' '.join(hist.messages)
         self.assertFalse('blow by Bob' in result)