Skip to content

Commit fb6a845

Browse files
committed
Setting the map_ambiguity's changes key in the tests
1 parent 7a93c57 commit fb6a845

File tree

1 file changed

+22
-5
lines changed

1 file changed

+22
-5
lines changed

crates/matrix-sdk-base/src/room/members.rs

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,8 @@ impl RoomMember {
216216

217217
let display_name = event.display_name();
218218
let membership = event.membership();
219+
220+
println!("{:?} {:?}", users_display_names, &display_name);
219221
let display_name_ambiguous = users_display_names.get(&display_name).is_some_and(|s| {
220222
if !is_display_name_ambiguous(&display_name, s) {
221223
return false;
@@ -572,30 +574,50 @@ mod tests {
572574
.or_default()
573575
.entry(StateEventType::RoomMember)
574576
.or_default();
577+
578+
let ambiguity_maps = changes
579+
.ambiguity_maps
580+
.entry(room.room_id().to_owned())
581+
.or_default();
582+
583+
584+
let display_name = DisplayName::new("Carol");
575585
members.insert(carol.into(), f.member(carol).display_name("Carol").into());
586+
ambiguity_maps.entry(display_name).or_default().insert(carol.to_owned());
576587

588+
let display_name = DisplayName::new("Fred");
577589
members.insert(fred.into(), f.member(fred).display_name("Fred").into());
590+
ambiguity_maps.entry(display_name.clone()).or_default().insert(fred.to_owned());
578591
members.insert(
579592
fredo.into(),
580593
f.member(fredo).display_name("Fred").membership(MembershipState::Knock).into(),
581594
);
595+
ambiguity_maps.entry(display_name.clone()).or_default().insert(fredo.to_owned());
582596
members.insert(
583597
denis.into(),
584598
f.member(denis).display_name("Fred").membership(MembershipState::Leave).into(),
585599
);
600+
ambiguity_maps.entry(display_name.clone()).or_default().insert(erica.to_owned());
586601
members.insert(
587602
erica.into(),
588603
f.member(erica).display_name("Fred").membership(MembershipState::Ban).into(),
589604
);
590605

606+
let display_name = DisplayName::new("Bob");
591607
members.insert(
592608
bob.into(),
593609
f.member(bob).display_name("Bob").membership(MembershipState::Invite).into(),
594610
);
611+
ambiguity_maps.entry(display_name.clone()).or_default().insert(bob.to_owned());
595612
members.insert(julie.into(), f.member(me).display_name("Bob").into());
613+
ambiguity_maps.entry(display_name.clone()).or_default().insert(julie.to_owned());
596614

615+
let display_name = DisplayName::new("Me");
597616
members.insert(me.into(), f.member(me).display_name("Me").into());
617+
ambiguity_maps.entry(display_name.clone()).or_default().insert(me.to_owned());
598618
members.insert(mewto.into(), f.member(mewto).display_name("Me").into());
619+
ambiguity_maps.entry(display_name.clone()).or_default().insert(mewto.to_owned());
620+
599621

600622
store.save_changes(&changes).await.unwrap();
601623
}
@@ -612,11 +634,6 @@ mod tests {
612634
assert!(!room.get_member(julie).await.unwrap().expect("Julie user").name_ambiguous());
613635
assert!(!room.get_member(bob).await.unwrap().expect("Bob user").name_ambiguous());
614636

615-
assert_eq!(room.get_member(me).await.unwrap().expect("Me user").display_name(), Some("Me"));
616-
assert_eq!(
617-
room.get_member(mewto).await.unwrap().expect("Mewto user").display_name(),
618-
Some("Me")
619-
);
620637

621638
assert!(room.get_member(me).await.unwrap().expect("Me user").name_ambiguous());
622639
assert!(room.get_member(mewto).await.unwrap().expect("Mewto user").name_ambiguous());

0 commit comments

Comments
 (0)