WIP: unit test

Author: chansuke

src/env_var.rs

@@ -1,23 +1,12 @@
 use std::collections::HashSet;
 use std::env;
-use std::ffi::OsStr;
 use std::path::PathBuf;
 use std::process::Command;
 
 use crate::process;
 
 pub const RUST_RECURSION_COUNT_MAX: u32 = 20;
 
-trait ProcessEnvs {
-    type Item;
-    type Iter: Iterator;
-    fn get_envs(&self) -> Self::Iter<Item=Self::Item>;
-    fn env<K, V>(&mut self, key: K, val: V) -> &mut Self
-where
-    K: AsRef<OsStr>,
-    V: AsRef<OsStr>;
-}
-
 #[allow(unused)]
 pub fn append_path(name: &str, value: Vec<PathBuf>, cmd: &mut Command) {
     let old_value = process().var_os(name);
@@ -63,12 +52,11 @@ fn concat_uniq_paths(fst_paths: Vec<PathBuf>, snd_paths: Vec<PathBuf>) -> Vec<Pa
     let deduped_snd_paths = dedupe_with_preserved_order(snd_paths);
 
     let vec_fst_paths: Vec<_> = deduped_fst_paths.into_iter().collect();
-    let vec_snd_paths: Vec<_> = deduped_snd_paths.into_iter().collect();
 
     let mut unified_paths;
     unified_paths = vec_fst_paths.clone();
     unified_paths.extend(
-        vec_snd_paths
+        deduped_snd_paths
             .into_iter()
             .filter(|v| !vec_fst_paths.contains(v))
             .collect::<Vec<_>>(),
@@ -94,6 +82,10 @@ fn dedupe_with_preserved_order(paths: Vec<PathBuf>) -> Vec<PathBuf> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::currentprocess;
+    use crate::test::{with_saved_path, Env};
+
+    use std::collections::HashMap;
     use std::ffi::OsString;
 
     #[test]
@@ -146,4 +138,46 @@ mod tests {
 
         assert_eq!(concat_uniq_paths(old_paths, new_paths), unified_paths);
     }
+
+    #[test]
+    fn prepend_unique_path() {
+        let mut vars = HashMap::new();
+        vars.env("PATH", "/home/a/.cargo/bin:/home/b/.cargo/bin");
+        let tp = Box::new(currentprocess::TestProcess {
+            vars,
+            ..Default::default()
+        });
+        with_saved_path(&|| {
+            currentprocess::with(tp.clone(), || {
+                let mut path_entries = vec![];
+                let mut cmd = Command::new("test");
+
+                let a = OsString::from("/home/a/.cargo/bin");
+                let path_a = PathBuf::from(a);
+                path_entries.push(path_a);
+
+                let _a = OsString::from("/home/a/.cargo/bin");
+                let _path_a = PathBuf::from(_a);
+                path_entries.push(_path_a);
+
+                let z = OsString::from("/home/z/.cargo/bin");
+                let path_z = PathBuf::from(z);
+                path_entries.push(path_z);
+
+                prepend_path("PATH", path_entries, &mut cmd);
+
+                let envs: Vec<(&OsStr, Option<&OsStr>)> = cmd.get_envs().collect();
+
+                assert_eq!(
+                    envs,
+                    &[(
+                        OsStr::new("PATH"),
+                        Some(OsStr::new(
+                            "/home/a/.cargo/bin:/home/z/.cargo/bin:/home/b/.cargo/bin"
+                        ))
+                    ),]
+                );
+            });
+        });
+    }
 }