PR review fixes, docopt already provides case-insensitive deserializa…

…tion.

Cargo.toml

@@ -22,7 +22,6 @@ flate2 = "0.2.20"
 log = "0.3.8"
 serde = "1.0.21"
 serde_derive = "1.0.21"
-serde_json = "1.0.6"
 tar = "0.4.14"
 time = "0.1.38"
 walkdir = "2.0.1"

src/main.rs

@@ -256,3 +256,29 @@ fn main() {
         process::exit(1);
     }
 }
+
+#[cfg(test)]
+mod test {
+    use Args;
+    use OsType;
+    use USAGE;
+    use docopt::Docopt;
+    use docopt::Error;
+
+    fn test_helper(argv: &[&str]) -> Result<Args, Error> {
+        Docopt::new(USAGE).and_then(|d| d.argv(argv.iter()).deserialize())
+    }
+
+    #[test]
+    fn test_docopt_os_case_insensitive() {
+        let argv = vec!["cp", "--os", "LiNuX"];
+        let os = test_helper(&argv).unwrap().flag_os.unwrap();
+        assert_eq!(OsType::Linux, os);
+    }
+
+    #[test]
+    fn test_docopt_expect_error() {
+        let argv = vec!["cp", "--os", "lindows"];
+        assert!(!test_helper(&argv).is_ok());
+    }
+}

src/types.rs

@@ -54,32 +54,7 @@ impl LineType {
 
 #[cfg(test)]
 mod test {
-    extern crate serde_json;
-
-    use super::OsType::{self, Linux, OsX, SunOs, Other};
     use super::LineType;
-    use self::serde_json::from_str;
-
-    #[test]
-    fn test_os_type_decoding_regular() {
-        assert_eq!(from_str::<OsType>("\"linux\"").unwrap(), Linux);
-        assert_eq!(from_str::<OsType>("\"osx\"").unwrap(), OsX);
-        assert_eq!(from_str::<OsType>("\"sunos\"").unwrap(), SunOs);
-        assert_eq!(from_str::<OsType>("\"other\"").unwrap(), Other);
-    }
-
-    // REVIEW: Not sure how to do case-insensitive deserialization with serde
-    //         json. Ok to ditch support for this?
-    //#[test]
-    //fn test_os_type_decoding_uppercase() {
-    //    assert_eq!(from_str::<OsType>("\"Linux\"").unwrap(), Linux);
-    //    assert_eq!(from_str::<OsType>("\"LINUX\"").unwrap(), Linux);
-    //}
-
-    #[test]
-    fn test_os_type_decoding_unknown() {
-        assert!(from_str::<OsType>("\"lindows\"").is_err());
-    }
 
     #[test]
     fn test_linetype_from_str() {