Modify tests to use both ConfigBuilder and Config

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();