gets coverage up to 100%

Brian Luft · Brian Luft · commit d63f3c2ec186 · 2011-02-23T20:42:33.000-08:00
diff --git a/pyflot/graph.py b/pyflot/graph.py
@@ -104,9 +104,9 @@ def __getattr__(self, value):
         provides shortcut methods for adding series using a particular line type
         """
         if value.startswith('add_'):
-            if not value.split('_')[1] in LINE_TYPES:
-            	raise AttributeError
-            return partial(self.add_series_type, value[4:])
+            if value.split('_')[1] in LINE_TYPES:
+                return partial(self.add_series_type, value[4:])
+        raise AttributeError
 
     def add_series_type(self, line_type, series, label=None, **kwargs):
         method = getattr(self, 'add_series')
diff --git a/pyflot/tests/__init__.py b/pyflot/tests/__init__.py
@@ -1,4 +1,6 @@
 from datetime import date, timedelta
+from functools import partial
+from types import InstanceType, MethodType
 import json
 import unittest
 
@@ -113,11 +115,17 @@ def test_add_time_series(self):
         self.assertEqual(self.flot._options['xaxis'],
                 {'mode': 'time'})
         
-
     def test_bogus_call(self):
-        "test a bogus method on __getattr__"
-        self.assertRaises(AttributeError, lambda: self.add_shrimp)
-
+        """make sure explicit and dynamic instance methods work, and that
+        bogus attribute access fails as expected"""
+        self.assertRaises(AttributeError, lambda: self.flot.add_shrimp)
+        self.assertRaises(AttributeError, lambda: self.flot.minus_bars)
+        self.assertRaises(AttributeError, lambda: self.flot.asdf)
+        self.assertTrue(isinstance(self.flot.add_bars, partial))
+        self.assertTrue(isinstance(self.flot.add_line, partial))
+        self.assertTrue(isinstance(self.flot.add_points, partial))
+        self.assertTrue(isinstance(self.flot.add_series, MethodType))
+        
     def test_empty_options_json(self):
         "make sure conversion to JSON works for default options"
         self.assertEqual("{}", self.flot.options_json)
