mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-08 07:56:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

test(base): Update tests after the previous patch.

Browse Source 
This patch updates the tests, which now break because of the previous
batch that fixes a bug.
This commit is contained in:
Ivan Enderlin
2025-04-16 17:02:20 +02:00
committed by Stefan Ceriu
parent ab34330e47
commit 3ec831f5da
2 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/matrix-sdk-base/src/rooms/normal.rs
View File

@@ -3285,7 +3285,7 @@ mod tests {
assert!(context.room_info_notable_updates.contains_key(room_id));
// The subscriber isn't notified at this point.
assert!(room_info_notable_update.try_recv().is_err());
assert!(room_info_notable_update.is_empty());
// Then updating the room info will store the event,
processors::changes::save_and_apply(

54
crates/matrix-sdk-base/src/sliding_sync.rs
View File

@@ -1107,14 +1107,6 @@ mod tests {
let room = client.get_room(room_id).expect("No room found");
assert_eq!(room.cached_display_name().unwrap().to_string(), "Hello World");
assert_matches!(
room_info_notable_update.recv().await,
Ok(RoomInfoNotableUpdate { room_id: received_room_id, reasons }) => {
assert_eq!(received_room_id, room_id);
// Not the reason we are looking for.
assert!(!reasons.contains(RoomInfoNotableUpdateReasons::DISPLAY_NAME));
}
);
assert_matches!(
room_info_notable_update.recv().await,
Ok(RoomInfoNotableUpdate { room_id: received_room_id, reasons }) => {
@@ -1123,6 +1115,7 @@ mod tests {
assert!(reasons.contains(RoomInfoNotableUpdateReasons::DISPLAY_NAME));
}
);
assert!(room_info_notable_update.is_empty());
}
#[async_test]
@@ -1820,6 +1813,7 @@ mod tests {
assert!(!received_reasons.contains(RoomInfoNotableUpdateReasons::RECENCY_STAMP));
}
);
assert!(room_info_notable_update_stream.is_empty());
// When I send sliding sync response containing a room with a recency stamp.
let room = assign!(http::response::Room::new(), {
@@ -1839,6 +1833,7 @@ mod tests {
assert!(received_reasons.contains(RoomInfoNotableUpdateReasons::RECENCY_STAMP));
}
);
assert!(room_info_notable_update_stream.is_empty());
}
#[async_test]
@@ -1856,7 +1851,8 @@ mod tests {
.await
.expect("Failed to process sync");
// Then a room info notable update is NOT received.
// Then a room info notable update is received, but not the one we are
// interested by.
assert_matches!(
room_info_notable_update_stream.recv().await,
Ok(RoomInfoNotableUpdate { room_id: received_room_id, reasons: received_reasons }) => {
@@ -1864,6 +1860,7 @@ mod tests {
assert!(!received_reasons.contains(RoomInfoNotableUpdateReasons::READ_RECEIPT));
}
);
assert!(room_info_notable_update_stream.is_empty());
// When I send sliding sync response containing a couple of events with no read
// receipt.
@@ -1890,6 +1887,7 @@ mod tests {
assert!(received_reasons.contains(RoomInfoNotableUpdateReasons::READ_RECEIPT));
}
);
assert!(room_info_notable_update_stream.is_empty());
}
#[async_test]
@@ -1907,8 +1905,14 @@ mod tests {
.await
.expect("Failed to process sync");
// Discard first room info update
let _ = room_info_notable_update_stream.recv().await;
// Other notable update reason. We don't really care about them here.
assert_matches!(
room_info_notable_update_stream.recv().await,
Ok(RoomInfoNotableUpdate { room_id: received_room_id, reasons: received_reasons }) => {
assert_eq!(received_room_id, room_id);
assert!(received_reasons.contains(RoomInfoNotableUpdateReasons::DISPLAY_NAME));
}
);
// Send sliding sync response containing a membership event with 'join' value.
let room_id = room_id!("!r:e.uk");
@@ -1933,14 +1937,8 @@ mod tests {
.await
.expect("Failed to process sync");
// Room was already joined, no MEMBERSHIP update should be triggered here
assert_matches!(
room_info_notable_update_stream.recv().await,
Ok(RoomInfoNotableUpdate { room_id: received_room_id, reasons: received_reasons }) => {
assert_eq!(received_room_id, room_id);
assert!(!received_reasons.contains(RoomInfoNotableUpdateReasons::MEMBERSHIP));
}
);
// Room was already joined, no `MEMBERSHIP` update should be triggered here
assert!(room_info_notable_update_stream.is_empty());
let events = vec![Raw::from_json_string(
json!({
@@ -1964,14 +1962,14 @@ mod tests {
.expect("Failed to process sync");
// Then a room info notable update is received.
let update = room_info_notable_update_stream.recv().await;
assert_matches!(
update,
room_info_notable_update_stream.recv().await,
Ok(RoomInfoNotableUpdate { room_id: received_room_id, reasons: received_reasons }) => {
assert_eq!(received_room_id, room_id);
assert!(received_reasons.contains(RoomInfoNotableUpdateReasons::MEMBERSHIP));
}
);
assert!(room_info_notable_update_stream.is_empty());
}
#[async_test]
@@ -1989,14 +1987,15 @@ mod tests {
.await
.expect("Failed to process sync");
// Then a room info notable update is NOT received.
// Another notable update is received, but not the one we are interested by.
assert_matches!(
room_info_notable_update_stream.recv().await,
Ok(RoomInfoNotableUpdate { room_id: received_room_id, reasons: received_reasons }) => {
assert_eq!(received_room_id, room_id);
assert!(!received_reasons.contains(RoomInfoNotableUpdateReasons::UNREAD_MARKER));
assert!(received_reasons.contains(RoomInfoNotableUpdateReasons::DISPLAY_NAME), "{received_reasons:?}");
}
);
assert!(room_info_notable_update_stream.is_empty());
// When I receive a sliding sync response containing one update about an unread
// marker,
@@ -2035,13 +2034,7 @@ mod tests {
.await
.expect("Failed to process sync");
assert_matches!(
room_info_notable_update_stream.recv().await,
Ok(RoomInfoNotableUpdate { room_id: received_room_id, reasons: received_reasons }) => {
assert_eq!(received_room_id, room_id);
assert!(!received_reasons.contains(RoomInfoNotableUpdateReasons::UNREAD_MARKER));
}
);
assert!(room_info_notable_update_stream.is_empty());
// …Unless its value changes!
let room_account_data_events = vec![Raw::from_json_string(
@@ -2068,6 +2061,7 @@ mod tests {
assert!(received_reasons.contains(RoomInfoNotableUpdateReasons::UNREAD_MARKER));
}
);
assert!(room_info_notable_update_stream.is_empty());
}
#[async_test]