From f84638fd816d2295c5d9f60c0ac8eb6df50d1aba Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Tue, 29 Oct 2019 13:42:00 -0400 Subject: start the rewrite --- tests/attr.rs | 137 ++++++++++++++++++---------------------------------------- 1 file changed, 43 insertions(+), 94 deletions(-) (limited to 'tests/attr.rs') diff --git a/tests/attr.rs b/tests/attr.rs index 2532819..e621098 100644 --- a/tests/attr.rs +++ b/tests/attr.rs @@ -1,4 +1,4 @@ -extern crate vt100; +#![allow(clippy::cognitive_complexity)] mod support; use support::TestHelpers; @@ -6,164 +6,113 @@ use support::TestHelpers; #[test] fn colors() { let mut screen = vt100::Screen::new(24, 80); - assert_eq!(screen.fgcolor(), vt100::Color::ColorDefault); - assert_eq!(screen.bgcolor(), vt100::Color::ColorDefault); + assert_eq!(screen.fgcolor(), vt100::Color::Default); + assert_eq!(screen.bgcolor(), vt100::Color::Default); screen.assert_process(b"foo\x1b[31mbar"); assert_eq!(screen.cell(0, 0).unwrap().contents(), "f"); - assert_eq!( - screen.cell(0, 0).unwrap().fgcolor(), - vt100::Color::ColorDefault - ); - assert_eq!( - screen.cell(0, 0).unwrap().bgcolor(), - vt100::Color::ColorDefault - ); + assert_eq!(screen.cell(0, 0).unwrap().fgcolor(), vt100::Color::Default); + assert_eq!(screen.cell(0, 0).unwrap().bgcolor(), vt100::Color::Default); assert_eq!(screen.cell(0, 3).unwrap().contents(), "b"); - assert_eq!( - screen.cell(0, 3).unwrap().fgcolor(), - vt100::Color::ColorIdx(1) - ); - assert_eq!( - screen.cell(0, 3).unwrap().bgcolor(), - vt100::Color::ColorDefault - ); + assert_eq!(screen.cell(0, 3).unwrap().fgcolor(), vt100::Color::Idx(1)); + assert_eq!(screen.cell(0, 3).unwrap().bgcolor(), vt100::Color::Default); - assert_eq!(screen.fgcolor(), vt100::Color::ColorIdx(1)); - assert_eq!(screen.bgcolor(), vt100::Color::ColorDefault); + assert_eq!(screen.fgcolor(), vt100::Color::Idx(1)); + assert_eq!(screen.bgcolor(), vt100::Color::Default); screen.assert_process(b"\x1b[2D\x1b[45mab"); assert_eq!(screen.cell(0, 4).unwrap().contents(), "a"); - assert_eq!( - screen.cell(0, 4).unwrap().fgcolor(), - vt100::Color::ColorIdx(1) - ); - assert_eq!( - screen.cell(0, 4).unwrap().bgcolor(), - vt100::Color::ColorIdx(5) - ); + assert_eq!(screen.cell(0, 4).unwrap().fgcolor(), vt100::Color::Idx(1)); + assert_eq!(screen.cell(0, 4).unwrap().bgcolor(), vt100::Color::Idx(5)); - assert_eq!(screen.fgcolor(), vt100::Color::ColorIdx(1)); - assert_eq!(screen.bgcolor(), vt100::Color::ColorIdx(5)); + assert_eq!(screen.fgcolor(), vt100::Color::Idx(1)); + assert_eq!(screen.bgcolor(), vt100::Color::Idx(5)); screen.assert_process(b"\x1b[m"); - assert_eq!(screen.fgcolor(), vt100::Color::ColorDefault); - assert_eq!(screen.bgcolor(), vt100::Color::ColorDefault); + assert_eq!(screen.fgcolor(), vt100::Color::Default); + assert_eq!(screen.bgcolor(), vt100::Color::Default); screen.assert_process(b"\x1b[15;15Hfoo\x1b[31mbar\x1b[m"); assert_eq!(screen.cell(14, 14).unwrap().contents(), "f"); assert_eq!( screen.cell(14, 14).unwrap().fgcolor(), - vt100::Color::ColorDefault + vt100::Color::Default ); assert_eq!( screen.cell(14, 14).unwrap().bgcolor(), - vt100::Color::ColorDefault + vt100::Color::Default ); assert_eq!(screen.cell(14, 17).unwrap().contents(), "b"); - assert_eq!( - screen.cell(14, 17).unwrap().fgcolor(), - vt100::Color::ColorIdx(1) - ); + assert_eq!(screen.cell(14, 17).unwrap().fgcolor(), vt100::Color::Idx(1)); assert_eq!( screen.cell(14, 17).unwrap().bgcolor(), - vt100::Color::ColorDefault + vt100::Color::Default ); - assert_eq!(screen.fgcolor(), vt100::Color::ColorDefault); - assert_eq!(screen.bgcolor(), vt100::Color::ColorDefault); + assert_eq!(screen.fgcolor(), vt100::Color::Default); + assert_eq!(screen.bgcolor(), vt100::Color::Default); screen.assert_process(b"\x1b[2D\x1b[45mab"); assert_eq!(screen.cell(14, 18).unwrap().contents(), "a"); assert_eq!( screen.cell(14, 18).unwrap().fgcolor(), - vt100::Color::ColorDefault - ); - assert_eq!( - screen.cell(14, 18).unwrap().bgcolor(), - vt100::Color::ColorIdx(5) + vt100::Color::Default ); + assert_eq!(screen.cell(14, 18).unwrap().bgcolor(), vt100::Color::Idx(5)); - assert_eq!(screen.fgcolor(), vt100::Color::ColorDefault); - assert_eq!(screen.bgcolor(), vt100::Color::ColorIdx(5)); + assert_eq!(screen.fgcolor(), vt100::Color::Default); + assert_eq!(screen.bgcolor(), vt100::Color::Idx(5)); screen.assert_process(b"\x1b[m\x1b[2J\x1b[H"); screen.assert_process(b"a\x1b[38;5;123mb\x1b[48;5;158mc"); - assert_eq!(screen.fgcolor(), vt100::Color::ColorIdx(123)); - assert_eq!(screen.bgcolor(), vt100::Color::ColorIdx(158)); + assert_eq!(screen.fgcolor(), vt100::Color::Idx(123)); + assert_eq!(screen.bgcolor(), vt100::Color::Idx(158)); - assert_eq!( - screen.cell(0, 0).unwrap().fgcolor(), - vt100::Color::ColorDefault - ); - assert_eq!( - screen.cell(0, 0).unwrap().bgcolor(), - vt100::Color::ColorDefault - ); + assert_eq!(screen.cell(0, 0).unwrap().fgcolor(), vt100::Color::Default); + assert_eq!(screen.cell(0, 0).unwrap().bgcolor(), vt100::Color::Default); - assert_eq!( - screen.cell(0, 1).unwrap().fgcolor(), - vt100::Color::ColorIdx(123) - ); - assert_eq!( - screen.cell(0, 1).unwrap().bgcolor(), - vt100::Color::ColorDefault - ); + assert_eq!(screen.cell(0, 1).unwrap().fgcolor(), vt100::Color::Idx(123)); + assert_eq!(screen.cell(0, 1).unwrap().bgcolor(), vt100::Color::Default); - assert_eq!( - screen.cell(0, 2).unwrap().fgcolor(), - vt100::Color::ColorIdx(123) - ); - assert_eq!( - screen.cell(0, 2).unwrap().bgcolor(), - vt100::Color::ColorIdx(158) - ); + assert_eq!(screen.cell(0, 2).unwrap().fgcolor(), vt100::Color::Idx(123)); + assert_eq!(screen.cell(0, 2).unwrap().bgcolor(), vt100::Color::Idx(158)); screen.assert_process(b"\x1b[38;2;50;75;100md\x1b[48;2;125;150;175me"); - assert_eq!(screen.fgcolor(), vt100::Color::ColorRgb(50, 75, 100)); - assert_eq!(screen.bgcolor(), vt100::Color::ColorRgb(125, 150, 175)); + assert_eq!(screen.fgcolor(), vt100::Color::Rgb(50, 75, 100)); + assert_eq!(screen.bgcolor(), vt100::Color::Rgb(125, 150, 175)); assert_eq!( screen.cell(0, 3).unwrap().fgcolor(), - vt100::Color::ColorRgb(50, 75, 100) - ); - assert_eq!( - screen.cell(0, 3).unwrap().bgcolor(), - vt100::Color::ColorIdx(158) + vt100::Color::Rgb(50, 75, 100) ); + assert_eq!(screen.cell(0, 3).unwrap().bgcolor(), vt100::Color::Idx(158)); assert_eq!( screen.cell(0, 4).unwrap().fgcolor(), - vt100::Color::ColorRgb(50, 75, 100) + vt100::Color::Rgb(50, 75, 100) ); assert_eq!( screen.cell(0, 4).unwrap().bgcolor(), - vt100::Color::ColorRgb(125, 150, 175) + vt100::Color::Rgb(125, 150, 175) ); screen.assert_process(b"\x1b[m\x1b[2J\x1b[H"); screen.assert_process(b"\x1b[32;47mfoo"); - assert_eq!(screen.fgcolor(), vt100::Color::ColorIdx(2)); - assert_eq!(screen.bgcolor(), vt100::Color::ColorIdx(7)); + assert_eq!(screen.fgcolor(), vt100::Color::Idx(2)); + assert_eq!(screen.bgcolor(), vt100::Color::Idx(7)); - assert_eq!( - screen.cell(0, 1).unwrap().fgcolor(), - vt100::Color::ColorIdx(2) - ); - assert_eq!( - screen.cell(0, 1).unwrap().bgcolor(), - vt100::Color::ColorIdx(7) - ); + assert_eq!(screen.cell(0, 1).unwrap().fgcolor(), vt100::Color::Idx(2)); + assert_eq!(screen.cell(0, 1).unwrap().bgcolor(), vt100::Color::Idx(7)); } #[test] -- cgit v1.2.3-54-g00ecf