remove unnecessary sort and fix tests

src/show.rs

@@ -136,23 +136,23 @@ mod tests {
         let mut result: Vec<u8> = vec![];
         show(
             &mut result,
-            Show::new(Some(String::from("dir"))),
+            Show::new(Some(String::from("same"))),
             get_test_settings(),
         )
         .unwrap();
-        assert_eq!(String::from_utf8(result).unwrap().trim(), "dir");
+        assert_eq!(String::from_utf8(result).unwrap().trim(), "same");
     }
 
     #[test]
     fn print_password_in_dir() {
         let mut result: Vec<u8> = vec![];
         show(
             &mut result,
-            Show::new(Some(String::from("dir/test"))),
+            Show::new(Some(String::from("same/test"))),
             get_test_settings(),
         )
         .unwrap();
-        assert_eq!(String::from_utf8(result).unwrap().trim(), "dir/test");
+        assert_eq!(String::from_utf8(result).unwrap().trim(), "same/test");
     }
 
     #[test]
@@ -162,7 +162,7 @@ mod tests {
         let result_string = String::from_utf8(result).unwrap();
         assert!(result_string.contains("test"));
         assert!(result_string.contains("pointguard.dev"));
-        assert!(result_string.contains("dir"));
+        assert!(result_string.contains("same"));
         assert!(result_string.contains("unique"));
         assert!(!result_string.contains("notinstore"));
     }
@@ -172,14 +172,14 @@ mod tests {
         let mut result: Vec<u8> = vec![];
         show(
             &mut result,
-            Show::new(Some(String::from("dir/"))),
+            Show::new(Some(String::from("same/"))),
             get_test_settings(),
         )
         .unwrap();
         let result_string = String::from_utf8(result).unwrap();
         assert!(result_string.contains("test"));
         assert!(result_string.contains("unique"));
-        assert!(result_string.contains("dir"));
+        assert!(result_string.contains("same"));
         assert!(!result_string.contains("notinstore"));
     }
 }

src/show/pgtree.rs

@@ -147,18 +147,17 @@ mod tests {
 
     #[test]
     fn build_tree_test() {
-        let mut tree = build_tree(&PathBuf::from("test-store-enc"), None).unwrap();
-        tree.sort();
+        let tree = build_tree(&PathBuf::from("test-store-enc"), None).unwrap();
         assert_eq!(tree.file_stem, "Point Guard Password Store");
         assert_eq!(tree.children.len(), 6);
-        assert_eq!(tree.children[0].file_stem, "dir");
-        assert_eq!(tree.children[0].children.len(), 0);
-        assert_eq!(tree.children[1].file_stem, "dir");
-        assert_eq!(tree.children[1].children.len(), 2);
-        assert_eq!(tree.children[1].children[0].file_stem, "test");
-        assert_eq!(tree.children[1].children[0].children.len(), 0);
-        assert_eq!(tree.children[2].file_stem, "empty");
-        assert_eq!(tree.children[3].file_stem, "empty1");
-        assert_eq!(tree.children[4].file_stem, "pointguard.dev");
+        assert_eq!(tree.children[0].file_stem, "empty");
+        assert_eq!(tree.children[1].file_stem, "empty1");
+        assert_eq!(tree.children[2].file_stem, "pointguard.dev");
+        assert_eq!(tree.children[3].file_stem, "same");
+        assert_eq!(tree.children[3].children.len(), 0);
+        assert_eq!(tree.children[4].file_stem, "same");
+        assert_eq!(tree.children[4].children.len(), 2);
+        assert_eq!(tree.children[4].children[0].file_stem, "test");
+        assert_eq!(tree.children[4].children[0].children.len(), 0);
     }
 }

test-store/empty/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

test-store/empty1/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

test-store/same.gpg

@@ -0,0 +1 @@
+same

test-store/same/test.gpg

@@ -0,0 +1 @@
+same/test