diff options
Diffstat (limited to 'tests/window_contents.rs')
| -rw-r--r-- | tests/window_contents.rs | 186 |
1 files changed, 36 insertions, 150 deletions
diff --git a/tests/window_contents.rs b/tests/window_contents.rs index 352ffd5..39c8ad7 100644 --- a/tests/window_contents.rs +++ b/tests/window_contents.rs @@ -1,18 +1,18 @@ -#![allow(clippy::cognitive_complexity)] +mod helpers; use std::io::Read as _; #[test] fn formatted() { let mut parser = vt100::Parser::default(); - compare_formatted(parser.screen()); + helpers::contents_formatted_reproduces_screen(parser.screen()); assert_eq!( parser.screen().contents_formatted(), b"\x1b[?25h\x1b[m\x1b[H\x1b[J" ); parser.process(b"foobar"); - compare_formatted(parser.screen()); + helpers::contents_formatted_reproduces_screen(parser.screen()); assert!(!parser.screen().cell(0, 2).unwrap().bold()); assert!(!parser.screen().cell(0, 3).unwrap().bold()); assert!(!parser.screen().cell(0, 4).unwrap().bold()); @@ -23,7 +23,7 @@ fn formatted() { ); parser.process(b"\x1b[1;4H\x1b[1;7m\x1b[33mb"); - compare_formatted(parser.screen()); + helpers::contents_formatted_reproduces_screen(parser.screen()); assert!(!parser.screen().cell(0, 2).unwrap().bold()); assert!(parser.screen().cell(0, 3).unwrap().bold()); assert!(!parser.screen().cell(0, 4).unwrap().bold()); @@ -34,7 +34,7 @@ fn formatted() { ); parser.process(b"\x1b[1;5H\x1b[22;42ma"); - compare_formatted(parser.screen()); + helpers::contents_formatted_reproduces_screen(parser.screen()); assert!(!parser.screen().cell(0, 2).unwrap().bold()); assert!(parser.screen().cell(0, 3).unwrap().bold()); assert!(!parser.screen().cell(0, 4).unwrap().bold()); @@ -46,14 +46,14 @@ fn formatted() { ); parser.process(b"\x1b[1;6H\x1b[35mr\r\nquux"); - compare_formatted(parser.screen()); + helpers::contents_formatted_reproduces_screen(parser.screen()); assert_eq!( parser.screen().contents_formatted(), &b"\x1b[?25h\x1b[m\x1b[H\x1b[Jfoo\x1b[33;1;7mb\x1b[42;22ma\x1b[35mr\r\nquux"[..] ); parser.process(b"\x1b[2;1H\x1b[45mquux"); - compare_formatted(parser.screen()); + helpers::contents_formatted_reproduces_screen(parser.screen()); assert_eq!( parser.screen().contents_formatted(), &b"\x1b[?25h\x1b[m\x1b[H\x1b[Jfoo\x1b[33;1;7mb\x1b[42;22ma\x1b[35mr\r\n\x1b[45mquux"[..] @@ -61,7 +61,7 @@ fn formatted() { parser .process(b"\x1b[2;2H\x1b[38;2;123;213;231mu\x1b[38;5;254mu\x1b[39mx"); - compare_formatted(parser.screen()); + helpers::contents_formatted_reproduces_screen(parser.screen()); assert_eq!(parser.screen().contents_formatted(), &b"\x1b[?25h\x1b[m\x1b[H\x1b[Jfoo\x1b[33;1;7mb\x1b[42;22ma\x1b[35mr\r\n\x1b[45mq\x1b[38;2;123;213;231mu\x1b[38;5;254mu\x1b[39mx"[..]); } @@ -69,7 +69,7 @@ fn formatted() { fn empty_cells() { let mut parser = vt100::Parser::default(); parser.process(b"\x1b[5C\x1b[32m bar\x1b[H\x1b[31mfoo"); - compare_formatted(parser.screen()); + helpers::contents_formatted_reproduces_screen(parser.screen()); assert_eq!(parser.screen().contents(), "foo bar"); assert_eq!( parser.screen().contents_formatted(), @@ -181,9 +181,8 @@ fn rows() { String::new(), ] ); - assert_eq!( - screen1.rows_formatted(0, 80).collect::<Vec<Vec<u8>>>(), - vec![ + assert_eq!(screen1.rows_formatted(0, 80).collect::<Vec<Vec<u8>>>(), { + let x: Vec<Vec<u8>> = vec![ vec![], vec![], vec![], @@ -208,8 +207,9 @@ fn rows() { vec![], vec![], vec![], - ] - ); + ]; + x + }); assert_eq!( screen1.rows(5, 15).collect::<Vec<String>>(), vec![ @@ -239,9 +239,8 @@ fn rows() { String::new(), ] ); - assert_eq!( - screen1.rows_formatted(5, 15).collect::<Vec<Vec<u8>>>(), - vec![ + assert_eq!(screen1.rows_formatted(5, 15).collect::<Vec<Vec<u8>>>(), { + let x: Vec<Vec<u8>> = vec![ vec![], vec![], vec![], @@ -266,8 +265,9 @@ fn rows() { vec![], vec![], vec![], - ] - ); + ]; + x + }); parser .process(b"\x1b[31mfoo\x1b[10;10H\x1b[32mbar\x1b[20;20H\x1b[33mbaz"); @@ -459,25 +459,29 @@ fn diff_basic() { parser.process(b"\x1b[5C\x1b[32m bar"); let screen2 = parser.screen().clone(); assert_eq!(screen2.contents_diff(&screen1), b"\x1b[5C\x1b[32m bar"); - compare_diff(&screen1, &screen2, b""); + helpers::assert_contents_diff_reproduces_state_from_screens( + &screen1, &screen2, + ); parser.process(b"\x1b[H\x1b[31mfoo"); let screen3 = parser.screen().clone(); assert_eq!(screen3.contents_diff(&screen2), b"\x1b[H\x1b[31mfoo"); - compare_diff(&screen2, &screen3, b"\x1b[5C\x1b[32m bar"); + helpers::assert_contents_diff_reproduces_state_from_screens( + &screen2, &screen3, + ); parser.process(b"\x1b[1;7H\x1b[32mbaz"); let screen4 = parser.screen().clone(); assert_eq!(screen4.contents_diff(&screen3), b"\x1b[5C\x1b[32mz"); - compare_diff(&screen3, &screen4, b"\x1b[5C\x1b[32m bar\x1b[H\x1b[31mfoo"); + helpers::assert_contents_diff_reproduces_state_from_screens( + &screen3, &screen4, + ); parser.process(b"\x1b[1;8H\x1b[X"); let screen5 = parser.screen().clone(); assert_eq!(screen5.contents_diff(&screen4), b"\x1b[1;8H\x1b[X"); - compare_diff( - &screen4, - &screen5, - b"\x1b[5C\x1b[32m bar\x1b[H\x1b[31mfoo\x1b[1;7H\x1b[32mbaz", + helpers::assert_contents_diff_reproduces_state_from_screens( + &screen4, &screen5, ); } @@ -523,137 +527,19 @@ fn diff_crawl(i: usize) { let mut frame = vec![]; file.read_to_end(&mut frame).unwrap(); parser.process(&frame); - (frame.clone(), parser.screen().clone()) + parser.screen().clone() }) .collect(); - let mut all_frames: Vec<u8> = vec![]; for two_screens in screens.windows(2) { match two_screens { - [(prev_frame, prev_screen), (_, screen)] => { - all_frames.extend(prev_frame); - compare_diff(prev_screen, screen, &all_frames); + [prev_screen, screen] => { + helpers::assert_contents_diff_reproduces_state_from_screens( + prev_screen, + screen, + ); } _ => unreachable!(), } } } - -fn compare_formatted(screen: &vt100::Screen) { - let (rows, cols) = screen.size(); - let mut parser = vt100::Parser::new(rows, cols, 0); - let contents = screen.contents_formatted(); - parser.process(&contents); - compare_cells(screen, parser.screen()); -} - -fn compare_diff( - prev_screen: &vt100::Screen, - screen: &vt100::Screen, - prev_parsed: &[u8], -) { - let (rows, cols) = screen.size(); - let mut parser = vt100::Parser::new(rows, cols, 0); - parser.process(prev_parsed); - // need to reparse the formatted contents here in case we're in the middle - // of parsing an escape sequence, since applying the diff at that location - // directly won't work in that case - let contents = parser.screen().contents_formatted(); - let mut parser = vt100::Parser::new(rows, cols, 0); - parser.process(&contents); - compare_cells(parser.screen(), &prev_screen); - assert_eq!(parser.screen().hide_cursor(), prev_screen.hide_cursor()); - assert_eq!( - parser.screen().cursor_position(), - prev_screen.cursor_position() - ); - assert_eq!( - parser.screen().contents_formatted(), - prev_screen.contents_formatted() - ); - - parser.process(&screen.contents_diff(prev_screen)); - if parser.screen().contents_formatted() != screen.contents_formatted() { - use std::io::Write as _; - let mut prev_screen_file = - std::fs::File::create("prev_screen").unwrap(); - prev_screen_file - .write_all(&prev_screen.contents_formatted()) - .unwrap(); - let mut screen_file = std::fs::File::create("screen").unwrap(); - screen_file.write_all(&screen.contents_formatted()).unwrap(); - let mut diff_file = std::fs::File::create("diff").unwrap(); - diff_file - .write_all(&screen.contents_diff(prev_screen)) - .unwrap(); - } - compare_cells(parser.screen(), &screen); - assert_eq!(parser.screen().hide_cursor(), screen.hide_cursor()); - assert_eq!(parser.screen().cursor_position(), screen.cursor_position()); - assert_eq!( - parser.screen().contents_formatted(), - screen.contents_formatted() - ); -} - -fn compare_cells(screen1: &vt100::Screen, screen2: &vt100::Screen) { - assert_eq!(screen1.size(), screen2.size()); - let (rows, cols) = screen1.size(); - - for row in 0..rows { - for col in 0..cols { - let cell1 = screen1.cell(row, col).unwrap(); - let cell2 = screen2.cell(row, col).unwrap(); - - assert_eq!( - cell1.contents(), - cell2.contents(), - "cell at position ({},{}) had different contents", - row + 1, - col + 1 - ); - assert_eq!( - cell1.fgcolor(), - cell2.fgcolor(), - "cell at position ({},{}) had different fgcolor", - row + 1, - col + 1 - ); - assert_eq!( - cell1.bgcolor(), - cell2.bgcolor(), - "cell at position ({},{}) had different bgcolor", - row + 1, - col + 1 - ); - assert_eq!( - cell1.bold(), - cell2.bold(), - "cell at position ({},{}) had different bold", - row + 1, - col + 1 - ); - assert_eq!( - cell1.italic(), - cell2.italic(), - "cell at position ({},{}) had different italic", - row + 1, - col + 1 - ); - assert_eq!( - cell1.underline(), - cell2.underline(), - "cell at position ({},{}) had different underline", - row + 1, - col + 1 - ); - assert_eq!( - cell1.inverse(), - cell2.inverse(), - "cell at position ({},{}) had different inverse", - row + 1, - col + 1 - ); - } - } -} |