Skip to content

Commit 0a11c80

Browse files
committed
Merge #1738: test(core): add unit tests for merge trait
fcc0a34 test: add tests for trait of operations on various data structures, including conflict scenarios and checking for empty structures (pluveto) Pull request description: ### Description This update adds unit tests for the `Merge` trait implementations on `BTreeMap`, `BTreeSet`, `Vec`, and tuples. It also includes tests for the `is_empty` and `take` methods to ensure their correct functionality. ### Notes to the Reviewers - The tests cover basic scenarios for merging collections and checking their emptiness. - Consider the potential method name conflict with `BTreeSet`'s existing `take` method. ### Changelog Notice - Added unit tests for merging functionality and utility methods (`is_empty`, `take`) on various collection types. ### Checklists #### All Submissions: * [x] I've signed all my commits. * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk/blob/master/CONTRIBUTING.md). * [x] I ran `cargo fmt` and `cargo clippy` before committing. Top commit has no ACKs. Tree-SHA512: fdcd67ca9127986e9ce9aa9ccc3276aaff127fa9333696c61ff2ca1b37a2ce8f9fe7af8e06ab57dda493741e91fa63a3aba58a1338a17090626225899e6c7588
2 parents 88330f6 + fcc0a34 commit 0a11c80

File tree

1 file changed

+119
-0
lines changed

1 file changed

+119
-0
lines changed

crates/core/tests/test_merge.rs

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
use std::collections::{BTreeMap, BTreeSet};
2+
3+
use bdk_core::Merge;
4+
5+
#[test]
6+
fn test_btree_map_merge() {
7+
let mut map1: BTreeMap<i32, &str> = BTreeMap::new();
8+
map1.insert(1, "a");
9+
let mut map2: BTreeMap<i32, &str> = BTreeMap::new();
10+
map2.insert(2, "b");
11+
12+
map1.merge(map2);
13+
14+
let expected: BTreeMap<i32, &str> = BTreeMap::from([(1, "a"), (2, "b")]);
15+
assert_eq!(map1, expected);
16+
}
17+
18+
#[test]
19+
fn test_btree_set_merge() {
20+
let mut set1: BTreeSet<i32> = BTreeSet::new();
21+
set1.insert(1);
22+
let mut set2: BTreeSet<i32> = BTreeSet::new();
23+
set2.insert(2);
24+
25+
set1.merge(set2);
26+
27+
let expected: BTreeSet<i32> = BTreeSet::from([1, 2]);
28+
assert_eq!(set1, expected);
29+
}
30+
31+
#[test]
32+
fn test_vec_merge() {
33+
let mut vec1 = vec![1, 2, 3];
34+
let vec2 = vec![4, 5, 6];
35+
36+
vec1.merge(vec2);
37+
38+
assert_eq!(vec1, vec![1, 2, 3, 4, 5, 6]);
39+
}
40+
41+
#[test]
42+
fn test_tuple_merge() {
43+
let mut tuple1 = (vec![1, 2], BTreeSet::from([3]));
44+
let tuple2 = (vec![3, 4], BTreeSet::from([4]));
45+
46+
tuple1.merge(tuple2);
47+
48+
let expected_vec = vec![1, 2, 3, 4];
49+
assert_eq!(tuple1.0, expected_vec);
50+
let expected_set: BTreeSet<i32> = BTreeSet::from([3, 4]);
51+
assert_eq!(tuple1.1, expected_set);
52+
}
53+
54+
#[test]
55+
fn test_is_empty() {
56+
let map: BTreeMap<i32, i32> = BTreeMap::new();
57+
assert!(Merge::is_empty(&map));
58+
59+
let set: BTreeSet<i32> = BTreeSet::new();
60+
assert!(Merge::is_empty(&set));
61+
62+
let vec: Vec<i32> = Vec::new();
63+
assert!(Merge::is_empty(&vec));
64+
}
65+
#[test]
66+
fn test_take() {
67+
let mut map: BTreeMap<i32, i32> = BTreeMap::new();
68+
map.insert(1, 1);
69+
let taken_map = Merge::take(&mut map);
70+
assert_eq!(taken_map, Some(BTreeMap::from([(1, 1)])));
71+
assert!(map.is_empty());
72+
73+
let mut set: BTreeSet<i32> = BTreeSet::new();
74+
set.insert(1);
75+
let taken_set = Merge::take(&mut set);
76+
assert_eq!(taken_set, Some(BTreeSet::from([1])));
77+
assert!(set.is_empty());
78+
79+
let mut vec: Vec<i32> = vec![1];
80+
let taken_vec = Merge::take(&mut vec);
81+
assert_eq!(taken_vec, Some(vec![1]));
82+
assert!(vec.is_empty());
83+
}
84+
85+
#[test]
86+
fn test_btree_map_merge_conflict() {
87+
let mut map1: BTreeMap<i32, &str> = BTreeMap::new();
88+
map1.insert(1, "a");
89+
let mut map2: BTreeMap<i32, &str> = BTreeMap::new();
90+
map2.insert(1, "b");
91+
92+
map1.merge(map2);
93+
94+
let expected: BTreeMap<i32, &str> = BTreeMap::from([(1, "b")]);
95+
assert_eq!(map1, expected);
96+
}
97+
98+
#[test]
99+
fn test_btree_set_merge_conflict() {
100+
let mut set1: BTreeSet<i32> = BTreeSet::new();
101+
set1.insert(1);
102+
let mut set2: BTreeSet<i32> = BTreeSet::new();
103+
set2.insert(1);
104+
105+
set1.merge(set2);
106+
107+
let expected: BTreeSet<i32> = BTreeSet::from([1]);
108+
assert_eq!(set1, expected);
109+
}
110+
111+
#[test]
112+
fn test_vec_merge_duplicates() {
113+
let mut vec1 = vec![1, 2, 3];
114+
let vec2 = vec![3, 4, 5];
115+
116+
vec1.merge(vec2);
117+
118+
assert_eq!(vec1, vec![1, 2, 3, 3, 4, 5]);
119+
}

0 commit comments

Comments
 (0)