diff options
author | Jesse Luehrs <doy@tozt.net> | 2019-11-09 02:23:54 -0500 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2019-11-09 14:58:57 -0500 |
commit | 5970f3f473b915f61f8306263c15c70e2f962f7c (patch) | |
tree | 024f74a8629b475c68244ce0c4e38b5997cf532d /tests | |
parent | dc09dd29d0fe6741b17de3767cfc675c366fb1a4 (diff) | |
download | vt100-rust-5970f3f473b915f61f8306263c15c70e2f962f7c.tar.gz vt100-rust-5970f3f473b915f61f8306263c15c70e2f962f7c.zip |
refactor terminal writing
Diffstat (limited to 'tests')
-rw-r--r-- | tests/text.rs | 12 | ||||
-rw-r--r-- | tests/window_contents.rs | 17 |
2 files changed, 13 insertions, 16 deletions
diff --git a/tests/text.rs b/tests/text.rs index 245a87f..5c16039 100644 --- a/tests/text.rs +++ b/tests/text.rs @@ -64,7 +64,7 @@ fn wide() { ); assert_eq!( parser.screen().contents_diff(&screen), - "\x1b[m\x1b[1;1Haデbネ".as_bytes() + "\x1b[m\x1b[Haデbネ".as_bytes() ); let screen = parser.screen().clone(); @@ -77,7 +77,7 @@ fn wide() { ); assert_eq!( parser.screen().contents_diff(&screen), - "\x1b[m\x1b[1;1H\x1b[3Cc".as_bytes() + "\x1b[m\x1b[H\x1b[3Cc".as_bytes() ); let screen = parser.screen().clone(); @@ -90,7 +90,7 @@ fn wide() { ); assert_eq!( parser.screen().contents_diff(&screen), - "\x1b[m\x1b[1;1H\x1b[6Cfoobar".as_bytes() + "\x1b[m\x1b[H\x1b[6Cfoobar".as_bytes() ); let screen = parser.screen().clone(); @@ -103,7 +103,7 @@ fn wide() { ); assert_eq!( parser.screen().contents_diff(&screen), - "\x1b[m\x1b[1;1Hデcネfo\x1b[1Cbar\x1b[X\x1b[C\x1b[1;12H".as_bytes() + "\x1b[m\x1b[Hデcネfo\x1b[Cbar\x1b[X\x1b[C\x1b[1;12H".as_bytes() ); let screen = parser.screen().clone(); @@ -116,7 +116,7 @@ fn wide() { ); assert_eq!( parser.screen().contents_diff(&screen), - "\x1b[m\x1b[1;1Haデcネf\x1b[1Cobar".as_bytes() + "\x1b[m\x1b[Haデcネf\x1b[Cobar".as_bytes() ); let screen = parser.screen().clone(); @@ -129,7 +129,7 @@ fn wide() { ); assert_eq!( parser.screen().contents_diff(&screen), - "\x1b[m\x1b[1;1Hデcネfo\x1b[1Cbar\x1b[X\x1b[C\x1b[1;12H".as_bytes() + "\x1b[m\x1b[Hデcネfo\x1b[Cbar\x1b[X\x1b[C\x1b[1;12H".as_bytes() ); } diff --git a/tests/window_contents.rs b/tests/window_contents.rs index 851b128..6c0e7db 100644 --- a/tests/window_contents.rs +++ b/tests/window_contents.rs @@ -87,7 +87,7 @@ fn cursor_positioning() { parser.screen().contents_formatted(), b"\x1b[?25h\x1b[m\x1b[H\x1b[J:" ); - assert_eq!(parser.screen().contents_diff(&screen1), b"\x1b[m\x1b[1;1H:"); + assert_eq!(parser.screen().contents_diff(&screen1), b"\x1b[m\x1b[H:"); parser.process(b"a"); let screen3 = parser.screen().clone(); @@ -98,7 +98,7 @@ fn cursor_positioning() { ); assert_eq!( parser.screen().contents_diff(&screen2), - b"\x1b[m\x1b[1;1H\x1b[1Ca" + b"\x1b[m\x1b[H\x1b[Ca" ); parser.process(b"\x1b[1;2H\x1b[K"); @@ -109,7 +109,7 @@ fn cursor_positioning() { ); assert_eq!( parser.screen().contents_diff(&screen3), - b"\x1b[m\x1b[1;1H\x1b[1C\x1b[X\x1b[C\x1b[1;2H" + b"\x1b[m\x1b[H\x1b[C\x1b[X\x1b[C\x1b[1;2H" ); } @@ -429,23 +429,20 @@ fn diff() { let screen2 = parser.screen().clone(); assert_eq!( screen2.contents_diff(&screen1), - b"\x1b[m\x1b[1;1H\x1b[5C\x1b[32m bar" + b"\x1b[m\x1b[H\x1b[5C\x1b[32m bar" ); compare_diff(&screen1, &screen2, b""); parser.process(b"\x1b[H\x1b[31mfoo"); let screen3 = parser.screen().clone(); - assert_eq!( - screen3.contents_diff(&screen2), - b"\x1b[m\x1b[1;1H\x1b[31mfoo" - ); + assert_eq!(screen3.contents_diff(&screen2), b"\x1b[m\x1b[H\x1b[31mfoo"); compare_diff(&screen2, &screen3, b"\x1b[5C\x1b[32m bar"); parser.process(b"\x1b[1;7H\x1b[32mbaz"); let screen4 = parser.screen().clone(); assert_eq!( screen4.contents_diff(&screen3), - b"\x1b[m\x1b[1;1H\x1b[8C\x1b[32mz" + b"\x1b[m\x1b[H\x1b[8C\x1b[32mz" ); compare_diff(&screen3, &screen4, b"\x1b[5C\x1b[32m bar\x1b[H\x1b[31mfoo"); @@ -453,7 +450,7 @@ fn diff() { let screen5 = parser.screen().clone(); assert_eq!( screen5.contents_diff(&screen4), - b"\x1b[m\x1b[1;1H\x1b[7C\x1b[X\x1b[C\x1b[1;8H" + b"\x1b[m\x1b[H\x1b[7C\x1b[X\x1b[C\x1b[1;8H" ); compare_diff( &screen4, |