From ea55c107307ef8bca11accc09ff2c47c74745cb1 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Mon, 4 Nov 2019 00:49:21 -0500 Subject: more useful contents/contents_formatted behavior --- tests/mode.rs | 52 ++++++++++++++-------------------------------------- 1 file changed, 14 insertions(+), 38 deletions(-) (limited to 'tests/mode.rs') diff --git a/tests/mode.rs b/tests/mode.rs index be6ad6d..0cca4b7 100644 --- a/tests/mode.rs +++ b/tests/mode.rs @@ -303,98 +303,74 @@ fn alternate_buffer() { // 47 screen.process(b"\x1bc"); - assert_eq!( - 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.contents(0, 0, 23, 79), ""); assert_eq!(screen.cursor_position(), (0, 0)); assert!(!screen.alternate_screen()); screen.process(b"\x1b[m\x1b[2J\x1b[H1\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.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"); assert_eq!(screen.cursor_position(), (23, 2)); assert!(!screen.alternate_screen()); screen.process(b"\x1b[?47h"); - assert_eq!( - 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.contents(0, 0, 23, 79), ""); assert_eq!(screen.cursor_position(), (0, 0)); assert!(screen.alternate_screen()); screen.process(b"foobar"); - assert_eq!( - screen.contents(0, 0, 23, 79), - "foobar\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.contents(0, 0, 23, 79), "foobar"); assert_eq!(screen.cursor_position(), (0, 6)); assert!(screen.alternate_screen()); screen.process(b"\x1b[?47l"); - 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"); + 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"); assert_eq!(screen.cursor_position(), (23, 2)); assert!(!screen.alternate_screen()); screen.process(b"\x1b[?47h"); - assert_eq!( - screen.contents(0, 0, 23, 79), - "foobar\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.contents(0, 0, 23, 79), "foobar"); assert_eq!(screen.cursor_position(), (0, 6)); assert!(screen.alternate_screen()); screen.process(b"\x1b[?47l"); - 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"); + 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"); assert_eq!(screen.cursor_position(), (23, 2)); assert!(!screen.alternate_screen()); // 1049 screen.process(b"\x1bc"); - assert_eq!( - 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.contents(0, 0, 23, 79), ""); assert_eq!(screen.cursor_position(), (0, 0)); assert!(!screen.alternate_screen()); screen.process(b"\x1b[m\x1b[2J\x1b[H1\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.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"); assert_eq!(screen.cursor_position(), (23, 2)); assert!(!screen.alternate_screen()); screen.process(b"\x1b[?1049h"); - assert_eq!( - 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.contents(0, 0, 23, 79), ""); assert_eq!(screen.cursor_position(), (0, 0)); assert!(screen.alternate_screen()); screen.process(b"foobar"); - assert_eq!( - screen.contents(0, 0, 23, 79), - "foobar\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.contents(0, 0, 23, 79), "foobar"); assert_eq!(screen.cursor_position(), (0, 6)); assert!(screen.alternate_screen()); screen.process(b"\x1b[?1049l"); - 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"); + 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"); assert_eq!(screen.cursor_position(), (23, 2)); assert!(!screen.alternate_screen()); screen.process(b"\x1b[?1049h"); - assert_eq!( - 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.contents(0, 0, 23, 79), ""); assert_eq!(screen.cursor_position(), (0, 0)); assert!(screen.alternate_screen()); screen.process(b"\x1b[?1049l"); - 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"); + 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"); assert_eq!(screen.cursor_position(), (23, 2)); assert!(!screen.alternate_screen()); } -- cgit v1.2.3-54-g00ecf