Add many more tests

1 files changed, 24 insertions, 8 deletions

diff --git a/tests/errors.rs b/tests/errors.rs
index b69774c..fa3b5ca 100644
--- a/tests/errors.rs
+++ b/tests/errors.rs
@@ -13,19 +13,35 @@ fn make() -> Config {
 #[test]
 fn test_error_parse() {
     let mut c = Config::default();
-    c.merge(File::new("tests/Settings.invalid", FileFormat::Toml))
-        .unwrap();
+    let res = c.merge(File::new("tests/Settings-invalid", FileFormat::Toml));
+
+    assert!(res.is_err());
+    assert_eq!(res.unwrap_err().to_string(),
+               "invalid number at line 2 in tests/Settings-invalid.toml"
+                   .to_string());
+}
+
+#[test]
+fn test_error_type() {
+    let c = make();
+
+    let res = c.get::<bool>("boolean_s_parse");
 
-    assert!(false)
+    assert!(res.is_err());
+    assert_eq!(res.unwrap_err().to_string(),
+               "invalid type: string \"fals\", expected a boolean for key `boolean_s_parse` in tests/Settings.toml"
+                   .to_string());
 }
 
 #[test]
-fn test_error_type_bool() {
+fn test_error_type_detached() {
     let c = make();
 
-    let err = c.get::<bool>("boolean_s_parse");
+    let value = c.get::<Value>("boolean_s_parse").unwrap();
+    let res = value.try_into::<bool>();
 
-    assert!(err.is_err());
-    assert_eq!(err.unwrap_err().to_string(),
-        "invalid type: string \"fals\", expected a boolean from tests/Settings.toml".to_string());
+    assert!(res.is_err());
+    assert_eq!(res.unwrap_err().to_string(),
+               "invalid type: string \"fals\", expected a boolean"
+                   .to_string());
 }