|
1 |
| -use gix_mailmap::Snapshot; |
| 1 | +use gix_mailmap::{Entry, Snapshot}; |
2 | 2 | use gix_testtools::fixture_bytes;
|
3 | 3 |
|
4 | 4 | #[test]
|
@@ -54,7 +54,22 @@ fn try_resolve() {
|
54 | 54 | );
|
55 | 55 | assert_eq!(snapshot.resolve(sig.to_ref()), sig);
|
56 | 56 |
|
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 | + ); |
58 | 73 | }
|
59 | 74 |
|
60 | 75 | #[test]
|
@@ -84,7 +99,18 @@ fn non_name_and_name_mappings_will_not_clash() {
|
84 | 99 | "it can match by email and name as well"
|
85 | 100 | );
|
86 | 101 |
|
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 | + ); |
88 | 114 | }
|
89 | 115 | }
|
90 | 116 |
|
@@ -115,7 +141,20 @@ fn overwrite_entries() {
|
115 | 141 | "email by email"
|
116 | 142 | );
|
117 | 143 |
|
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 | + ); |
119 | 158 | }
|
120 | 159 |
|
121 | 160 | fn signature(name: &str, email: &str) -> gix_actor::Signature {
|
|
0 commit comments