char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Properly test for display name disambiguation.

master
Denis Kasak 2020-06-09 15:17:21 +02:00
parent b6d7939685
commit 60a43439e5
1 changed files with 60 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
matrix_sdk_base/src/models/room.rs
View File

@ -701,44 +701,77 @@ mod test {
#[async_test] #[async_test]
async fn test_member_display_name() { async fn test_member_display_name() {
let client = get_client(); // Initialize
let client_2 = { let client = get_client().await;
let session = Session {
access_token: "1234".to_owned(),
user_id: UserId::try_from("@example:hostlocal").unwrap(),
device_id: "DEVICEID".to_owned(),
};
BaseClient::new(Some(session)).unwrap()
};
let room_id = get_room_id(); let room_id = get_room_id();
let user_id = UserId::try_from("@example:localhost").unwrap(); let user_id1 = UserId::try_from("@example:localhost").unwrap();
let user_id2 = UserId::try_from("@someone_else:localhost").unwrap();
let mut response = EventBuilder::default() let member2_join_event = serde_json::json!({
"content": {
"avatar_url": null,
"displayname": "example",
"membership": "join"
},
"event_id": "$16345217l517tabbz:localhost",
"membership": "join",
"origin_server_ts": 1455123234,
"sender": "@someone_else:localhost",
"state_key": "@someone_else:localhost",
"type": "m.room.member",
"unsigned": {
"age": 1989321234,
"replaces_state": "$1622a2311315tkjoA:localhost",
"prev_content": {
"avatar_url": null,
"displayname": "example",
"membership": "invite"
}
}
});
let mut event_builder = EventBuilder::new();
let mut member1_join_sync_response = event_builder
.add_room_event(EventsFile::Member, RoomEvent::RoomMember) .add_room_event(EventsFile::Member, RoomEvent::RoomMember)
.build_sync_response(); .build_sync_response();
client.receive_sync_response(&mut response).await.unwrap(); let mut member2_join_sync_response = event_builder
.add_custom_joined_event(&room_id, member2_join_event, |ev| RoomEvent::RoomMember(ev))
.build_sync_response();
// First member with display name "example" joins
client
.receive_sync_response(&mut member1_join_sync_response)
.await
.unwrap();
// First member's disambiguated display name is "example"
{
let room = client.get_joined_room(&room_id).await.unwrap(); let room = client.get_joined_room(&room_id).await.unwrap();
let room = room.read().await; let room = room.read().await;
let display_name1 = room.member_display_name(&user_id1).unwrap();
let display_name = room.member_display_name(&user_id).unwrap(); assert_eq!("example", display_name1);
assert_eq!("example", display_name); }
let mut response = EventBuilder::default() // Second member with display name "example" joins
.add_room_event(EventsFile::Member, RoomEvent::RoomMember) client
.build_sync_response(); .receive_sync_response(&mut member2_join_sync_response)
.await
.unwrap();
client_2.receive_sync_response(&mut response).await.unwrap(); // Both of their display names are now disambiguated with MXIDs
{
let room = client.get_joined_room(&room_id).await.unwrap();
let room = room.read().await;
let display_name1 = room.member_display_name(&user_id1).unwrap();
let display_name2 = room.member_display_name(&user_id2).unwrap();
let room_2 = client_2.get_joined_room(&room_id).await.unwrap(); assert_eq!(format!("example ({})", user_id1), display_name1);
let room_2 = room_2.read().await; assert_eq!(format!("example ({})", user_id2), display_name2);
}
let display_name_2 = room_2.member_display_name(&user_id).unwrap();
// TODO: this should change
assert_eq!("example", display_name_2);
} }
#[async_test] #[async_test]