summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/merge.rs20
1 files changed, 20 insertions, 0 deletions
diff --git a/tests/merge.rs b/tests/merge.rs
index f83eef8..d6eb9e0 100644
--- a/tests/merge.rs
+++ b/tests/merge.rs
@@ -25,3 +25,23 @@ fn test_merge() {
);
assert_eq!(c.get("place.rating").ok(), Some(4.9));
}
+
+#[test]
+fn test_merge_whole_config() {
+ let mut c1 = Config::default();
+ let mut c2 = Config::default();
+
+ c1.set("x", 10).unwrap();
+ c2.set("y", 25).unwrap();
+
+ assert_eq!(c1.get("x").ok(), Some(10));
+ assert_eq!(c2.get::<()>("x").ok(), None);
+
+ assert_eq!(c2.get("y").ok(), Some(25));
+ assert_eq!(c1.get::<()>("y").ok(), None);
+
+ c1.merge(c2).unwrap();
+
+ assert_eq!(c1.get("x").ok(), Some(10));
+ assert_eq!(c1.get("y").ok(), Some(25));
+}