mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-13 18:45:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

event factory: allow having unsigned data too

Browse Source 
And use the event factory in more timeline tests.
This commit is contained in:
Benjamin Bouvier
2024-08-29 17:19:42 +02:00
parent eecd00cd98
commit bfb04f2ddd
2 changed files with 67 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
crates/matrix-sdk-ui/src/timeline/tests/echo.rs
View File

@@ -17,11 +17,11 @@ use std::{io, sync::Arc};
use assert_matches::assert_matches;
use eyeball_im::VectorDiff;
use matrix_sdk::{send_queue::RoomSendQueueUpdate, test_utils::events::EventFactory, Error};
use matrix_sdk_test::{async_test, sync_timeline_event, ALICE, BOB};
use matrix_sdk_test::{async_test, ALICE, BOB};
use ruma::{
event_id,
events::{room::message::RoomMessageEventContent, AnyMessageLikeEventContent},
user_id, MilliSecondsSinceUnixEpoch,
uint, user_id, MilliSecondsSinceUnixEpoch,
};
use stream_assert::assert_next_matches;
@@ -109,16 +109,14 @@ async fn test_remote_echo_full_trip() {
// Now, a sync has been run against the server, and an event with the same ID
// comes in.
timeline
.handle_live_event(sync_timeline_event!({
"content": {
"body": "echo",
"msgtype": "m.text",
},
"sender": &*ALICE,
"event_id": event_id,
"origin_server_ts": timestamp,
"type": "m.room.message",
}))
.handle_live_event(
timeline
.factory
.text_msg("echo")
.sender(*ALICE)
.event_id(event_id)
.server_ts(timestamp),
)
.await;
// The local echo is replaced with the remote echo.
@@ -159,19 +157,13 @@ async fn test_remote_echo_new_position() {
// When the remote echo comes in…
timeline
.handle_live_event(sync_timeline_event!({
"content": {
"body": "echo",
"msgtype": "m.text",
},
"sender": &*ALICE,
"event_id": "$eeG0HA0FAZ37wP8kXlNkxx3I",
"origin_server_ts": 6,
"type": "m.room.message",
"unsigned": {
"transaction_id": txn_id,
},
}))
.handle_live_event(
f.text_msg("echo")
.sender(*ALICE)
.event_id(event_id!("$eeG0HA0FAZ37wP8kXlNkxx3I"))
.server_ts(MilliSecondsSinceUnixEpoch(uint!(6)))
.unsigned_transaction_id(&txn_id),
)
.await;
// … the remote echo replaces the previous event.
@@ -208,16 +200,9 @@ async fn test_day_divider_duplication() {
// … when the second remote event is re-received (day still the same)
let event_id = items[2].as_event().unwrap().event_id().unwrap();
timeline
.handle_live_event(sync_timeline_event!({
"content": {
"body": "B",
"msgtype": "m.text",
},
"sender": &*BOB,
"event_id": event_id,
"origin_server_ts": 1,
"type": "m.room.message",
}))
.handle_live_event(
f.text_msg("B").event_id(event_id).server_ts(MilliSecondsSinceUnixEpoch(uint!(1))),
)
.await;
// … it should not impact the day dividers.

71
crates/matrix-sdk/src/test_utils/events.rs
View File

@@ -17,7 +17,6 @@
use std::sync::atomic::{AtomicU64, Ordering::SeqCst};
use matrix_sdk_base::deserialized_responses::{SyncTimelineEvent, TimelineEvent};
use matrix_sdk_test::{sync_timeline_event, timeline_event};
use ruma::{
events::{
message::TextContentBlock,
@@ -35,10 +34,16 @@ use ruma::{
AnySyncTimelineEvent, AnyTimelineEvent, EventContent,
},
serde::Raw,
server_name, EventId, MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedRoomId, OwnedUserId,
RoomId, UserId,
server_name, EventId, MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedRoomId,
OwnedTransactionId, OwnedUserId, RoomId, TransactionId, UserId,
};
use serde::Serialize;
use serde_json::json;
#[derive(Debug, Default, Serialize)]
struct Unsigned {
transaction_id: Option<OwnedTransactionId>,
}
#[derive(Debug)]
pub struct EventBuilder<E: EventContent> {
@@ -48,6 +53,7 @@ pub struct EventBuilder<E: EventContent> {
redacts: Option<OwnedEventId>,
content: E,
server_ts: MilliSecondsSinceUnixEpoch,
unsigned: Option<Unsigned>,
}
impl<E: EventContent> EventBuilder<E>
@@ -74,20 +80,48 @@ where
self
}
pub fn into_raw_timeline(self) -> Raw<AnyTimelineEvent> {
let room_id = self.room.expect("we should have a room id at this point");
let event_id =
self.event_id.unwrap_or_else(|| EventId::new(room_id.server_name().unwrap()));
pub fn unsigned_transaction_id(mut self, transaction_id: &TransactionId) -> Self {
self.unsigned.get_or_insert_with(Default::default).transaction_id =
Some(transaction_id.to_owned());
self
}
timeline_event!({
#[inline(always)]
fn construct_json<T>(self, requires_room: bool) -> Raw<T> {
let event_id = self
.event_id
.or_else(|| {
self.room.as_ref().map(|room_id| EventId::new(room_id.server_name().unwrap()))
})
.unwrap_or_else(|| EventId::new(server_name!("dummy.org")));
let mut json = json!({
"type": self.content.event_type(),
"content": self.content,
"event_id": event_id,
"sender": self.sender.expect("we should have a sender user id at this point"),
"room_id": room_id,
"origin_server_ts": self.server_ts,
"redacts": self.redacts,
})
});
let map = json.as_object_mut().unwrap();
if requires_room {
let room_id = self.room.expect("TimelineEvent requires a room id");
map.insert("room_id".to_owned(), json!(room_id));
}
if let Some(redacts) = self.redacts {
map.insert("redacts".to_owned(), json!(redacts));
}
if let Some(unsigned) = self.unsigned {
map.insert("unsigned".to_owned(), json!(unsigned));
}
Raw::new(map).unwrap().cast()
}
pub fn into_raw_timeline(self) -> Raw<AnyTimelineEvent> {
self.construct_json(true)
}
pub fn into_timeline(self) -> TimelineEvent {
@@ -95,19 +129,7 @@ where
}
pub fn into_raw_sync(self) -> Raw<AnySyncTimelineEvent> {
let event_id = self
.event_id
.or_else(|| self.room.map(|room_id| EventId::new(room_id.server_name().unwrap())))
.unwrap_or_else(|| EventId::new(server_name!("dummy.org")));
sync_timeline_event!({
"type": self.content.event_type(),
"content": self.content,
"event_id": event_id,
"sender": self.sender.expect("we should have a sender user id at this point"),
"origin_server_ts": self.server_ts,
"redacts": self.redacts,
})
self.construct_json(false)
}
pub fn into_sync(self) -> SyncTimelineEvent {
@@ -211,6 +233,7 @@ impl EventFactory {
event_id: None,
redacts: None,
content,
unsigned: None,
}
}