diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/datetime.rs | 4 | ||||
-rw-r--r-- | tests/file.rs | 4 | ||||
-rw-r--r-- | tests/file_hjson.rs | 6 | ||||
-rw-r--r-- | tests/file_ini.rs | 123 | ||||
-rw-r--r-- | tests/file_json.rs | 8 | ||||
-rw-r--r-- | tests/file_toml.rs | 6 | ||||
-rw-r--r-- | tests/file_yaml.rs | 6 | ||||
-rw-r--r-- | tests/get.rs | 6 | ||||
-rw-r--r-- | tests/set.rs | 5 |
9 files changed, 86 insertions, 82 deletions
diff --git a/tests/datetime.rs b/tests/datetime.rs index 26b395d..f318f03 100644 --- a/tests/datetime.rs +++ b/tests/datetime.rs @@ -1,8 +1,8 @@ -extern crate config; extern crate chrono; +extern crate config; -use config::*; use chrono::{DateTime, TimeZone, Utc}; +use config::*; fn make() -> Config { Config::default() diff --git a/tests/file.rs b/tests/file.rs index 5f49e7f..c89d5da 100644 --- a/tests/file.rs +++ b/tests/file.rs @@ -5,9 +5,7 @@ use config::*; #[test] fn test_file_not_required() { let mut c = Config::default(); - let res = c.merge( - File::new("tests/NoSettings", FileFormat::Yaml).required(false), - ); + let res = c.merge(File::new("tests/NoSettings", FileFormat::Yaml).required(false)); assert!(res.is_ok()); } diff --git a/tests/file_hjson.rs b/tests/file_hjson.rs index f8465be..40c25cb 100644 --- a/tests/file_hjson.rs +++ b/tests/file_hjson.rs @@ -1,13 +1,13 @@ extern crate config; -extern crate serde; extern crate float_cmp; +extern crate serde; #[macro_use] extern crate serde_derive; -use std::collections::HashMap; -use float_cmp::ApproxEqUlps; use config::*; +use float_cmp::ApproxEqUlps; +use std::collections::HashMap; #[derive(Debug, Deserialize)] struct Place { diff --git a/tests/file_ini.rs b/tests/file_ini.rs index 4c0030a..30d86a3 100644 --- a/tests/file_ini.rs +++ b/tests/file_ini.rs @@ -1,60 +1,63 @@ -extern crate config;
-extern crate serde;
-extern crate float_cmp;
-
-#[macro_use]
-extern crate serde_derive;
-
-use config::*;
-
-#[derive(Debug, Deserialize, PartialEq)]
-struct Place {
- name: String,
- longitude: f64,
- latitude: f64,
- favorite: bool,
- reviews: u64,
- rating: Option<f32>,
-}
-
-#[derive(Debug, Deserialize, PartialEq)]
-struct Settings {
- debug: f64,
- place: Place,
-}
-
-fn make() -> Config {
- let mut c = Config::default();
- c.merge(File::new("tests/Settings", FileFormat::Ini))
- .unwrap();
- c
-}
-
-#[test]
-fn test_file() {
- let c = make();
- let s: Settings = c.try_into().unwrap();
- assert_eq!(s, Settings {
- debug: 1.0,
- place: Place {
- name: String::from("Torre di Pisa"),
- longitude: 43.7224985,
- latitude: 10.3970522,
- favorite: false,
- reviews: 3866,
- rating: Some(4.5),
- },
- });
-}
-
-#[test]
-fn test_error_parse() {
- let mut c = Config::default();
- let res = c.merge(File::new("tests/Settings-invalid", FileFormat::Ini));
-
- assert!(res.is_err());
- assert_eq!(
- res.unwrap_err().to_string(),
- r#"2:0 Expecting "[Some('='), Some(':')]" but found EOF. in tests/Settings-invalid.ini"#
- );
-}
+extern crate config; +extern crate float_cmp; +extern crate serde; + +#[macro_use] +extern crate serde_derive; + +use config::*; + +#[derive(Debug, Deserialize, PartialEq)] +struct Place { + name: String, + longitude: f64, + latitude: f64, + favorite: bool, + reviews: u64, + rating: Option<f32>, +} + +#[derive(Debug, Deserialize, PartialEq)] +struct Settings { + debug: f64, + place: Place, +} + +fn make() -> Config { + let mut c = Config::default(); + c.merge(File::new("tests/Settings", FileFormat::Ini)) + .unwrap(); + c +} + +#[test] +fn test_file() { + let c = make(); + let s: Settings = c.try_into().unwrap(); + assert_eq!( + s, + Settings { + debug: 1.0, + place: Place { + name: String::from("Torre di Pisa"), + longitude: 43.7224985, + latitude: 10.3970522, + favorite: false, + reviews: 3866, + rating: Some(4.5), + }, + } + ); +} + +#[test] +fn test_error_parse() { + let mut c = Config::default(); + let res = c.merge(File::new("tests/Settings-invalid", FileFormat::Ini)); + + assert!(res.is_err()); + assert_eq!( + res.unwrap_err().to_string(), + r#"2:0 Expecting "[Some('='), Some(':')]" but found EOF. in tests/Settings-invalid.ini"# + ); +} diff --git a/tests/file_json.rs b/tests/file_json.rs index c27c9b0..c07a77d 100644 --- a/tests/file_json.rs +++ b/tests/file_json.rs @@ -1,13 +1,13 @@ extern crate config; -extern crate serde; extern crate float_cmp; +extern crate serde; #[macro_use] extern crate serde_derive; -use std::collections::HashMap; -use float_cmp::ApproxEqUlps; use config::*; +use float_cmp::ApproxEqUlps; +use std::collections::HashMap; #[derive(Debug, Deserialize)] struct Place { @@ -72,4 +72,4 @@ fn test_error_parse() { res.unwrap_err().to_string(), "expected `:` at line 4 column 1 in tests/Settings-invalid.json".to_string() ); -}
\ No newline at end of file +} diff --git a/tests/file_toml.rs b/tests/file_toml.rs index 7feb6b5..b1e70c0 100644 --- a/tests/file_toml.rs +++ b/tests/file_toml.rs @@ -1,13 +1,13 @@ extern crate config; -extern crate serde; extern crate float_cmp; +extern crate serde; #[macro_use] extern crate serde_derive; -use std::collections::HashMap; -use float_cmp::ApproxEqUlps; use config::*; +use float_cmp::ApproxEqUlps; +use std::collections::HashMap; #[derive(Debug, Deserialize)] struct Place { diff --git a/tests/file_yaml.rs b/tests/file_yaml.rs index 9864133..1d00d85 100644 --- a/tests/file_yaml.rs +++ b/tests/file_yaml.rs @@ -1,13 +1,13 @@ extern crate config; -extern crate serde; extern crate float_cmp; +extern crate serde; #[macro_use] extern crate serde_derive; -use std::collections::HashMap; -use float_cmp::ApproxEqUlps; use config::*; +use float_cmp::ApproxEqUlps; +use std::collections::HashMap; #[derive(Debug, Deserialize)] struct Place { diff --git a/tests/get.rs b/tests/get.rs index dac138c..87f80a1 100644 --- a/tests/get.rs +++ b/tests/get.rs @@ -1,13 +1,13 @@ extern crate config; -extern crate serde; extern crate float_cmp; +extern crate serde; #[macro_use] extern crate serde_derive; -use std::collections::HashMap; -use float_cmp::ApproxEqUlps; use config::*; +use float_cmp::ApproxEqUlps; +use std::collections::HashMap; #[derive(Debug, Deserialize)] struct Place { diff --git a/tests/set.rs b/tests/set.rs index 577e074..e1f6290 100644 --- a/tests/set.rs +++ b/tests/set.rs @@ -55,7 +55,10 @@ fn test_set_arr_path() { c.set("data[0].things[1].value", 42).unwrap(); c.set("data[1]", 0).unwrap(); - assert_eq!(c.get("data[0].things[1].name").ok(), Some("foo".to_string())); + assert_eq!( + c.get("data[0].things[1].name").ok(), + Some("foo".to_string()) + ); assert_eq!(c.get("data[0].things[1].value").ok(), Some(42)); assert_eq!(c.get("data[1]").ok(), Some(0)); |