diff options
Diffstat (limited to 'tests/file.rs')
| -rw-r--r-- | tests/file.rs | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/tests/file.rs b/tests/file.rs index 0680c2a..8292426 100644 --- a/tests/file.rs +++ b/tests/file.rs @@ -6,16 +6,18 @@ 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 mut c = Config::builder(); + c.add_source(File::new("tests/NoSettings", FileFormat::Yaml).required(false)); + let res = c.build(); assert!(res.is_ok()); } #[test] fn test_file_required_not_found() { - let mut c = Config::default(); - let res = c.merge(File::new("tests/NoSettings", FileFormat::Yaml)); + let mut c = Config::builder(); + c.add_source(File::new("tests/NoSettings", FileFormat::Yaml)); + let res = c.build(); assert!(res.is_err()); assert_eq!( @@ -26,9 +28,10 @@ fn test_file_required_not_found() { #[test] fn test_file_auto() { - let mut c = Config::default(); - c.merge(File::with_name("tests/Settings-production")) - .unwrap(); + let mut builder = Config::builder(); + builder.add_source(File::with_name("tests/Settings-production")); + + let c = builder.build().unwrap(); assert_eq!(c.get("debug").ok(), Some(false)); assert_eq!(c.get("production").ok(), Some(true)); @@ -36,8 +39,9 @@ fn test_file_auto() { #[test] fn test_file_auto_not_found() { - let mut c = Config::default(); - let res = c.merge(File::with_name("tests/NoSettings")); + let mut c = Config::builder(); + c.add_source(File::with_name("tests/NoSettings")); + let res = c.build(); assert!(res.is_err()); assert_eq!( @@ -48,8 +52,10 @@ fn test_file_auto_not_found() { #[test] fn test_file_ext() { - let mut c = Config::default(); - c.merge(File::with_name("tests/Settings.json")).unwrap(); + let mut builder = Config::builder(); + builder.add_source(File::with_name("tests/Settings.json")); + + let c = builder.build().unwrap(); assert_eq!(c.get("debug").ok(), Some(true)); assert_eq!(c.get("production").ok(), Some(false)); |