tests for clearing, fix issue #343

thomasballinger · thomasballinger · commit 313189c017a6 · 2014-10-15T00:05:36.000-04:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -1006,9 +1006,11 @@ def paint(self, about_to_exit=False, user_quit=False):
         width, min_height = self.width, self.height
         show_status_bar = bool(self.status_bar.should_show_message) or self.status_bar.has_focus
         if show_status_bar:
-            min_height -= 1
+            min_height -= 1 # because we're going to tack the status bar on at the end,
+                            # shoot for an array one less than the height of the screen
 
         current_line_start_row = len(self.lines_for_display) - max(0, self.scroll_offset)
+        #TODO how is the situation of self.scroll_offset < 0 possible?
         #current_line_start_row = len(self.lines_for_display) - self.scroll_offset
         if self.request_paint_to_clear_screen: # or show_status_bar and about_to_exit ?
             self.request_paint_to_clear_screen = False
@@ -1098,7 +1100,7 @@ def paint(self, about_to_exit=False, user_quit=False):
 
         logger.debug('about to exit: %r', about_to_exit)
         if show_status_bar:
-            statusbar_row = min_height + 1 if arr.height == min_height else arr.height
+            statusbar_row = min_height if arr.height == min_height else arr.height
             if about_to_exit:
                 arr[statusbar_row, :] = FSArray(1, width)
             else:
diff --git a/bpython/test/test_curtsies_painting.py b/bpython/test/test_curtsies_painting.py
@@ -71,7 +71,6 @@ def test_completion(self):
                   u'┌───────────────────────┐',
                   u'│ set(     setattr(     │',
                   u'└───────────────────────┘',
-                  u'',
                   u'Welcome to bpython! Press <F1> f']
         self.assert_paint_ignoring_formatting(screen, (0, 4))
 
@@ -126,7 +125,6 @@ def test_rewind(self):
         screen = [u'>>> ']
         self.assert_paint_ignoring_formatting(screen, (0, 4))
 
-    @skip('wrong message')
     def test_rewind_contiguity_loss(self):
         self.enter('1 + 1')
         self.enter('2 + 2')
@@ -182,7 +180,7 @@ def test_inconsistent_history_doesnt_happen_if_onscreen(self):
                   u'>>> ']
         self.assert_paint_ignoring_formatting(screen, (2, 4))
 
-    @skip('why is everything moved up?')
+    @skip('for inconsistent history check')
     def test_rewind_inconsistent_history(self):
         self.enter("1 + 1")
         self.enter("2 + 2")
@@ -224,8 +222,7 @@ def test_clear_screen(self):
                   u'>>> ', u'', u'', u'', u'']
         self.assert_paint_ignoring_formatting(screen, (4, 4))
 
-    @skip('the screen moved up again!')
-    def test_clear_screen_while_banner_visible(self):
+    def test_scroll_down_while_banner_visible(self):
         self.repl.status_bar.message('STATUS_BAR')
         self.enter("1 + 1")
         self.enter("2 + 2")
@@ -239,12 +236,25 @@ def test_clear_screen_while_banner_visible(self):
         self.repl.scroll_offset += len(screen) - self.repl.height
         self.assert_paint_ignoring_formatting(screen[1:], (3, 4))
 
-        self.repl.request_paint_to_clear_screen = True
+    def test_clear_screen_while_banner_visible(self):
+        self.repl.status_bar.message('STATUS_BAR')
+        self.enter("1 + 1")
+        self.enter("2 + 2")
         screen = [u">>> 1 + 1",
                   u'2',
+                  u'>>> 2 + 2',
+                  u'4',
+                  u'>>> ',
+                  u'STATUS_BAR                      ']
+        self.assert_paint_ignoring_formatting(screen, (4, 4))
+        self.repl.scroll_offset += len(screen) - self.repl.height
+        self.assert_paint_ignoring_formatting(screen[1:], (3, 4))
+
+        self.repl.request_paint_to_clear_screen = True
+        screen = [u'2',
                   u'>>> 2 + 2',
                   u'4',
                   u'>>> ',
                   u'', u'', u'',
                   u'STATUS_BAR                      ']
-        self.assert_paint_ignoring_formatting(screen, (0, 4))
+        self.assert_paint_ignoring_formatting(screen, (3, 4))
