Skip to content

Commit ae2b9ce

Browse files
committed
add a baseline for entries() to know more about its ordering.
1 parent 55cbc1b commit ae2b9ce

File tree

1 file changed

+43
-4
lines changed
  • gix-mailmap/tests/snapshot

1 file changed

+43
-4
lines changed

gix-mailmap/tests/snapshot/mod.rs

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use gix_mailmap::Snapshot;
1+
use gix_mailmap::{Entry, Snapshot};
22
use gix_testtools::fixture_bytes;
33

44
#[test]
@@ -54,7 +54,22 @@ fn try_resolve() {
5454
);
5555
assert_eq!(snapshot.resolve(sig.to_ref()), sig);
5656

57-
assert_eq!(snapshot.entries().len(), 6);
57+
assert_eq!(
58+
snapshot.entries(),
59+
&[
60+
Entry::change_name_and_email_by_name_and_email("Jane Doe", "[email protected]", "Jane", "[email protected]"),
61+
Entry::change_name_and_email_by_name_and_email(
62+
"Joe R. Developer",
63+
64+
"Joe",
65+
66+
),
67+
Entry::change_name_and_email_by_email("Jane Doe", "[email protected]", "jane@desktop.(none)"),
68+
Entry::change_email_by_name_and_email("[email protected]", "Jane", "Jane@ipad.(none)"),
69+
Entry::change_name_and_email_by_email("Jane Doe", "[email protected]", "jane@laptop.(none)"),
70+
Entry::change_name_by_email("Joe R. Developer", "[email protected]"),
71+
]
72+
);
5873
}
5974

6075
#[test]
@@ -84,7 +99,18 @@ fn non_name_and_name_mappings_will_not_clash() {
8499
"it can match by email and name as well"
85100
);
86101

87-
assert_eq!(snapshot.entries().len(), 2);
102+
assert_eq!(
103+
snapshot.entries(),
104+
&[
105+
Entry::change_name_by_email("new-name", "old-email"),
106+
Entry::change_name_and_email_by_name_and_email(
107+
"other-new-name",
108+
"other-new-email",
109+
"old-name",
110+
"old-email"
111+
)
112+
]
113+
);
88114
}
89115
}
90116

@@ -115,7 +141,20 @@ fn overwrite_entries() {
115141
"email by email"
116142
);
117143

118-
assert_eq!(snapshot.entries().len(), 4);
144+
assert_eq!(
145+
snapshot.entries(),
146+
&[
147+
Entry::change_name_by_email("A-overwritten", "old-a-email"),
148+
Entry::change_name_and_email_by_email("B-overwritten", "new-b-email-overwritten", "old-b-email"),
149+
Entry::change_name_and_email_by_name_and_email(
150+
"C-overwritten",
151+
"new-c-email-overwritten",
152+
"old-C",
153+
"old-c-email"
154+
),
155+
Entry::change_email_by_email("new-d-email-overwritten", "old-d-email")
156+
]
157+
);
119158
}
120159

121160
fn signature(name: &str, email: &str) -> gix_actor::Signature {

0 commit comments

Comments
 (0)