more tests, fix #360

thomasballinger · thomasballinger · commit 79d55fa759fa · 2014-08-30T08:35:31.000-07:00
Bit of a cop out, but less tests are being skipped now
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -57,6 +57,9 @@
     "oct", "hex", "index", "coerce", "enter", "exit"]]
 
 
+def after_last_dot(name):
+    return name.rstrip('.').rsplit('.')[-1]
+
 def get_completer(cursor_offset, current_line, locals_, argspec, full_code, mode, complete_magic_methods):
     """Returns a list of matches and a class for what kind of completion is happening
 
@@ -132,9 +135,7 @@ class ImportCompletion(BaseCompletionType):
     def matches(cls, cursor_offset, current_line, **kwargs):
         return importcompletion.complete(cursor_offset, current_line)
     locate = staticmethod(lineparts.current_word)
-    @classmethod
-    def format(cls, name):
-        return name.rstrip('.').rsplit('.')[-1]
+    format = staticmethod(after_last_dot)
 
 class FilenameCompletion(BaseCompletionType):
     shown_before_tab = False
@@ -193,9 +194,7 @@ def matches(cls, cursor_offset, line, locals_, mode, **kwargs):
         return matches
 
     locate = staticmethod(lineparts.current_dotted_attribute)
-    @classmethod
-    def format(cls, name):
-        return name.rstrip('.').rsplit('.')[-1]
+    format = staticmethod(after_last_dot)
 
 class DictKeyCompletion(BaseCompletionType):
     locate = staticmethod(lineparts.current_dict_key)
diff --git a/bpython/test/test_autocomplete.py b/bpython/test/test_autocomplete.py
@@ -9,35 +9,10 @@
     def skip(f):
         return lambda self: None
 
-
-# Parts of autocompletion to test:
+#TODO: Parts of autocompletion to test:
 # Test that the right matches come back from find_matches (test that priority is correct)
 # Test the various complete methods (import, filename) to see if right matches
 # Test that MatchesIterator.substitute correctly subs given a match and a completer
-"""
-    def test_cw(self):
-
-        self.repl.cpos = 2
-        self.assertEqual(self.repl.cw(), None)
-        self.repl.cpos = 0
-
-        self.repl.s = ''
-        self.assertEqual(self.repl.cw(), None)
-
-        self.repl.s = "this.is.a.test\t"
-        self.assertEqual(self.repl.cw(), None)
-
-        s = "this.is.a.test"
-        self.repl.s = s
-        self.assertEqual(self.repl.cw(), s)
-
-        s = "\t\tthis.is.a.test"
-        self.repl.s = s
-        self.assertEqual(self.repl.cw(), s.lstrip())
-
-        self.repl.s = "import datetime"
-        self.assertEqual(self.repl.cw(), 'datetime')
-"""
 
 class TestSafeEval(unittest.TestCase):
     def test_catches_syntax_error(self):
@@ -46,22 +21,16 @@ def test_catches_syntax_error(self):
         except:
             self.fail('safe_eval raises an error')
 
-# make some fake files? Dependency inject? mock?
-class TestFilenameCompletion(unittest.TestCase):
-    pass
-
-
 class TestFormatters(unittest.TestCase):
 
-    @skip('not done yet')
     def test_filename(self):
-        self.assertEqual(autocomplete.last_part_of_filename('abc'), 'abc')
-        self.assertEqual(autocomplete.last_part_of_filename('abc/'), 'abc/')
-        self.assertEqual(autocomplete.last_part_of_filename('abc/efg'), 'efg')
-        self.assertEqual(autocomplete.last_part_of_filename('abc/efg/'), 'efg/')
-        self.assertEqual(autocomplete.last_part_of_filename('/abc'), 'abc')
-        self.assertEqual(autocomplete.last_part_of_filename('ab.c/e.f.g/'), 'e.f.g/')
+        last_part_of_filename = autocomplete.FilenameCompletion.format
+        self.assertEqual(last_part_of_filename('abc'), 'abc')
+        self.assertEqual(last_part_of_filename('abc/'), 'abc/')
+        self.assertEqual(last_part_of_filename('abc/efg'), 'efg')
+        self.assertEqual(last_part_of_filename('abc/efg/'), 'efg/')
+        self.assertEqual(last_part_of_filename('/abc'), 'abc')
+        self.assertEqual(last_part_of_filename('ab.c/e.f.g/'), 'e.f.g/')
 
-    @skip('not done yet')
     def test_attribute(self):
         self.assertEqual(autocomplete.after_last_dot('abc.edf'), 'edf')
diff --git a/bpython/test/test_manual_readline.py b/bpython/test/test_manual_readline.py
@@ -230,10 +230,16 @@ def test_seq(self):
         self.assertRaises(KeyError, self.edits.call, 'b')
 
     def test_functions_with_bad_signatures(self):
-        pass #TODO
+        f = lambda something: (1, 2)
+        self.assertRaises(TypeError, self.edits.add, 'a', f)
+        g = lambda cursor_offset, line, something, something_else: (1, 2)
+        self.assertRaises(TypeError, self.edits.add, 'a', g)
 
     def test_functions_with_bad_return_values(self):
-        pass #TODO
+        f = lambda cursor_offset, line: ('hi',)
+        self.assertRaises(ValueError, self.edits.add, 'a', f)
+        g = lambda cursor_offset, line: ('hi', 1, 2, 3)
+        self.assertRaises(ValueError, self.edits.add, 'b', g)
 
     def test_config(self):
         f = lambda cursor_offset, line: ('hi', 2)
