From d79e96ca09562b07d40fc39d14938967ab908a64 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sun, 3 Nov 2019 14:45:43 -0500 Subject: rename some methods --- tests/csi.rs | 116 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 58 insertions(+), 58 deletions(-) (limited to 'tests/csi.rs') diff --git a/tests/csi.rs b/tests/csi.rs index 5dcd88c..5177100 100644 --- a/tests/csi.rs +++ b/tests/csi.rs @@ -92,142 +92,142 @@ fn relative_movement() { fn ed() { let mut screen = vt100::Screen::new(24, 80); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); screen.process(b"foo\x1b[5;5Hbar\x1b[10;10Hbaz\x1b[20;20Hquux"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); screen.process(b"\x1b[10;12H\x1b[0J"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); screen.process(b"\x1b[5;6H\x1b[1J"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n r\n\n\n\n\n ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); screen.process(b"\x1b[7;7H\x1b[2J"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); screen.process(b"\x1b[2J\x1b[H"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); screen.process(b"foo\x1b[5;5Hbar\x1b[10;10Hbaz\x1b[20;20Hquux"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); screen.process(b"\x1b[10;12H\x1b[J"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); screen.process(b"\x1b[2J\x1b[H"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); screen.process(b"foo\x1b[5;5Hbar\x1b[10;10Hbaz\x1b[20;20Hquux"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); screen.process(b"\x1b[10;12H\x1b[?0J"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); screen.process(b"\x1b[5;6H\x1b[?1J"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n r\n\n\n\n\n ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); screen.process(b"\x1b[7;7H\x1b[?2J"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); screen.process(b"\x1b[2J\x1b[H"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); screen.process(b"foo\x1b[5;5Hbar\x1b[10;10Hbaz\x1b[20;20Hquux"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); screen.process(b"\x1b[10;12H\x1b[?J"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n ba\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); } #[test] fn el() { let mut screen = vt100::Screen::new(24, 80); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); screen.process(b"foo\x1b[5;5Hbarbar\x1b[10;10Hbazbaz\x1b[20;20Hquux"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n barbar\n\n\n\n\n bazbaz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n barbar\n\n\n\n\n bazbaz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); screen.process(b"\x1b[5;8H\x1b[0K"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n bazbaz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n bazbaz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); screen.process(b"\x1b[10;12H\x1b[1K"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); screen.process(b"\x1b[20;22H\x1b[2K"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); screen.process(b"\x1b[1;2H\x1b[K"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "f\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "f\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); screen.process(b"\x1b[2J\x1b[H"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); screen.process(b"foo\x1b[5;5Hbarbar\x1b[10;10Hbazbaz\x1b[20;20Hquux"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n barbar\n\n\n\n\n bazbaz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n barbar\n\n\n\n\n bazbaz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); screen.process(b"\x1b[5;8H\x1b[?0K"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n bazbaz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n bazbaz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); screen.process(b"\x1b[10;12H\x1b[?1K"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n quux\n\n\n\n\n"); screen.process(b"\x1b[20;22H\x1b[?2K"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "foo\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); screen.process(b"\x1b[1;2H\x1b[?K"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "f\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "f\n\n\n\n bar\n\n\n\n\n baz\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); screen.process(b"\x1b[2J\x1b[H"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); screen.process(b"1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); screen.process(b"\x1b[1;21H\x1b[K"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "12345678901234567890\n12345678901234567890\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); screen.process(b"\x1b[1;10H\x1b[1K"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), " 1234567890\n12345678901234567890\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); } @@ -236,75 +236,75 @@ fn el() { fn ich_dch_ech() { let mut screen = vt100::Screen::new(24, 80); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); screen.process(b"\x1b[10;10Hfoobar"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); screen.process(b"\x1b[10;12H\x1b[3@"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n fo obar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); assert_eq!(screen.cursor_position(), (9, 11)); screen.process(b"\x1b[4P"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n fobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); assert_eq!(screen.cursor_position(), (9, 11)); screen.process(b"\x1b[100@"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n fo\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); assert_eq!(screen.cursor_position(), (9, 11)); screen.process(b"obar"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); assert_eq!(screen.cursor_position(), (9, 15)); screen.process(b"\x1b[10;12H\x1b[100P"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n fo\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); assert_eq!(screen.cursor_position(), (9, 11)); screen.process(b"obar"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); assert_eq!(screen.cursor_position(), (9, 15)); screen.process(b"\x1b[10;13H\x1b[X"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n foo ar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); assert_eq!(screen.cursor_position(), (9, 12)); screen.process(b"\x1b[10;11H\x1b[4X"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n f r\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); assert_eq!(screen.cursor_position(), (9, 10)); screen.process(b"\x1b[10;11H\x1b[400X"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n f\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); assert_eq!(screen.cursor_position(), (9, 10)); @@ -314,62 +314,62 @@ fn ich_dch_ech() { fn il_dl() { let mut screen = vt100::Screen::new(24, 80); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); screen.process(b"\x1b[10;10Hfoobar\x1b[3D"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); assert_eq!(screen.cursor_position(), (9, 12)); screen.process(b"\x1b[L"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n\n foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); assert_eq!(screen.cursor_position(), (9, 12)); screen.process(b"\x1b[3L"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n\n\n\n\n foobar\n\n\n\n\n\n\n\n\n\n\n" ); assert_eq!(screen.cursor_position(), (9, 12)); screen.process(b"\x1b[500L"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); assert_eq!(screen.cursor_position(), (9, 12)); screen.process(b"\x1b[10;10Hfoobar\x1b[3D\x1b[6A"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); assert_eq!(screen.cursor_position(), (3, 12)); screen.process(b"\x1b[M"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); assert_eq!(screen.cursor_position(), (3, 12)); screen.process(b"\x1b[3M"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n foobar\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); assert_eq!(screen.cursor_position(), (3, 12)); screen.process(b"\x1b[500M"); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); assert_eq!(screen.cursor_position(), (3, 12)); @@ -379,29 +379,29 @@ fn il_dl() { fn scroll() { let mut screen = vt100::Screen::new(24, 80); assert_eq!( - screen.window_contents(0, 0, 23, 79), + screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" ); screen.process(b"1\r\n2\r\n3\r\n4\r\n5\r\n6\r\n7\r\n8\r\n9\r\n10\r\n11\r\n12\r\n13\r\n14\r\n15\r\n16\r\n17\r\n18\r\n19\r\n20\r\n21\r\n22\r\n23\r\n24"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n"); screen.process(b"\x1b[15;15H"); assert_eq!(screen.cursor_position(), (14, 14)); screen.process(b"\x1b[S"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n"); assert_eq!(screen.cursor_position(), (14, 14)); screen.process(b"\x1b[3S"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n\n\n\n"); assert_eq!(screen.cursor_position(), (14, 14)); screen.process(b"\x1b[T"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n\n\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n23\n24\n\n\n\n"); assert_eq!(screen.cursor_position(), (14, 14)); screen.process(b"\x1b[5T"); - assert_eq!(screen.window_contents(0, 0, 23, 79), "\n\n\n\n\n\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n"); + assert_eq!(screen.contents(0, 0, 23, 79), "\n\n\n\n\n\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20\n21\n22\n"); assert_eq!(screen.cursor_position(), (14, 14)); } -- cgit v1.2.3-54-g00ecf