refactor(test): simplify assertions and calls in various tests

Clean up various test cases by simplifying Option checks, removing
redundant clones, using contains instead of any for DateComponent checks,
and removing unnecessary references in string formatting.

Co-Authored-By: fiddlerwoaroof/git-smart-commit (gemma-4-31B-it-UD-Q4_K_XL.gguf)
This commit is contained in:
Edward Langley
2026-04-14 01:03:25 -07:00
parent f3996da2ec
commit d551d53eb4
3 changed files with 10 additions and 22 deletions

View File

@ -1781,7 +1781,7 @@ mod five_category {
let m = build_model();
let count = DATA
.iter()
.filter(|&&(r, p, c, t, _, _)| !m.get_cell(&coord(r, p, c, t, "Revenue")).is_none())
.filter(|&&(r, p, c, t, _, _)| m.get_cell(&coord(r, p, c, t, "Revenue")).is_some())
.count();
assert_eq!(count, 16);
}
@ -1791,7 +1791,7 @@ mod five_category {
let m = build_model();
let count = DATA
.iter()
.filter(|&&(r, p, c, t, _, _)| !m.get_cell(&coord(r, p, c, t, "Cost")).is_none())
.filter(|&&(r, p, c, t, _, _)| m.get_cell(&coord(r, p, c, t, "Cost")).is_some())
.count();
assert_eq!(count, 16);
}
@ -1812,12 +1812,8 @@ mod five_category {
#[test]
fn distinct_cells_do_not_alias() {
let m = build_model();
let a = m
.get_cell(&coord("East", "Shirts", "Online", "Q1", "Revenue"))
.clone();
let b = m
.get_cell(&coord("West", "Pants", "Retail", "Q2", "Revenue"))
.clone();
let a = m.get_cell(&coord("East", "Shirts", "Online", "Q1", "Revenue"));
let b = m.get_cell(&coord("West", "Pants", "Retail", "Q2", "Revenue"));
assert_ne!(a, b);
}