test(data): compare compact names by value and allocation class

crates/fidc-core/src/data.rs

@@ -6470,10 +6470,8 @@ mod tests {
             extra_factors: From::from([(Cow::Borrowed("amount"), 10.0)]),
         }])
         .expect("normalize clean factor snapshot");
-        assert!(matches!(
-            clean[0].extra_factors.keys().next(),
-            Some(Cow::Borrowed("amount"))
-        ));
+        assert_eq!(clean[0].extra_factors.keys().next().map(CompactString::as_str), Some("amount"));
+        assert!(!clean[0].extra_factors.keys().next().unwrap().is_heap_allocated());
 
         let dirty = normalize_factor_snapshots(vec![DailyFactorSnapshot {
             date,

crates/fidc-core/src/numeric_factors.rs

@@ -297,14 +297,14 @@ mod tests {
             }
         }
         assert_eq!(
-            flat.iter().collect::<Vec<_>>(),
-            tree.iter().collect::<Vec<_>>()
+            flat.iter().map(|(key, value)| (key.as_str(), value)).collect::<Vec<_>>(),
+            tree.iter().map(|(key, value)| (key.as_ref(), value)).collect::<Vec<_>>()
         );
         flat.retain(|_, value| *value > 100.0);
         tree.retain(|_, value| *value > 100.0);
         assert_eq!(
-            flat.iter().collect::<Vec<_>>(),
-            tree.iter().collect::<Vec<_>>()
+            flat.iter().map(|(key, value)| (key.as_str(), value)).collect::<Vec<_>>(),
+            tree.iter().map(|(key, value)| (key.as_ref(), value)).collect::<Vec<_>>()
         );
         assert_eq!(
             std::mem::size_of::<NumericFactorMap>(),
@@ -323,8 +323,8 @@ mod tests {
         let flat: NumericFactorMap = input.clone().into_iter().collect();
         let tree: BTreeMap<_, _> = input.into_iter().collect();
         assert_eq!(
-            flat.iter().collect::<Vec<_>>(),
-            tree.iter().collect::<Vec<_>>()
+            flat.iter().map(|(key, value)| (key.as_str(), value)).collect::<Vec<_>>(),
+            tree.iter().map(|(key, value)| (key.as_ref(), value)).collect::<Vec<_>>()
         );
         assert_eq!(flat["z"], 4.0);
     }
@@ -375,8 +375,8 @@ mod tests {
         flat.extend(incoming.clone());
         tree.extend(incoming);
         assert_eq!(
-            flat.iter().collect::<Vec<_>>(),
-            tree.iter().collect::<Vec<_>>()
+            flat.iter().map(|(key, value)| (key.as_str(), value)).collect::<Vec<_>>(),
+            tree.iter().map(|(key, value)| (key.as_ref(), value)).collect::<Vec<_>>()
         );
         assert_eq!(flat.keys().last().map(CompactString::as_str), Some("shared"));
         assert!(!flat.keys().last().unwrap().is_heap_allocated());