From d551d53eb43d551983968106ef4614c74be0892f Mon Sep 17 00:00:00 2001
From: Edward Langley <el-github@elangley.org>
Date: Tue, 14 Apr 2026 01:03:25 -0700
Subject: [PATCH] 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)
---
 src/import/wizard.rs | 12 ++----------
 src/model/types.rs   | 12 ++++--------
 src/ui/app.rs        |  8 ++++----
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/src/import/wizard.rs b/src/import/wizard.rs
index 21a8684..fffca79 100644
--- a/src/import/wizard.rs
+++ b/src/import/wizard.rs
@@ -1003,20 +1003,12 @@ mod tests {
             // Toggle Year component (cursor 0 = Year of first time field)
             let had_year_before = {
                 let tc = w.time_category_proposals();
-                !tc.is_empty()
-                    && tc[0]
-                        .date_components
-                        .iter()
-                        .any(|c| *c == DateComponent::Year)
+                !tc.is_empty() && tc[0].date_components.contains(&DateComponent::Year)
             };
             w.toggle_date_component();
             let has_year_after = {
                 let tc = w.time_category_proposals();
-                !tc.is_empty()
-                    && tc[0]
-                        .date_components
-                        .iter()
-                        .any(|c| *c == DateComponent::Year)
+                !tc.is_empty() && tc[0].date_components.contains(&DateComponent::Year)
             };
             assert_ne!(had_year_before, has_year_after);
         }
diff --git a/src/model/types.rs b/src/model/types.rs
index 9011aa4..4c44360 100644
--- a/src/model/types.rs
+++ b/src/model/types.rs
@@ -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);
     }
 
diff --git a/src/ui/app.rs b/src/ui/app.rs
index 27af8b8..137c800 100644
--- a/src/ui/app.rs
+++ b/src/ui/app.rs
@@ -601,7 +601,7 @@ mod tests {
             app.model
                 .category_mut("Row")
                 .unwrap()
-                .add_item(&format!("R{i}"));
+                .add_item(format!("R{i}"));
         }
         app.term_height = 28; // ~20 visible rows → delta = 15
         app.model.active_view_mut().selected = (0, 0);
@@ -623,7 +623,7 @@ mod tests {
             app.model
                 .category_mut("Row")
                 .unwrap()
-                .add_item(&format!("R{i}"));
+                .add_item(format!("R{i}"));
         }
         app.term_height = 28;
         app.model.active_view_mut().selected = (20, 0);
@@ -640,7 +640,7 @@ mod tests {
             app.model
                 .category_mut("Row")
                 .unwrap()
-                .add_item(&format!("R{i}"));
+                .add_item(format!("R{i}"));
         }
         app.term_height = 13; // ~5 visible rows
         app.model.active_view_mut().selected = (0, 0);
@@ -665,7 +665,7 @@ mod tests {
             app.model
                 .category_mut("Row")
                 .unwrap()
-                .add_item(&format!("R{i}"));
+                .add_item(format!("R{i}"));
         }
         app.term_height = 13; // ~5 visible rows
         app.model.active_view_mut().selected = (0, 0);