refactor(persistence): tidy loading and share the test settings loader

Signed-off-by: Maika Namuo <httpworldview@gmail.com>

Author: httpsworldview

src/persistence/schema.rs

@@ -244,15 +244,13 @@ mod tests {
         assert_eq!(settings.visuals.order, vec![VisualKind::Spectrum]);
         assert_eq!(settings.visuals.width_basis.len(), 1);
         assert_eq!(settings.visuals.width_basis[&VisualKind::Spectrum], 320.0);
-        assert_eq!(settings.visuals.popouts.len(), 2);
-        assert_eq!(settings.visuals.popouts[&VisualKind::Spectrum].width, 640);
-        assert_eq!(settings.visuals.popouts[&VisualKind::Spectrum].height, 0);
-        assert!(settings.visuals.popouts[&VisualKind::Spectrum].popped_out);
-        assert_eq!(
-            settings.visuals.popouts[&VisualKind::Oscilloscope].width,
-            300
-        );
-        assert!(!settings.visuals.popouts[&VisualKind::Oscilloscope].popped_out);
+        let popouts = &settings.visuals.popouts;
+        assert_eq!(popouts.len(), 2);
+        assert_eq!(popouts[&VisualKind::Spectrum].width, 640);
+        assert_eq!(popouts[&VisualKind::Spectrum].height, 0);
+        assert!(popouts[&VisualKind::Spectrum].popped_out);
+        assert_eq!(popouts[&VisualKind::Oscilloscope].width, 300);
+        assert!(!popouts[&VisualKind::Oscilloscope].popped_out);
 
         let saved = serde_json::to_value(&settings.visuals).unwrap();
         assert_eq!(saved["modules"].as_object().unwrap().len(), 1);

src/persistence/store.rs

@@ -156,13 +156,10 @@ pub struct SettingsHandle(Rc<RefCell<SettingsManager>>);
 
 impl SettingsHandle {
     pub fn load_or_default() -> Self {
-        Self(Rc::new(RefCell::new(SettingsManager::load_from_dir(
-            &config_dir(),
-        ))))
+        Self::load_from(&config_dir())
     }
 
-    #[cfg(test)]
-    pub(crate) fn for_test(dir: &Path) -> Self {
+    pub(crate) fn load_from(dir: &Path) -> Self {
         Self(Rc::new(RefCell::new(SettingsManager::load_from_dir(dir))))
     }
 
@@ -216,15 +213,8 @@ mod tests {
         manager.update_active_theme(|theme| theme.author = Some("OpenMeters".into()));
 
         assert_eq!(manager.active_theme(), "default-custom-2");
-        assert_eq!(
-            manager
-                .theme_store
-                .load("default-custom-2")
-                .unwrap()
-                .author
-                .as_deref(),
-            Some("OpenMeters")
-        );
+        let theme = manager.theme_store.load("default-custom-2").unwrap();
+        assert_eq!(theme.author.as_deref(), Some("OpenMeters"));
     }
 
     #[test]
@@ -241,8 +231,7 @@ mod tests {
             if let Some(original) = original {
                 fs::write(&path, original).unwrap();
             }
-            let manager = SettingsManager::load_from_dir(dir.path());
-            let handle = SettingsHandle(Rc::new(RefCell::new(manager)));
+            let handle = SettingsHandle::load_from(dir.path());
             let saved =
                 || serde_json::from_slice::<serde_json::Value>(&fs::read(&path).unwrap()).unwrap();
             let changed = handle.set(User, |s| &mut s.decorations, decorations);

src/persistence/theme.rs

@@ -177,14 +177,8 @@ mod tests {
         fs::write(themes_dir.join("zebra.json"), "{}").unwrap();
         fs::write(themes_dir.join("alpha.json"), "{}").unwrap();
 
-        let names = store.list();
-        assert_eq!(
-            names
-                .iter()
-                .map(|choice| choice.name.as_str())
-                .collect::<Vec<_>>(),
-            ["default", "alpha", "zebra"]
-        );
+        let names = store.list().into_iter().map(|choice| choice.name);
+        assert_eq!(names.collect::<Vec<_>>(), ["default", "alpha", "zebra"]);
     }
 
     #[test]

src/persistence/visuals.rs

@@ -181,9 +181,6 @@ macro_rules! visual_configs {
             }
 
             fn from_value_lossy(kind: VisualKind, value: Value, scope: &str) -> Self {
-                if value.is_null() {
-                    return Self::default_for(kind);
-                }
                 match kind {
                     $(VisualKind::$variant => Self::$variant($settings::from_value_lossy(value, scope))),*
                 }.normalized()

src/ui/app/message.rs

@@ -248,7 +248,7 @@ mod tests {
             UiConfig {
                 capture: CaptureControl::for_test(),
                 audio: Rc::new(RefCell::new(Some(test_audio_reader()))),
-                settings_handle: SettingsHandle::for_test(dir.path()),
+                settings_handle: SettingsHandle::load_from(dir.path()),
             },
             true,
         );

src/ui/settings.rs

@@ -287,7 +287,7 @@ mod tests {
     #[test]
     fn palette_drags_save_with_settings_and_only_when_changed() {
         let dir = tempfile::tempdir().unwrap();
-        let settings = SettingsHandle::for_test(dir.path());
+        let settings = SettingsHandle::load_from(dir.path());
         let manager = VisualManagerHandle::default();
         let mut pane = ActiveSettings::new(VisualKind::Waveform, &manager);
         let mut send =
@@ -323,7 +323,7 @@ mod tests {
     fn toggling_sections_and_typing_hex_neither_apply_nor_save() {
         use spectrum::Message;
         let dir = tempfile::tempdir().unwrap();
-        let settings = SettingsHandle::for_test(dir.path());
+        let settings = SettingsHandle::load_from(dir.path());
         let manager = VisualManagerHandle::default();
         let config = || manager.borrow().config(VisualKind::Spectrum);
         let before = config();