add tests for cli, refactor cw

jasonLaster · jasonLaster · commit eea8b79e59f9 · 2012-07-15T14:06:27.000-04:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -426,6 +426,7 @@ def clear_wrapped_lines(self):
             self.scr.clrtoeol()
 
     def complete(self, tab=False):
+        """Get Autcomplete list and window."""
         if self.paste_mode and self.list_win_visible:
             self.scr.touchwin()
 
@@ -483,24 +484,23 @@ def cw(self):
         """Return the current word, i.e. the (incomplete) word directly to the
         left of the cursor"""
 
-        if self.cpos:
-            # I don't know if autocomplete should be disabled if the cursor
-            # isn't at the end of the line, but that's what this does for now.
-            return
+        # I don't know if autocomplete should be disabled if the cursor
+        # isn't at the end of the line, but that's what this does for now.
+        if self.cpos: return
 
+        # look from right to left for a bad method character
         l = len(self.s)
+        is_method_char = lambda c: c.isalnum() or c in ('.', '_')
 
-        if (not self.s or
-            (not self.s[l - 1].isalnum() and
-             self.s[l - 1] not in ('.', '_'))):
+        if not self.s or not is_method_char(self.s[l-1]):
             return
 
-        i = 1
-        while i < l + 1:
-            if not self.s[-i].isalnum() and self.s[-i] not in ('.', '_'):
+        for i in range(1, l+1):
+            if not is_method_char(self.s[-i]):
+                i -= 1
                 break
-            i += 1
-        return self.s[-i + 1:]
+
+        return self.s[-i:]
 
     def delete(self):
         """Process a del"""
diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py
@@ -1,8 +1,9 @@
 import os
 import unittest
+import sys
 from itertools import islice
-
-from bpython import config, repl
+from mock import Mock
+from bpython import config, repl, cli
 
 
 class TestHistory(unittest.TestCase):
@@ -130,6 +131,13 @@ def test_update(self):
         self.assertNotEqual(list(slice), self.matches)
         self.assertEqual(list(newslice), newmatches)
 
+class FakeHistory(repl.History):
+
+    def __init__(self):
+        pass
+
+    def reset(self):
+        pass
 
 class FakeRepl(repl.Repl):
     def __init__(self, conf={}):
@@ -150,6 +158,11 @@ def current_line(self):
     def cw(self):
         return self.current_word
 
+class FakeCliRepl(cli.CLIRepl, FakeRepl):
+    def __init__(self):
+        self.s = ''
+        self.cpos = 0
+        self.rl_history = FakeHistory()
 
 class TestArgspec(unittest.TestCase):
     def setUp(self):
@@ -229,8 +242,55 @@ def test_alternate_complete(self):
         self.assertEqual(self.repl.completer.matches,
             ['UnboundLocalError(', '__doc__'])
 
+class TestCliRepl(unittest.TestCase):
+
+    def setUp(self):
+        self.repl = FakeCliRepl()
+
+    def test_atbol(self):
+        self.assertTrue(self.repl.atbol())
+        self.repl.s = "\t\t"
+        self.assertTrue(self.repl.atbol())
+        self.repl.s = "\t\tnot an empty line"
+        self.assertFalse(self.repl.atbol())
+
+    def test_addstr(self):
+        self.repl.complete = Mock(True)
+
+        self.repl.s = "foo"
+        self.repl.addstr("bar")
+        self.assertEqual(self.repl.s, "foobar")
+
+        self.repl.cpos = 3
+        self.repl.addstr('buzz')
+        self.assertEqual(self.repl.s, "foobuzzbar")
+
+    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 = "this.is.\ta.test"
+        self.assertEqual(self.repl.cw(), 'a.test')
 
+    def test_tab(self):
+        pass
+        # self.repl.tab()
 
 if __name__ == '__main__':
     unittest.main()
