Fix tests

Author: ranfdev

src/backends/distrobox/distrobox.rs

@@ -1056,6 +1056,32 @@ mod tests {
     use super::*;
     use smol::block_on;
 
+    /// Helper to encode a string as hex (matching the shell script's base16 function)
+    fn to_hex(s: &str) -> String {
+        s.bytes().map(|b| format!("{:02x}", b)).collect()
+    }
+
+    /// Helper to generate TOML output matching the shell script format
+    fn make_desktop_files_toml(
+        home_dir: &str,
+        system_files: &[(&str, &str)],
+        user_files: &[(&str, &str)],
+    ) -> String {
+        let mut toml = format!("home_dir=\"{}\"\n", to_hex(home_dir));
+
+        toml.push_str("[system]\n");
+        for (path, content) in system_files {
+            toml.push_str(&format!("\"{}\"=\"{}\"\n", to_hex(path), to_hex(content)));
+        }
+
+        toml.push_str("[user]\n");
+        for (path, content) in user_files {
+            toml.push_str(&format!("\"{}\"=\"{}\"\n", to_hex(path), to_hex(content)));
+        }
+
+        toml
+    }
+
     #[test]
     fn list() -> Result<(), Error> {
         block_on(async {
@@ -1098,6 +1124,31 @@ d24405b14180 | ubuntu               | Created            | ghcr.io/ublue-os/ubun
 
     #[test]
     fn list_apps() -> Result<(), Error> {
+        let vim_desktop = "[Desktop Entry]
+Type=Application
+Name=Vim
+Exec=/path/to/vim
+Icon=/path/to/icon.png
+Comment=A brief description of my application
+Categories=Utility;Network;";
+
+        let fish_desktop = "[Desktop Entry]
+Type=Application
+Name=Fish
+Exec=/path/to/fish
+Icon=/path/to/icon.png
+Comment=A brief description of my application
+Categories=Utility;Network;";
+
+        let desktop_files_toml = make_desktop_files_toml(
+            "/home/me",
+            &[
+                ("/usr/share/applications/vim.desktop", vim_desktop),
+                ("/usr/share/applications/fish.desktop", fish_desktop),
+            ],
+            &[],
+        );
+
         let db = Distrobox::new(
             NullCommandRunnerBuilder::new()
                 .cmd(&["sh", "-c", "echo $XDG_DATA_HOME"], "")
@@ -1116,40 +1167,40 @@ d24405b14180 | ubuntu               | Created            | ghcr.io/ublue-os/ubun
                         "-c",
                         POSIX_FIND_AND_CONCAT_DESKTOP_FILES,
                     ],
-                    "# START FILE /usr/share/applications/vim.desktop
-[Desktop Entry]
-Type=Application
-Name=Vim
-Exec=/path/to/vim
-Icon=/path/to/icon.png
-Comment=A brief description of my application
-Categories=Utility;Network;
-# START FILE /usr/share/applications/fish.desktop
-[Desktop Entry]
-Type=Application
-Name=Fish
-Exec=/path/to/fish
-Icon=/path/to/icon.png
-Comment=A brief description of my application
-Categories=Utility;Network;
-",
+                    &desktop_files_toml,
                 )
                 .build(),
         );
 
         let apps = block_on(db.list_apps("ubuntu"))?;
-        assert_eq!(&apps[0].entry.name, "Vim");
-        assert_eq!(&apps[0].entry.exec, "/path/to/vim");
-        assert!(apps[0].exported);
-        assert_eq!(&apps[1].entry.name, "Fish");
-        assert_eq!(&apps[1].entry.exec, "/path/to/fish");
-        assert!(!apps[1].exported);
+        assert_eq!(&apps[0].entry.name, "Fish");
+        assert_eq!(&apps[0].entry.exec, "/path/to/fish");
+        assert!(!apps[0].exported);
+        assert_eq!(&apps[1].entry.name, "Vim");
+        assert_eq!(&apps[1].entry.exec, "/path/to/vim");
+        assert!(apps[1].exported);
         Ok(())
     }
 
     #[test]
     fn list_apps_with_space_in_filename() -> Result<(), Error> {
         // Simulate a desktop file with a space in its filename and ensure it's parsed/export-detected correctly
+        let proton_desktop = "[Desktop Entry]
+Type=Application
+Name=Proton Authenticator
+Exec=/usr/bin/proton-authenticator %u
+Icon=proton-authenticator
+Categories=Utility;Security;";
+
+        let desktop_files_toml = make_desktop_files_toml(
+            "/home/me",
+            &[(
+                "/usr/share/applications/Proton Authenticator.desktop",
+                proton_desktop,
+            )],
+            &[],
+        );
+
         let db = Distrobox::new(
             NullCommandRunnerBuilder::new()
                 .cmd(&["sh", "-c", "echo $XDG_DATA_HOME"], "")
@@ -1168,13 +1219,7 @@ Categories=Utility;Network;
                         "-c",
                         POSIX_FIND_AND_CONCAT_DESKTOP_FILES,
                     ],
-                    "# START FILE /usr/share/applications/Proton Authenticator.desktop
-[Desktop Entry]
-Type=Application
-Name=Proton Authenticator
-Exec=/usr/bin/proton-authenticator %u
-Icon=proton-authenticator
-Categories=Utility;Security;",
+                    &desktop_files_toml,
                 )
                 .build(),
         );

src/gtk_utils/typed_list_store.rs

@@ -276,10 +276,8 @@ impl<T: IsA<glib::Object>> DoubleEndedIterator for TypedListStoreIter<T> {
 mod tests {
     use super::*;
 
-    #[test]
+    #[gtk::test]
     fn test_typed_list_store() {
-        gtk::init().unwrap();
-
         let store = TypedListStore::<gtk::StringObject>::new();
         assert_eq!(store.len(), 0);
         assert!(store.is_empty());
@@ -306,10 +304,8 @@ mod tests {
         assert_eq!(items[1].string(), "Item 2");
     }
 
-    #[test]
+    #[gtk::test]
     fn test_retain() {
-        gtk::init().unwrap();
-
         let store = TypedListStore::<gtk::StringObject>::new();
         store.append(&gtk::StringObject::new("keep1"));
         store.append(&gtk::StringObject::new("remove"));
@@ -322,10 +318,8 @@ mod tests {
         assert_eq!(store.get(1).unwrap().string(), "keep2");
     }
 
-    #[test]
+    #[gtk::test]
     fn test_find_with() {
-        gtk::init().unwrap();
-
         let store = TypedListStore::<gtk::StringObject>::new();
         store.append(&gtk::StringObject::new("first"));
         store.append(&gtk::StringObject::new("second"));

src/models/root_store.rs

@@ -732,7 +732,7 @@ mod tests {
     use super::*;
     use crate::fakers::NullCommandRunnerBuilder;
 
-    #[test]
+    #[gtk::test]
     fn test_resolve_path() {
         // (input_path, getfattr_output, expected_resolved_path)
         let tests = [
@@ -741,8 +741,9 @@ mod tests {
                 Ok("/home/user/Documents/custom-home-folder"),
                 Ok("/home/user/Documents/custom-home-folder"),
             ),
+            // When getfattr returns empty for a non-sandbox path, we return the original path
             ("/home/user/Documents/custom-home-folder", Ok(""), {
-                Ok("/home/user/Documents/custom/home/folder")
+                Ok("/home/user/Documents/custom-home-folder")
             }),
             // If the resolution fails and the path is from a sandbox, we expect an error
             ("/run/user/1000/doc/xyz456", Err(()), Err(())),
@@ -765,7 +766,7 @@ mod tests {
             if let Ok(expected_resolved_path) = expected_resolved_path {
                 assert_eq!(resolved_path.unwrap(), expected_resolved_path);
             } else {
-                assert!(expected_resolved_path.is_err());
+                assert!(resolved_path.is_err());
             }
         }
     }