Merge pull request #33 from TheNeikos/feature/add_hashmap_test

Feature/add hashmap test

Cargo.toml

@@ -15,5 +15,4 @@ serde = "1.0.152"
 thiserror = "1.0.38"
 
 [dev-dependencies]
-temp-env = "0.3"
 serde = { version = "1.0.152", features = ["derive"] }

tests/complex_env.rs

@@ -26,12 +26,11 @@ struct Config {
 #[test]
 fn parse_from_env() {
     let vars = [
-        ("upstairs__doors__0__material__Wood__kind", Some("Mahagony")),
-        ("upstairs__doors__1__material__Plastic", Some("25")),
-        ("upstairs__doors__foo__material", Some("Unknown")),
+        ("upstairs__doors__0__material__Wood__kind", "Mahagony"),
+        ("upstairs__doors__1__material__Plastic", "25"),
+        ("upstairs__doors__foo__material", "Unknown"),
     ];
 
-    let config: Config =
-        temp_env::with_vars(vars, || envious::Config::new().build_from_env().unwrap());
+    let config: Config = envious::Config::new().build_from_iter(vars).unwrap();
     println!("{:#?}", config);
 }

tests/failure.rs

@@ -1,5 +1,4 @@
 #![allow(dead_code)]
-use envious::Config;
 use serde::Deserialize;
 
 #[derive(Deserialize, Debug)]
@@ -9,19 +8,18 @@ struct Simple {
 
 #[test]
 fn wrongly_nested_fields() {
-    let vars = [("test", Some("true")), ("test__bar", Some("true"))];
+    let vars = [("test", ("true")), ("test__bar", ("true"))];
 
-    let config: Result<Simple, _> = temp_env::with_vars(vars, || Config::new().build_from_env());
+    let config: Result<Simple, _> = envious::Config::new().build_from_iter(vars);
 
     println!("{:?}", config.unwrap_err());
 }
 
 #[test]
 fn wrongly_nested_prefixed_fields() {
-    let vars = [("PRE_test", Some("true")), ("PRE_test__bar", Some("true"))];
+    let vars = [("PRE_test", ("true")), ("PRE_test__bar", ("true"))];
 
-    let config: Result<Simple, _> =
-        temp_env::with_vars(vars, || Config::new().with_prefix("PRE_").build_from_env());
+    let config: Result<Simple, _> = envious::Config::new().build_from_iter(vars);
 
     println!("{:?}", config.unwrap_err());
 }

tests/hashmap.rs

@@ -0,0 +1,30 @@
+#![allow(dead_code)]
+use std::collections::HashMap;
+
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize)]
+struct Outer {
+    values: HashMap<String, String>,
+    inner: Inner,
+}
+
+#[derive(Debug, Deserialize)]
+struct Inner {
+    more_values: HashMap<String, String>,
+}
+
+#[test]
+fn parse_hashmap() {
+    let vars = [
+        ("values__0key", ("first key")),
+        ("values__0val", ("first value")),
+        ("values__1key", ("second key")),
+        ("values__1val", ("second value")),
+        ("inner__more_values__0key", ("first inner key")),
+        ("inner__more_values__0val", ("first inner value")),
+    ];
+
+    let config: Outer = envious::Config::new().build_from_iter(vars).unwrap();
+    println!("{:#?}", config);
+}

tests/prefix_env.rs

@@ -26,17 +26,15 @@ struct Config {
 #[test]
 fn parse_from_env() {
     let vars = [
-        ("ENVIOUS_upstairs__doors__0__material", Some("Wood")),
-        ("ENVIOUS_upstairs__doors__2__material", Some("Glass")),
-        ("ENVIOUS_upstairs__doors__1__material", Some("Plastic")),
+        ("ENVIOUS_upstairs__doors__0__material", ("Wood")),
+        ("ENVIOUS_upstairs__doors__2__material", ("Glass")),
+        ("ENVIOUS_upstairs__doors__1__material", ("Plastic")),
     ];
 
-    let config: Config = temp_env::with_vars(vars, || {
-        envious::Config::new()
-            .with_prefix("ENVIOUS_")
-            .build_from_env()
-            .unwrap()
-    });
+    let config: Config = envious::Config::new()
+        .with_prefix("ENVIOUS_")
+        .build_from_iter(vars)
+        .unwrap();
 
     assert_eq!(
         config,
@@ -58,23 +56,19 @@ fn parse_from_env() {
     );
 
     // When case insensitive, the same test should succeed with a lowercase prefix.
-    let config: Config = temp_env::with_vars(vars, || {
-        envious::Config::new()
-            .case_sensitive(false)
-            .with_prefix("envious_")
-            .build_from_env()
-            .unwrap()
-    });
+    let config: Config = envious::Config::new()
+        .case_sensitive(false)
+        .with_prefix("envious_")
+        .build_from_iter(vars)
+        .unwrap();
 
     println!("{:#?}", config);
 
     // However when case sensitive, it will fail.
-    let result: Result<Config, _> = temp_env::with_vars(vars, || {
-        envious::Config::new()
-            .case_sensitive(true)
-            .with_prefix("envious_")
-            .build_from_env()
-    });
+    let result: Result<Config, _> = envious::Config::new()
+        .case_sensitive(true)
+        .with_prefix("envious_")
+        .build_from_iter(vars);
     let err = result.unwrap_err();
 
     println!("{:#?}", err);

tests/simple_env.rs

@@ -18,12 +18,11 @@ struct Config {
 #[test]
 fn parse_from_env() {
     let vars = [
-        ("target_temp", Some("25.0")),
-        ("automate_doors", Some("true")),
-        ("staircase_orientation", Some("Left")),
+        ("target_temp", ("25.0")),
+        ("automate_doors", ("true")),
+        ("staircase_orientation", ("Left")),
     ];
 
-    let config: Config =
-        temp_env::with_vars(vars, || envious::Config::new().build_from_env().unwrap());
+    let config: Config = envious::Config::new().build_from_iter(vars).unwrap();
     println!("{:#?}", config);
 }