diff options
author | Radosław Kot <rdkt13@gmail.com> | 2021-04-24 19:44:27 +0200 |
---|---|---|
committer | Radosław Kot <rdkt13@gmail.com> | 2021-05-08 17:43:16 +0200 |
commit | 98662dd899d4eaab5dc2da07d5bb658960b588a6 (patch) | |
tree | c7513c9038ee817c62e444ff02507bca2da363bc /tests/file_json.rs | |
parent | 82d23c76a8637360e03c0b43d9a1c0c26d820d9f (diff) |
Modify tests to use both ConfigBuilder and Config
Diffstat (limited to 'tests/file_json.rs')
-rw-r--r-- | tests/file_json.rs | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/tests/file_json.rs b/tests/file_json.rs index bd27572..9d457e4 100644 --- a/tests/file_json.rs +++ b/tests/file_json.rs @@ -35,11 +35,9 @@ struct Settings { } fn make() -> Config { - let mut c = Config::default(); - c.merge(File::new("tests/Settings", FileFormat::Json)) - .unwrap(); - - c + let mut c = Config::builder(); + c.add_source(File::new("tests/Settings", FileFormat::Json)); + c.build().unwrap() } #[test] @@ -68,8 +66,9 @@ fn test_file() { #[test] fn test_error_parse() { - let mut c = Config::default(); - let res = c.merge(File::new("tests/Settings-invalid", FileFormat::Json)); + let mut c = Config::builder(); + c.add_source(File::new("tests/Settings-invalid", FileFormat::Json)); + let res = c.build(); let path_with_extension: PathBuf = ["tests", "Settings-invalid.json"].iter().collect(); @@ -85,17 +84,17 @@ fn test_error_parse() { #[test] fn test_json_vec() { - let c = Config::default() - .merge(File::from_str( - r#" + let mut builder = Config::builder(); + builder.add_source(File::from_str( + r#" { "WASTE": ["example_dir1", "example_dir2"] } "#, - FileFormat::Json, - )) - .unwrap() - .clone(); + FileFormat::Json, + )); + + let c = builder.build().unwrap(); let v = c.get_array("WASTE").unwrap(); let mut vi = v.into_iter(); |