diff options
| author | Jesse Luehrs <doy@tozt.net> | 2019-11-11 15:36:46 -0500 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2019-11-11 15:49:00 -0500 |
| commit | 30c8ad23f51a8bdc067e3a76da7004ba5be8682f (patch) | |
| tree | f4c9d8da7468b53df99079b9ee14ea06943d7f2c /tests | |
| parent | 6203def48a689e30677a63b03d755aa0740e6e18 (diff) | |
| download | vt100-rust-30c8ad23f51a8bdc067e3a76da7004ba5be8682f.tar.gz vt100-rust-30c8ad23f51a8bdc067e3a76da7004ba5be8682f.zip | |
optimize erases a bit more
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/csi.rs | 34 | ||||
| -rw-r--r-- | tests/text.rs | 4 | ||||
| -rw-r--r-- | tests/window_contents.rs | 2 |
3 files changed, 12 insertions, 28 deletions
diff --git a/tests/csi.rs b/tests/csi.rs index a57a578..1129ee1 100644 --- a/tests/csi.rs +++ b/tests/csi.rs @@ -209,10 +209,8 @@ fn ed() { assert_eq!( parser.screen().contents_formatted(), format!( - "\x1b[?25h\x1b[m\x1b[H\x1b[J\x1b[5;5H\x1b[41m{}\x1b[X\r\n{}{}\x1b[X\x1b[5;5H", - "\x1b[X\x1b[C".repeat(75), - format!("{}\x1b[X\r\n", "\x1b[X\x1b[C".repeat(79)).repeat(18), - "\x1b[X\x1b[C".repeat(79), + "\x1b[?25h\x1b[m\x1b[H\x1b[J\x1b[5;5H\x1b[41m{}\x1b[K\x1b[5;5H", + "\x1b[K\r\n".repeat(19), ) .as_bytes() ); @@ -259,9 +257,8 @@ fn ed() { assert_eq!( parser.screen().contents_formatted(), format!( - "\x1b[?25h\x1b[m\x1b[H\x1b[J\x1b[41m{}{}\x1b[X", - format!("{}\x1b[X\r\n", "\x1b[X\x1b[C".repeat(79)).repeat(4), - "\x1b[X\x1b[C".repeat(4), + "\x1b[?25h\x1b[m\x1b[H\x1b[J\x1b[41m{}\x1b[5X\x1b[4C", + "\x1b[K\r\n".repeat(4), ) .as_bytes() ); @@ -308,9 +305,8 @@ fn ed() { assert_eq!( parser.screen().contents_formatted(), format!( - "\x1b[?25h\x1b[m\x1b[H\x1b[J\x1b[41m{}{}\x1b[5;5H", - format!("{}\x1b[X\r\n", "\x1b[X\x1b[C".repeat(79)).repeat(23), - format!("{}\x1b[X", "\x1b[X\x1b[C".repeat(79)), + "\x1b[?25h\x1b[m\x1b[H\x1b[J\x1b[41m{}\x1b[K\x1b[5;5H", + "\x1b[K\r\n".repeat(23), ) .as_bytes() ); @@ -421,11 +417,7 @@ fn el() { ); assert_eq!( parser.screen().contents_formatted(), - format!( - "\x1b[?25h\x1b[m\x1b[H\x1b[J\x1b[5;5H\x1b[41m{}\x1b[X\x1b[5;5H", - "\x1b[X\x1b[C".repeat(75) - ) - .as_bytes() + &b"\x1b[?25h\x1b[m\x1b[H\x1b[J\x1b[5;5H\x1b[41m\x1b[K"[..], ); parser.process(b"\x1bc\x1b[5;5H"); @@ -461,11 +453,7 @@ fn el() { ); assert_eq!( parser.screen().contents_formatted(), - format!( - "\x1b[?25h\x1b[m\x1b[H\x1b[J\x1b[5;1H\x1b[41m{}\x1b[X", - "\x1b[X\x1b[C".repeat(4), - ) - .as_bytes() + &b"\x1b[?25h\x1b[m\x1b[H\x1b[J\x1b[5;1H\x1b[41m\x1b[5X\x1b[4C"[..], ); parser.process(b"\x1bc\x1b[5;5H"); @@ -501,11 +489,7 @@ fn el() { ); assert_eq!( parser.screen().contents_formatted(), - format!( - "\x1b[?25h\x1b[m\x1b[H\x1b[J\x1b[5;1H\x1b[41m{}\x1b[X\x1b[5;5H", - "\x1b[X\x1b[C".repeat(79), - ) - .as_bytes() + &b"\x1b[?25h\x1b[m\x1b[H\x1b[J\x1b[5;1H\x1b[41m\x1b[K\x1b[4C"[..], ); } diff --git a/tests/text.rs b/tests/text.rs index c49ded4..e0b4cee 100644 --- a/tests/text.rs +++ b/tests/text.rs @@ -100,7 +100,7 @@ fn wide() { ); assert_eq!( parser.screen().contents_diff(&screen), - "\x1b[Hデcネfo\x1b[Cbar\x1b[X".as_bytes() + "\x1b[Hデcネfo\x1b[Cbar\x1b[K".as_bytes() ); let screen = parser.screen().clone(); @@ -126,7 +126,7 @@ fn wide() { ); assert_eq!( parser.screen().contents_diff(&screen), - "\x1b[Hデcネfo\x1b[Cbar\x1b[X".as_bytes() + "\x1b[Hデcネfo\x1b[Cbar\x1b[K".as_bytes() ); } diff --git a/tests/window_contents.rs b/tests/window_contents.rs index 161402e..1bad9ed 100644 --- a/tests/window_contents.rs +++ b/tests/window_contents.rs @@ -106,7 +106,7 @@ fn cursor_positioning() { parser.screen().contents_formatted(), b"\x1b[?25h\x1b[m\x1b[H\x1b[J:" ); - assert_eq!(parser.screen().contents_diff(&screen3), b"\x1b[1;2H\x1b[X"); + assert_eq!(parser.screen().contents_diff(&screen3), b"\x1b[1;2H\x1b[K"); } #[test] |