Branching unittests

asyncgit/src/sync/branch.rs

@@ -51,26 +51,31 @@ pub fn get_branches_to_display(
     scope_time!("get_branches_to_display");
 
     let cur_repo = utils::repo(repo_path)?;
-    let mut branches_for_display = vec![];
-
-    for b in cur_repo.branches(Some(BranchType::Local))? {
-        let branch = &b?.0;
-        let top_commit = branch.get().peel_to_commit()?;
-        let mut commit_id = top_commit.id().to_string();
-        commit_id.truncate(7);
-
-        branches_for_display.push(BranchForDisplay {
-            name: String::from_utf8(Vec::from(branch.name_bytes()?))?,
-            reference: String::from_utf8(Vec::from(
-                branch.get().name_bytes(),
-            ))?,
-            top_commit_message: String::from_utf8(Vec::from(
-                top_commit.summary_bytes().unwrap_or_default(),
-            ))?,
-            top_commit_reference: commit_id,
-            is_head: branch.is_head(),
+    let branches_for_display = cur_repo
+        .branches(Some(BranchType::Local))?
+        .map(|b| {
+            let branch = b?.0;
+            let top_commit = branch.get().peel_to_commit()?;
+            let mut commit_id = top_commit.id().to_string();
+            commit_id.truncate(7);
+
+            Ok(BranchForDisplay {
+                name: String::from_utf8(Vec::from(
+                    branch.name_bytes()?,
+                ))?,
+                reference: String::from_utf8(Vec::from(
+                    branch.get().name_bytes(),
+                ))?,
+                top_commit_message: String::from_utf8(Vec::from(
+                    top_commit.summary_bytes().unwrap_or_default(),
+                ))?,
+                top_commit_reference: commit_id,
+                is_head: branch.is_head(),
+            })
         })
-    }
+        .filter_map(Result::ok)
+        .collect();
+
     Ok(branches_for_display)
 }
 
@@ -174,3 +179,78 @@ mod tests_create_branch {
         );
     }
 }
+
+#[cfg(test)]
+mod tests_branches {
+    use super::*;
+    use crate::sync::tests::repo_init;
+
+    #[test]
+    fn test_smoke() {
+        let (_td, repo) = repo_init().unwrap();
+        let root = repo.path().parent().unwrap();
+        let repo_path = root.as_os_str().to_str().unwrap();
+
+        assert_eq!(
+            get_branches_to_display(repo_path)
+                .unwrap()
+                .iter()
+                .map(|b| b.name.clone())
+                .collect::<Vec<_>>(),
+            vec!["master"]
+        );
+    }
+
+    #[test]
+    fn test_multiple() {
+        let (_td, repo) = repo_init().unwrap();
+        let root = repo.path().parent().unwrap();
+        let repo_path = root.as_os_str().to_str().unwrap();
+
+        create_branch(repo_path, "test").unwrap();
+
+        assert_eq!(
+            get_branches_to_display(repo_path)
+                .unwrap()
+                .iter()
+                .map(|b| b.name.clone())
+                .collect::<Vec<_>>(),
+            vec!["master", "test"]
+        );
+    }
+}
+
+#[cfg(test)]
+mod tests_checkout {
+    use super::*;
+    use crate::sync::tests::repo_init;
+
+    #[test]
+    fn test_smoke() {
+        let (_td, repo) = repo_init().unwrap();
+        let root = repo.path().parent().unwrap();
+        let repo_path = root.as_os_str().to_str().unwrap();
+
+        assert!(
+            checkout_branch(repo_path, "refs/heads/master").is_ok()
+        );
+        assert!(
+            checkout_branch(repo_path, "refs/heads/foobar").is_err()
+        );
+    }
+
+    #[test]
+    fn test_multiple() {
+        let (_td, repo) = repo_init().unwrap();
+        let root = repo.path().parent().unwrap();
+        let repo_path = root.as_os_str().to_str().unwrap();
+
+        create_branch(repo_path, "test").unwrap();
+
+        assert!(checkout_branch(repo_path, "refs/heads/test").is_ok());
+        assert!(
+            checkout_branch(repo_path, "refs/heads/master").is_ok()
+        );
+        assert!(checkout_branch(repo_path, "refs/heads/test").is_ok());
+    }
+}