repl paint tests

thomasballinger · thomasballinger · commit bd11ff7e8c7a · 2014-08-23T22:56:34.000-04:00
diff --git a/bpython/curtsiesfrontend/filewatch.py b/bpython/curtsiesfrontend/filewatch.py
@@ -18,9 +18,9 @@ def __init__(self, paths, on_change):
             self.modules_to_add_later = []
             self.observer = Observer()
             self.old_dirs = defaultdict(set)
+            self.started = False
             for path in paths:
                 self.add_module(path)
-            self.observer.start()
 
         def reset(self):
             self.dirs = defaultdict(set)
@@ -44,6 +44,9 @@ def add_module_later(self, path):
             self.modules_to_add_later.append(path)
 
         def activate(self):
+            if not self.started:
+                self.started = True
+                self.observer.start()
             self.dirs = self.old_dirs
             for dirname in self.dirs:
                 self.observer.schedule(self, dirname, recursive=False)
diff --git a/bpython/test/test_curtsies_painting.py b/bpython/test/test_curtsies_painting.py
@@ -0,0 +1,66 @@
+# coding: utf8
+import unittest
+import sys
+import os
+
+from curtsies.formatstringarray import FormatStringTest, fsarray
+
+from curtsies.fmtfuncs import *
+
+from bpython import config
+from bpython.curtsiesfrontend.repl import Repl
+from bpython.repl import History
+
+def setup_config():
+    config_struct = config.Struct()
+    config.loadini(config_struct, os.devnull)
+    return config_struct
+
+class TestCurtsiesPainting(FormatStringTest):
+    def setUp(self):
+        self.refresh_requests = []
+        self.repl = Repl(config=setup_config())
+        self.repl.rl_history = History() # clear history
+        self.repl.height, self.repl.width = (5, 10)
+
+    def assert_paint(self, screen, cursor_row_col):
+        array, cursor_pos = self.repl.paint()
+        self.assertFSArraysEqual(array, screen)
+        self.assertEqual(cursor_pos, cursor_row_col)
+
+    def assert_paint_ignoring_formatting(self, screen, cursor_row_col):
+        array, cursor_pos = self.repl.paint()
+        self.assertFSArraysEqualIgnoringFormatting(array, screen)
+
+    def test_startup(self):
+        screen = fsarray([cyan('>>> '), cyan('Welcome to')])
+        self.assert_paint(screen, (0, 4))
+
+    def test_enter_text(self):
+        [self.repl.add_normal_character(c) for c in '1 + 1']
+        screen = fsarray([cyan('>>> ') + bold(green('1')+cyan(' ')+
+                          yellow('+') + cyan(' ') + green('1')), cyan('Welcome to')])
+        self.assert_paint(screen, (0, 9))
+
+    def test_run_line(self):
+        try:
+            orig_stdout = sys.stdout
+            sys.stdout = self.repl.stdout
+            [self.repl.add_normal_character(c) for c in '1 + 1']
+            self.repl.on_enter()
+            screen = fsarray([u'>>> 1 + 1', '2', 'Welcome to'])
+            self.assert_paint_ignoring_formatting(screen, (0, 9))
+        finally:
+            sys.stdout = orig_stdout
+
+    def test_completion(self):
+        self.repl.height, self.repl.width = (5, 32)
+        self.repl.current_line = 'se'
+        self.cursor_offset = 2
+        screen = [u'>>> se',
+                  u'┌───────────────────────┐',
+                  u'│ set(     setattr(     │',
+                  u'└───────────────────────┘',
+                  u'',
+                  u'Welcome to bpython! Press <F1> f']
+        self.assert_paint_ignoring_formatting(screen, (0, 9))
