All screen tests pass with the new screen code

This commit is contained in:
Kovid Goyal
2016-11-13 22:23:28 +05:30
parent bfaaf41a9f
commit a734fb79e6
5 changed files with 61 additions and 16 deletions

View File

@@ -4,7 +4,6 @@
from unittest import TestCase
from kitty.screen import Screen as S
from kitty.fast_data_types import LineBuf, Cursor, Screen
@@ -30,10 +29,7 @@ class BaseTest(TestCase):
ae = TestCase.assertEqual
def create_screen(self, cols=5, lines=5, history_size=5):
return S(history_size, columns=cols, lines=lines)
def create_screen2(self, cols=5, lines=5):
def create_screen(self, cols=5, lines=5):
return Screen(None, lines, cols)
def assertEqualAttributes(self, c1, c2):

View File

@@ -10,7 +10,7 @@ from kitty.fast_data_types import DECAWM, IRM, Cursor
class TestScreen(BaseTest):
def test_draw_fast(self):
s = self.create_screen2()
s = self.create_screen()
# Test in line-wrap, non-insert mode
s.draw(b'a' * 5)
@@ -55,7 +55,7 @@ class TestScreen(BaseTest):
def test_draw_char(self):
# Test in line-wrap, non-insert mode
s = self.create_screen2()
s = self.create_screen()
s.draw('ココx'.encode('utf-8'))
self.ae(str(s.line(0)), 'ココx')
self.ae(tuple(map(s.line(0).width, range(5))), (2, 0, 2, 0, 1))
@@ -103,7 +103,7 @@ class TestScreen(BaseTest):
self.assertChanges(s, ignore='cursor', cells={4: ((0, 4),)})
def test_char_manipulation(self):
s = self.create_screen2()
s = self.create_screen()
def init():
s.reset(), s.reset_dirty()
@@ -170,7 +170,7 @@ class TestScreen(BaseTest):
self.ae((False, False, False, False, False), tuple(map(lambda i: s.line(0).cursor_from(i).bold, range(5))))
def test_erase_in_screen(self):
s = self.create_screen2()
s = self.create_screen()
def init():
s.reset()