diff options
Diffstat (limited to 'alacritty_terminal/src/grid/tests.rs')
| -rw-r--r-- | alacritty_terminal/src/grid/tests.rs | 242 |
1 files changed, 120 insertions, 122 deletions
diff --git a/alacritty_terminal/src/grid/tests.rs b/alacritty_terminal/src/grid/tests.rs index 269ab636..49cf1a76 100644 --- a/alacritty_terminal/src/grid/tests.rs +++ b/alacritty_terminal/src/grid/tests.rs @@ -22,49 +22,15 @@ impl GridCell for usize { } } -#[test] -fn grid_clamp_buffer_point() { - let mut grid = Grid::<usize>::new(Line(10), Column(10), 1_000); - grid.display_offset = 5; - - let point = grid.clamp_buffer_to_visible(Point::new(10, Column(3))); - assert_eq!(point, Point::new(Line(4), Column(3))); - - let point = grid.clamp_buffer_to_visible(Point::new(15, Column(3))); - assert_eq!(point, Point::new(Line(0), Column(0))); - - let point = grid.clamp_buffer_to_visible(Point::new(4, Column(3))); - assert_eq!(point, Point::new(Line(9), Column(9))); - - grid.display_offset = 0; - - let point = grid.clamp_buffer_to_visible(Point::new(4, Column(3))); - assert_eq!(point, Point::new(Line(5), Column(3))); -} - -#[test] -fn visible_to_buffer() { - let mut grid = Grid::<usize>::new(Line(10), Column(10), 1_000); - grid.display_offset = 5; - - let point = grid.visible_to_buffer(Point::new(Line(4), Column(3))); - assert_eq!(point, Point::new(10, Column(3))); - - grid.display_offset = 0; - - let point = grid.visible_to_buffer(Point::new(Line(5), Column(3))); - assert_eq!(point, Point::new(4, Column(3))); -} - // Scroll up moves lines upward. #[test] fn scroll_up() { - let mut grid = Grid::<usize>::new(Line(10), Column(1), 0); + let mut grid = Grid::<usize>::new(10, 1, 0); for i in 0..10 { - grid[Line(i)][Column(0)] = i; + grid[Line(i as i32)][Column(0)] = i; } - grid.scroll_up::<usize>(&(Line(0)..Line(10)), Line(2)); + grid.scroll_up::<usize>(&(Line(0)..Line(10)), 2); assert_eq!(grid[Line(0)][Column(0)], 2); assert_eq!(grid[Line(0)].occ, 1); @@ -91,12 +57,44 @@ fn scroll_up() { // Scroll down moves lines downward. #[test] fn scroll_down() { - let mut grid = Grid::<usize>::new(Line(10), Column(1), 0); + let mut grid = Grid::<usize>::new(10, 1, 0); + for i in 0..10 { + grid[Line(i as i32)][Column(0)] = i; + } + + grid.scroll_down::<usize>(&(Line(0)..Line(10)), 2); + + assert_eq!(grid[Line(0)][Column(0)], 0); // was 8. + assert_eq!(grid[Line(0)].occ, 0); + assert_eq!(grid[Line(1)][Column(0)], 0); // was 9. + assert_eq!(grid[Line(1)].occ, 0); + assert_eq!(grid[Line(2)][Column(0)], 0); + assert_eq!(grid[Line(2)].occ, 1); + assert_eq!(grid[Line(3)][Column(0)], 1); + assert_eq!(grid[Line(3)].occ, 1); + assert_eq!(grid[Line(4)][Column(0)], 2); + assert_eq!(grid[Line(4)].occ, 1); + assert_eq!(grid[Line(5)][Column(0)], 3); + assert_eq!(grid[Line(5)].occ, 1); + assert_eq!(grid[Line(6)][Column(0)], 4); + assert_eq!(grid[Line(6)].occ, 1); + assert_eq!(grid[Line(7)][Column(0)], 5); + assert_eq!(grid[Line(7)].occ, 1); + assert_eq!(grid[Line(8)][Column(0)], 6); + assert_eq!(grid[Line(8)].occ, 1); + assert_eq!(grid[Line(9)][Column(0)], 7); + assert_eq!(grid[Line(9)].occ, 1); +} + +#[test] +fn scroll_down_with_history() { + let mut grid = Grid::<usize>::new(10, 1, 1); + grid.increase_scroll_limit(1); for i in 0..10 { - grid[Line(i)][Column(0)] = i; + grid[Line(i as i32)][Column(0)] = i; } - grid.scroll_down::<usize>(&(Line(0)..Line(10)), Line(2)); + grid.scroll_down::<usize>(&(Line(0)..Line(10)), 2); assert_eq!(grid[Line(0)][Column(0)], 0); // was 8. assert_eq!(grid[Line(0)].occ, 0); @@ -127,19 +125,19 @@ fn test_iter() { assert_eq!(Some(&value), indexed.map(|indexed| indexed.cell)); }; - let mut grid = Grid::<usize>::new(Line(5), Column(5), 0); + let mut grid = Grid::<usize>::new(5, 5, 0); for i in 0..5 { for j in 0..5 { - grid[Line(i)][Column(j)] = i * 5 + j; + grid[Line(i)][Column(j)] = i as usize * 5 + j; } } - let mut iter = grid.iter_from(Point::new(4, Column(0))); + let mut iter = grid.iter_from(Point::new(Line(0), Column(0))); assert_eq!(None, iter.prev()); assert_indexed(1, iter.next()); assert_eq!(Column(1), iter.point().column); - assert_eq!(4, iter.point().line); + assert_eq!(0, iter.point().line); assert_indexed(2, iter.next()); assert_indexed(3, iter.next()); @@ -148,139 +146,139 @@ fn test_iter() { // Test line-wrapping. assert_indexed(5, iter.next()); assert_eq!(Column(0), iter.point().column); - assert_eq!(3, iter.point().line); + assert_eq!(1, iter.point().line); assert_indexed(4, iter.prev()); assert_eq!(Column(4), iter.point().column); - assert_eq!(4, iter.point().line); + assert_eq!(0, iter.point().line); // Make sure iter.cell() returns the current iterator position. assert_eq!(&4, iter.cell()); // Test that iter ends at end of grid. - let mut final_iter = grid.iter_from(Point { line: 0, column: Column(4) }); + let mut final_iter = grid.iter_from(Point { line: Line(4), column: Column(4) }); assert_eq!(None, final_iter.next()); assert_indexed(23, final_iter.prev()); } #[test] fn shrink_reflow() { - let mut grid = Grid::<Cell>::new(Line(1), Column(5), 2); + let mut grid = Grid::<Cell>::new(1, 5, 2); grid[Line(0)][Column(0)] = cell('1'); grid[Line(0)][Column(1)] = cell('2'); grid[Line(0)][Column(2)] = cell('3'); grid[Line(0)][Column(3)] = cell('4'); grid[Line(0)][Column(4)] = cell('5'); - grid.resize(true, Line(1), Column(2)); + grid.resize(true, 1, 2); assert_eq!(grid.total_lines(), 3); - assert_eq!(grid[2].len(), 2); - assert_eq!(grid[2][Column(0)], cell('1')); - assert_eq!(grid[2][Column(1)], wrap_cell('2')); + assert_eq!(grid[Line(-2)].len(), 2); + assert_eq!(grid[Line(-2)][Column(0)], cell('1')); + assert_eq!(grid[Line(-2)][Column(1)], wrap_cell('2')); - assert_eq!(grid[1].len(), 2); - assert_eq!(grid[1][Column(0)], cell('3')); - assert_eq!(grid[1][Column(1)], wrap_cell('4')); + assert_eq!(grid[Line(-1)].len(), 2); + assert_eq!(grid[Line(-1)][Column(0)], cell('3')); + assert_eq!(grid[Line(-1)][Column(1)], wrap_cell('4')); - assert_eq!(grid[0].len(), 2); - assert_eq!(grid[0][Column(0)], cell('5')); - assert_eq!(grid[0][Column(1)], Cell::default()); + assert_eq!(grid[Line(0)].len(), 2); + assert_eq!(grid[Line(0)][Column(0)], cell('5')); + assert_eq!(grid[Line(0)][Column(1)], Cell::default()); } #[test] fn shrink_reflow_twice() { - let mut grid = Grid::<Cell>::new(Line(1), Column(5), 2); + let mut grid = Grid::<Cell>::new(1, 5, 2); grid[Line(0)][Column(0)] = cell('1'); grid[Line(0)][Column(1)] = cell('2'); grid[Line(0)][Column(2)] = cell('3'); grid[Line(0)][Column(3)] = cell('4'); grid[Line(0)][Column(4)] = cell('5'); - grid.resize(true, Line(1), Column(4)); - grid.resize(true, Line(1), Column(2)); + grid.resize(true, 1, 4); + grid.resize(true, 1, 2); assert_eq!(grid.total_lines(), 3); - assert_eq!(grid[2].len(), 2); - assert_eq!(grid[2][Column(0)], cell('1')); - assert_eq!(grid[2][Column(1)], wrap_cell('2')); + assert_eq!(grid[Line(-2)].len(), 2); + assert_eq!(grid[Line(-2)][Column(0)], cell('1')); + assert_eq!(grid[Line(-2)][Column(1)], wrap_cell('2')); - assert_eq!(grid[1].len(), 2); - assert_eq!(grid[1][Column(0)], cell('3')); - assert_eq!(grid[1][Column(1)], wrap_cell('4')); + assert_eq!(grid[Line(-1)].len(), 2); + assert_eq!(grid[Line(-1)][Column(0)], cell('3')); + assert_eq!(grid[Line(-1)][Column(1)], wrap_cell('4')); - assert_eq!(grid[0].len(), 2); - assert_eq!(grid[0][Column(0)], cell('5')); - assert_eq!(grid[0][Column(1)], Cell::default()); + assert_eq!(grid[Line(0)].len(), 2); + assert_eq!(grid[Line(0)][Column(0)], cell('5')); + assert_eq!(grid[Line(0)][Column(1)], Cell::default()); } #[test] fn shrink_reflow_empty_cell_inside_line() { - let mut grid = Grid::<Cell>::new(Line(1), Column(5), 3); + let mut grid = Grid::<Cell>::new(1, 5, 3); grid[Line(0)][Column(0)] = cell('1'); grid[Line(0)][Column(1)] = Cell::default(); grid[Line(0)][Column(2)] = cell('3'); grid[Line(0)][Column(3)] = cell('4'); grid[Line(0)][Column(4)] = Cell::default(); - grid.resize(true, Line(1), Column(2)); + grid.resize(true, 1, 2); assert_eq!(grid.total_lines(), 2); - assert_eq!(grid[1].len(), 2); - assert_eq!(grid[1][Column(0)], cell('1')); - assert_eq!(grid[1][Column(1)], wrap_cell(' ')); + assert_eq!(grid[Line(-1)].len(), 2); + assert_eq!(grid[Line(-1)][Column(0)], cell('1')); + assert_eq!(grid[Line(-1)][Column(1)], wrap_cell(' ')); - assert_eq!(grid[0].len(), 2); - assert_eq!(grid[0][Column(0)], cell('3')); - assert_eq!(grid[0][Column(1)], cell('4')); + assert_eq!(grid[Line(0)].len(), 2); + assert_eq!(grid[Line(0)][Column(0)], cell('3')); + assert_eq!(grid[Line(0)][Column(1)], cell('4')); - grid.resize(true, Line(1), Column(1)); + grid.resize(true, 1, 1); assert_eq!(grid.total_lines(), 4); - assert_eq!(grid[3].len(), 1); - assert_eq!(grid[3][Column(0)], wrap_cell('1')); + assert_eq!(grid[Line(-3)].len(), 1); + assert_eq!(grid[Line(-3)][Column(0)], wrap_cell('1')); - assert_eq!(grid[2].len(), 1); - assert_eq!(grid[2][Column(0)], wrap_cell(' ')); + assert_eq!(grid[Line(-2)].len(), 1); + assert_eq!(grid[Line(-2)][Column(0)], wrap_cell(' ')); - assert_eq!(grid[1].len(), 1); - assert_eq!(grid[1][Column(0)], wrap_cell('3')); + assert_eq!(grid[Line(-1)].len(), 1); + assert_eq!(grid[Line(-1)][Column(0)], wrap_cell('3')); - assert_eq!(grid[0].len(), 1); - assert_eq!(grid[0][Column(0)], cell('4')); + assert_eq!(grid[Line(0)].len(), 1); + assert_eq!(grid[Line(0)][Column(0)], cell('4')); } #[test] fn grow_reflow() { - let mut grid = Grid::<Cell>::new(Line(2), Column(2), 0); + let mut grid = Grid::<Cell>::new(2, 2, 0); grid[Line(0)][Column(0)] = cell('1'); grid[Line(0)][Column(1)] = wrap_cell('2'); grid[Line(1)][Column(0)] = cell('3'); grid[Line(1)][Column(1)] = Cell::default(); - grid.resize(true, Line(2), Column(3)); + grid.resize(true, 2, 3); assert_eq!(grid.total_lines(), 2); - assert_eq!(grid[1].len(), 3); - assert_eq!(grid[1][Column(0)], cell('1')); - assert_eq!(grid[1][Column(1)], cell('2')); - assert_eq!(grid[1][Column(2)], cell('3')); + assert_eq!(grid[Line(0)].len(), 3); + assert_eq!(grid[Line(0)][Column(0)], cell('1')); + assert_eq!(grid[Line(0)][Column(1)], cell('2')); + assert_eq!(grid[Line(0)][Column(2)], cell('3')); // Make sure rest of grid is empty. - assert_eq!(grid[0].len(), 3); - assert_eq!(grid[0][Column(0)], Cell::default()); - assert_eq!(grid[0][Column(1)], Cell::default()); - assert_eq!(grid[0][Column(2)], Cell::default()); + assert_eq!(grid[Line(1)].len(), 3); + assert_eq!(grid[Line(1)][Column(0)], Cell::default()); + assert_eq!(grid[Line(1)][Column(1)], Cell::default()); + assert_eq!(grid[Line(1)][Column(2)], Cell::default()); } #[test] fn grow_reflow_multiline() { - let mut grid = Grid::<Cell>::new(Line(3), Column(2), 0); + let mut grid = Grid::<Cell>::new(3, 2, 0); grid[Line(0)][Column(0)] = cell('1'); grid[Line(0)][Column(1)] = wrap_cell('2'); grid[Line(1)][Column(0)] = cell('3'); @@ -288,20 +286,20 @@ fn grow_reflow_multiline() { grid[Line(2)][Column(0)] = cell('5'); grid[Line(2)][Column(1)] = cell('6'); - grid.resize(true, Line(3), Column(6)); + grid.resize(true, 3, 6); assert_eq!(grid.total_lines(), 3); - assert_eq!(grid[2].len(), 6); - assert_eq!(grid[2][Column(0)], cell('1')); - assert_eq!(grid[2][Column(1)], cell('2')); - assert_eq!(grid[2][Column(2)], cell('3')); - assert_eq!(grid[2][Column(3)], cell('4')); - assert_eq!(grid[2][Column(4)], cell('5')); - assert_eq!(grid[2][Column(5)], cell('6')); + assert_eq!(grid[Line(0)].len(), 6); + assert_eq!(grid[Line(0)][Column(0)], cell('1')); + assert_eq!(grid[Line(0)][Column(1)], cell('2')); + assert_eq!(grid[Line(0)][Column(2)], cell('3')); + assert_eq!(grid[Line(0)][Column(3)], cell('4')); + assert_eq!(grid[Line(0)][Column(4)], cell('5')); + assert_eq!(grid[Line(0)][Column(5)], cell('6')); // Make sure rest of grid is empty. - for r in 0..2 { + for r in (1..3).map(Line::from) { assert_eq!(grid[r].len(), 6); for c in 0..6 { assert_eq!(grid[r][Column(c)], Cell::default()); @@ -311,43 +309,43 @@ fn grow_reflow_multiline() { #[test] fn grow_reflow_disabled() { - let mut grid = Grid::<Cell>::new(Line(2), Column(2), 0); + let mut grid = Grid::<Cell>::new(2, 2, 0); grid[Line(0)][Column(0)] = cell('1'); grid[Line(0)][Column(1)] = wrap_cell('2'); grid[Line(1)][Column(0)] = cell('3'); grid[Line(1)][Column(1)] = Cell::default(); - grid.resize(false, Line(2), Column(3)); + grid.resize(false, 2, 3); assert_eq!(grid.total_lines(), 2); - assert_eq!(grid[1].len(), 3); - assert_eq!(grid[1][Column(0)], cell('1')); - assert_eq!(grid[1][Column(1)], wrap_cell('2')); - assert_eq!(grid[1][Column(2)], Cell::default()); + assert_eq!(grid[Line(0)].len(), 3); + assert_eq!(grid[Line(0)][Column(0)], cell('1')); + assert_eq!(grid[Line(0)][Column(1)], wrap_cell('2')); + assert_eq!(grid[Line(0)][Column(2)], Cell::default()); - assert_eq!(grid[0].len(), 3); - assert_eq!(grid[0][Column(0)], cell('3')); - assert_eq!(grid[0][Column(1)], Cell::default()); - assert_eq!(grid[0][Column(2)], Cell::default()); + assert_eq!(grid[Line(1)].len(), 3); + assert_eq!(grid[Line(1)][Column(0)], cell('3')); + assert_eq!(grid[Line(1)][Column(1)], Cell::default()); + assert_eq!(grid[Line(1)][Column(2)], Cell::default()); } #[test] fn shrink_reflow_disabled() { - let mut grid = Grid::<Cell>::new(Line(1), Column(5), 2); + let mut grid = Grid::<Cell>::new(1, 5, 2); grid[Line(0)][Column(0)] = cell('1'); grid[Line(0)][Column(1)] = cell('2'); grid[Line(0)][Column(2)] = cell('3'); grid[Line(0)][Column(3)] = cell('4'); grid[Line(0)][Column(4)] = cell('5'); - grid.resize(false, Line(1), Column(2)); + grid.resize(false, 1, 2); assert_eq!(grid.total_lines(), 1); - assert_eq!(grid[0].len(), 2); - assert_eq!(grid[0][Column(0)], cell('1')); - assert_eq!(grid[0][Column(1)], cell('2')); + assert_eq!(grid[Line(0)].len(), 2); + assert_eq!(grid[Line(0)][Column(0)], cell('1')); + assert_eq!(grid[Line(0)][Column(1)], cell('2')); } // https://github.com/rust-lang/rust-clippy/pull/6375 |