From 410f3ef0f02e85312a8a54ae375387fbbf6aea70 Mon Sep 17 00:00:00 2001 From: Maxim Zhiburt Date: Tue, 19 Jul 2022 23:16:12 +0300 Subject: [PATCH] nu-table: Update tests after #6080 (#6082) Signed-off-by: Maxim Zhiburt --- crates/nu-table/tests/constrains.rs | 153 ++++++++-------------------- 1 file changed, 40 insertions(+), 113 deletions(-) diff --git a/crates/nu-table/tests/constrains.rs b/crates/nu-table/tests/constrains.rs index 9f8af2ce96..ed4ee1fa7b 100644 --- a/crates/nu-table/tests/constrains.rs +++ b/crates/nu-table/tests/constrains.rs @@ -39,59 +39,38 @@ fn termwidth_too_small() { let table = Table::new(row(3), vec![row(5); 2], theme::heavy()); let cfg = Config::default(); - assert!(draw_table(&table, 4, &cfg).is_some()); - - for i in 0..4 { + for i in 0..10 { assert!(draw_table(&table, i, &cfg).is_none()); } + assert!(draw_table(&table, 11, &cfg).is_some()); + let cfg = Config { trim_strategy: TrimStrategy::Truncate { suffix: None }, ..Default::default() }; - assert!(draw_table(&table, 4, &cfg).is_some()); - for i in 0..4 { + for i in 0..10 { assert!(draw_table(&table, i, &cfg).is_none()); } + + assert!(draw_table(&table, 11, &cfg).is_some()); } #[test] fn wrap_test() { - let table = Table::new( - vec![ - styled_str("123 45678"), - styled_str("qweqw eqwe"), - styled_str("xxx xx xx x xx x xx xx"), - styled_str("qqq qqq qqqq qqq qq"), - styled_str("qw"), - ], - vec![row(5); 2], - theme::heavy(), - ); let cfg = Config { trim_strategy: TrimStrategy::Wrap { try_to_keep_words: false, }, ..Default::default() }; + let table = table_with_data(); + + for i in 0..10 { + assert!(draw_table(&table, i, &cfg).is_none()); + } - assert_eq!( - draw_table(&table, 4, &cfg).unwrap(), - "┏━━┓\n┃ ┃\n┣━━┫\n┃ ┃\n┃ ┃\n┗━━┛" - ); - assert_eq!( - draw_table(&table, 5, &cfg).unwrap(), - "┏━━━┓\n┃ . ┃\n┃ . ┃\n┃ . ┃\n┣━━━┫\n┃ . ┃\n┃ . ┃\n┃ . ┃\n┃ . ┃\n┃ . ┃\n┃ . ┃\n┗━━━┛" - ); - assert_eq!( - draw_table(&table, 6, &cfg).unwrap(), - "┏━━━━┓\n┃ .. ┃\n┃ . ┃\n┣━━━━┫\n┃ .. ┃\n┃ . ┃\n┃ .. ┃\n┃ . ┃\n┗━━━━┛" - ); - assert_eq!( - draw_table(&table, 9, &cfg).unwrap(), - "┏━━━━━┓\n┃ ... ┃\n┣━━━━━┫\n┃ ... ┃\n┃ ... ┃\n┗━━━━━┛" - ); assert_eq!(draw_table(&table, 10, &cfg).unwrap(), "┏━━━━┳━━━┓\n┃ 12 ┃ . ┃\n┃ 3 ┃ . ┃\n┃ 45 ┃ . ┃\n┃ 67 ┃ ┃\n┃ 8 ┃ ┃\n┣━━━━╋━━━┫\n┃ 0 ┃ . ┃\n┃ ┃ . ┃\n┃ ┃ . ┃\n┃ 0 ┃ . ┃\n┃ ┃ . ┃\n┃ ┃ . ┃\n┗━━━━┻━━━┛"); assert_eq!( draw_table(&table, 21, &cfg).unwrap(), @@ -109,40 +88,18 @@ fn wrap_test() { #[test] fn wrap_keep_words_test() { - let table = Table::new( - vec![ - styled_str("123 45678"), - styled_str("qweqw eqwe"), - styled_str("xxx xx xx x xx x xx xx"), - styled_str("qqq qqq qqqq qqq qq"), - styled_str("qw"), - ], - vec![row(5); 2], - theme::heavy(), - ); let cfg = Config { trim_strategy: TrimStrategy::Wrap { try_to_keep_words: true, }, ..Default::default() }; + let table = table_with_data(); + + for i in 0..10 { + assert!(draw_table(&table, i, &cfg).is_none()); + } - assert_eq!( - draw_table(&table, 4, &cfg).unwrap(), - "┏━━┓\n┃ ┃\n┣━━┫\n┃ ┃\n┃ ┃\n┗━━┛" - ); - assert_eq!( - draw_table(&table, 5, &cfg).unwrap(), - "┏━━━┓\n┃ . ┃\n┃ . ┃\n┃ . ┃\n┣━━━┫\n┃ . ┃\n┃ . ┃\n┃ . ┃\n┃ . ┃\n┃ . ┃\n┃ . ┃\n┗━━━┛" - ); - assert_eq!( - draw_table(&table, 6, &cfg).unwrap(), - "┏━━━━┓\n┃ .. ┃\n┃ . ┃\n┣━━━━┫\n┃ .. ┃\n┃ . ┃\n┃ .. ┃\n┃ . ┃\n┗━━━━┛" - ); - assert_eq!( - draw_table(&table, 9, &cfg).unwrap(), - "┏━━━━━┓\n┃ ... ┃\n┣━━━━━┫\n┃ ... ┃\n┃ ... ┃\n┗━━━━━┛" - ); assert_eq!(draw_table(&table, 10, &cfg).unwrap(), "┏━━━━┳━━━┓\n┃ 12 ┃ . ┃\n┃ 34 ┃ . ┃\n┃ 56 ┃ . ┃\n┃ 78 ┃ ┃\n┣━━━━╋━━━┫\n┃ 0 ┃ . ┃\n┃ ┃ . ┃\n┃ ┃ . ┃\n┃ 0 ┃ . ┃\n┃ ┃ . ┃\n┃ ┃ . ┃\n┗━━━━┻━━━┛"); assert_eq!( draw_table(&table, 21, &cfg).unwrap(), @@ -160,38 +117,16 @@ fn wrap_keep_words_test() { #[test] fn truncate_test() { - let table = Table::new( - vec![ - styled_str("123 45678"), - styled_str("qweqw eqwe"), - styled_str("xxx xx xx x xx x xx xx"), - styled_str("qqq qqq qqqq qqq qq"), - styled_str("qw"), - ], - vec![row(5); 2], - theme::heavy(), - ); let cfg = Config { trim_strategy: TrimStrategy::Truncate { suffix: None }, ..Default::default() }; + let table = table_with_data(); + + for i in 0..10 { + assert!(draw_table(&table, i, &cfg).is_none()); + } - assert_eq!( - draw_table(&table, 4, &cfg).unwrap(), - "┏━━┓\n┃ ┃\n┣━━┫\n┃ ┃\n┃ ┃\n┗━━┛" - ); - assert_eq!( - draw_table(&table, 5, &cfg).unwrap(), - "┏━━━┓\n┃ . ┃\n┣━━━┫\n┃ . ┃\n┃ . ┃\n┗━━━┛" - ); - assert_eq!( - draw_table(&table, 6, &cfg).unwrap(), - "┏━━━━┓\n┃ .. ┃\n┣━━━━┫\n┃ .. ┃\n┃ .. ┃\n┗━━━━┛" - ); - assert_eq!( - draw_table(&table, 9, &cfg).unwrap(), - "┏━━━━━┓\n┃ ... ┃\n┣━━━━━┫\n┃ ... ┃\n┃ ... ┃\n┗━━━━━┛" - ); assert_eq!( draw_table(&table, 10, &cfg).unwrap(), "┏━━━━┳━━━┓\n┃ 12 ┃ . ┃\n┣━━━━╋━━━┫\n┃ 0 ┃ . ┃\n┃ 0 ┃ . ┃\n┗━━━━┻━━━┛" @@ -212,40 +147,18 @@ fn truncate_test() { #[test] fn truncate_with_suffix_test() { - let table = Table::new( - vec![ - styled_str("123 45678"), - styled_str("qweqw eqwe"), - styled_str("xxx xx xx x xx x xx xx"), - styled_str("qqq qqq qqqq qqq qq"), - styled_str("qw"), - ], - vec![row(5); 2], - theme::heavy(), - ); let cfg = Config { trim_strategy: TrimStrategy::Truncate { suffix: Some(String::from("...")), }, ..Default::default() }; + let table = table_with_data(); + + for i in 0..10 { + assert!(draw_table(&table, i, &cfg).is_none()); + } - assert_eq!( - draw_table(&table, 4, &cfg).unwrap(), - "┏━━┓\n┃ ┃\n┣━━┫\n┃ ┃\n┃ ┃\n┗━━┛" - ); - assert_eq!( - draw_table(&table, 5, &cfg).unwrap(), - "┏━━━┓\n┃ . ┃\n┣━━━┫\n┃ . ┃\n┃ . ┃\n┗━━━┛" - ); - assert_eq!( - draw_table(&table, 6, &cfg).unwrap(), - "┏━━━━┓\n┃ .. ┃\n┣━━━━┫\n┃ .. ┃\n┃ .. ┃\n┗━━━━┛" - ); - assert_eq!( - draw_table(&table, 9, &cfg).unwrap(), - "┏━━━━━┓\n┃ ... ┃\n┣━━━━━┫\n┃ ... ┃\n┃ ... ┃\n┗━━━━━┛" - ); assert_eq!( draw_table(&table, 10, &cfg).unwrap(), "┏━━━━┳━━━┓\n┃ .. ┃ . ┃\n┣━━━━╋━━━┫\n┃ 0 ┃ . ┃\n┃ 0 ┃ . ┃\n┗━━━━┻━━━┛" @@ -283,3 +196,17 @@ fn row(count_columns: usize) -> Vec { fn styled_str(s: &str) -> StyledString { StyledString::new(s.to_string(), TextStyle::default()) } + +fn table_with_data() -> Table { + Table::new( + vec![ + styled_str("123 45678"), + styled_str("qweqw eqwe"), + styled_str("xxx xx xx x xx x xx xx"), + styled_str("qqq qqq qqqq qqq qq"), + styled_str("qw"), + ], + vec![row(5); 2], + theme::heavy(), + ) +}