From 4afd275b89be802582e1b4dd665411e18f30336d Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Wed, 22 Oct 2014 11:35:50 -0400 Subject: rename a bunch of methods --- t/text_test.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 't/text_test.py') diff --git a/t/text_test.py b/t/text_test.py index 6a3add0..3e4c767 100644 --- a/t/text_test.py +++ b/t/text_test.py @@ -9,8 +9,8 @@ class TextTest(VT100Test): assert self.vt.cell(0, 2).contents() == "o" assert self.vt.cell(0, 3).contents() == "" assert self.vt.cell(1, 0).contents() == "" - assert self.vt.get_string_plaintext(0, 0, 23, 79) == 'foo' + ('\n' * 24) - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'foo' + ('\n' * 24) + assert self.vt.window_contents(0, 0, 23, 79) == 'foo' + ('\n' * 24) + assert self.vt.window_contents(0, 0, 500, 500) == 'foo' + ('\n' * 24) def test_utf8(self): self.process("café") @@ -20,8 +20,8 @@ class TextTest(VT100Test): assert self.vt.cell(0, 3).contents() == u"é" assert self.vt.cell(0, 4).contents() == "" assert self.vt.cell(1, 0).contents() == "" - assert self.vt.get_string_plaintext(0, 0, 23, 79) == u'café' + ('\n' * 24) - assert self.vt.get_string_plaintext(0, 0, 500, 500) == u'café' + ('\n' * 24) + assert self.vt.window_contents(0, 0, 23, 79) == u'café' + ('\n' * 24) + assert self.vt.window_contents(0, 0, 500, 500) == u'café' + ('\n' * 24) def test_newlines(self): self.process("f\r\noo\r\nood") @@ -36,8 +36,8 @@ class TextTest(VT100Test): assert self.vt.cell(2, 2).contents() == "d" assert self.vt.cell(0, 3).contents() == "" assert self.vt.cell(3, 0).contents() == "" - assert self.vt.get_string_plaintext(0, 0, 23, 79) == 'f\noo\nood' + ('\n' * 22) - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'f\noo\nood' + ('\n' * 22) + assert self.vt.window_contents(0, 0, 23, 79) == 'f\noo\nood' + ('\n' * 22) + assert self.vt.window_contents(0, 0, 500, 500) == 'f\noo\nood' + ('\n' * 22) def test_wide(self): self.process("aデbネ") @@ -49,9 +49,9 @@ class TextTest(VT100Test): assert self.vt.cell(0, 5).contents() == "" assert self.vt.cell(0, 6).contents() == "" assert self.vt.cell(1, 0).contents() == "" - print(self.vt.get_string_plaintext(0, 0, 0, 50)) - assert self.vt.get_string_plaintext(0, 0, 23, 79) == u'aデbネ' + ('\n' * 24) - assert self.vt.get_string_plaintext(0, 0, 500, 500) == u'aデbネ' + ('\n' * 24) + print(self.vt.window_contents(0, 0, 0, 50)) + assert self.vt.window_contents(0, 0, 23, 79) == u'aデbネ' + ('\n' * 24) + assert self.vt.window_contents(0, 0, 500, 500) == u'aデbネ' + ('\n' * 24) def test_combining(self): self.process("a") @@ -59,9 +59,9 @@ class TextTest(VT100Test): self.process(u"\u0301".encode('utf-8')) assert self.vt.cell(0, 0).contents() == u"á" self.process("\033[20;20Habcdefg") - assert self.vt.get_string_plaintext(19, 19, 19, 26) == "abcdefg" + assert self.vt.window_contents(19, 19, 19, 26) == "abcdefg" self.process(u"\033[20;25H\u0301".encode('utf-8')) - assert self.vt.get_string_plaintext(19, 19, 19, 26) == u"abcdéfg" + assert self.vt.window_contents(19, 19, 19, 26) == u"abcdéfg" self.process("\033[10;78Haaa") assert self.vt.cell(9, 79).contents() == "a" self.process(u"\r\n\u0301".encode('utf-8')) @@ -70,7 +70,7 @@ class TextTest(VT100Test): def test_wrap(self): self.process("0123456789" * 10) - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("0123456789" * 10) + ("\n" * 23) + assert self.vt.window_contents(0, 0, 500, 500) == ("0123456789" * 10) + ("\n" * 23) self.process("\033[5H" + "0123456789" * 8) self.process("\033[6H" + "0123456789" * 8) - assert self.vt.get_string_plaintext(0, 0, 500, 500) == ("0123456789" * 10) + ("\n" * 3) + ("0123456789" * 8) + "\n" + ("0123456789" * 8) + ("\n" * 19) + assert self.vt.window_contents(0, 0, 500, 500) == ("0123456789" * 10) + ("\n" * 3) + ("0123456789" * 8) + "\n" + ("0123456789" * 8) + ("\n" * 19) -- cgit v1.2.3-54-g00ecf