mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-02-15 10:03:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

test: Rename DEFAULT_SYNC_ROOM_ID to DEFAULT_TEST_ROOM_ID

Browse Source 
… and move to matrix-sdk-test's crate root.
This commit is contained in:
Jonas Platte
2023-10-23 11:35:52 +02:00
committed by Jonas Platte
parent f43eb94a8c
commit 254efed150
17 changed files with 89 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/matrix-sdk/src/client/mod.rs
View File

@@ -1939,6 +1939,7 @@ pub(crate) mod tests {
use matrix_sdk_base::RoomState;
use matrix_sdk_test::{
async_test, test_json, JoinedRoomBuilder, StateTestEvent, SyncResponseBuilder,
DEFAULT_TEST_ROOM_ID,
};
#[cfg(target_arch = "wasm32")]
wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
@@ -2050,11 +2051,10 @@ pub(crate) mod tests {
.build_sync_response();
client.inner.base_client.receive_sync_response(response).await.unwrap();
let room_id = &test_json::DEFAULT_SYNC_ROOM_ID;
assert_eq!(client.homeserver(), Url::parse(&server.uri()).unwrap());
let room = client.get_room(room_id).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
assert_eq!(room.state(), RoomState::Joined);
}

5
crates/matrix-sdk/src/encryption/mod.rs
View File

@@ -1057,7 +1057,7 @@ mod tests {
use matrix_sdk_base::SessionMeta;
use matrix_sdk_test::{
async_test, test_json, GlobalAccountDataTestEvent, JoinedRoomBuilder, StateTestEvent,
SyncResponseBuilder,
SyncResponseBuilder, DEFAULT_TEST_ROOM_ID,
};
use ruma::{
device_id, event_id,
@@ -1083,7 +1083,6 @@ mod tests {
let client = logged_in_client(Some(server.uri())).await;
let event_id = event_id!("$2:example.org");
let room_id = &test_json::DEFAULT_SYNC_ROOM_ID;
Mock::given(method("GET"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/state/m.*room.*encryption.?"))
@@ -1114,7 +1113,7 @@ mod tests {
client.base_client().receive_sync_response(response).await.unwrap();
let room = client.get_room(room_id).expect("Room should exist");
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).expect("Room should exist");
assert!(room.is_encrypted().await.expect("Getting encryption state"));
let event_id = event_id!("$1:example.org");

4
crates/matrix-sdk/src/event_handler/mod.rs
View File

@@ -538,7 +538,7 @@ impl_event_handler!(A, B, C, D, E, F, G, H);
#[cfg(test)]
mod tests {
use matrix_sdk_test::{
async_test, test_json::DEFAULT_SYNC_ROOM_ID, InvitedRoomBuilder, JoinedRoomBuilder,
async_test, InvitedRoomBuilder, JoinedRoomBuilder, DEFAULT_TEST_ROOM_ID,
};
#[cfg(target_arch = "wasm32")]
wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
@@ -770,7 +770,7 @@ mod tests {
});
let handle_b = client.add_room_event_handler(
#[allow(unknown_lints, clippy::explicit_auto_deref)] // lint is buggy
*DEFAULT_SYNC_ROOM_ID,
*DEFAULT_TEST_ROOM_ID,
move |_ev: OriginalSyncRoomMemberEvent| async {
panic!("handler should have been removed");
},

5
crates/matrix-sdk/src/room/mod.rs
View File

@@ -2448,6 +2448,8 @@ mod tests {
#[cfg(all(feature = "sqlite", feature = "e2e-encryption"))]
#[async_test]
async fn test_cache_invalidation_while_encrypt() {
use matrix_sdk_test::DEFAULT_TEST_ROOM_ID;
let sqlite_path = std::env::temp_dir().join("cache_invalidation_while_encrypt.db");
let session = MatrixSession {
meta: SessionMeta {
@@ -2470,7 +2472,6 @@ mod tests {
// Mock receiving an event to create an internal room.
let server = MockServer::start().await;
let room_id = &test_json::DEFAULT_SYNC_ROOM_ID;
{
Mock::given(method("GET"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/state/m.*room.*encryption.?"))
@@ -2492,7 +2493,7 @@ mod tests {
client.base_client().receive_sync_response(response).await.unwrap();
}
let room = client.get_room(room_id).expect("Room should exist");
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).expect("Room should exist");
// Step 1, preshare the room keys.
room.preshare_room_key().await.unwrap();

20
crates/matrix-sdk/tests/integration/client.rs
View File

@@ -8,7 +8,7 @@ use matrix_sdk::{
sync::RoomUpdate,
};
use matrix_sdk_base::RoomState;
use matrix_sdk_test::{async_test, test_json};
use matrix_sdk_test::{async_test, test_json, DEFAULT_TEST_ROOM_ID};
use ruma::{
api::client::{
directory::{
@@ -142,17 +142,16 @@ async fn resolve_room_alias() {
#[async_test]
async fn join_leave_room() {
let room_id = &test_json::DEFAULT_SYNC_ROOM_ID;
let (client, server) = logged_in_client().await;
mock_sync(&server, &*test_json::SYNC, None).await;
let room = client.get_room(room_id);
let room = client.get_room(&DEFAULT_TEST_ROOM_ID);
assert!(room.is_none());
let sync_token = client.sync_once(SyncSettings::default()).await.unwrap().next_batch;
let room = client.get_room(room_id).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
assert_eq!(room.state(), RoomState::Joined);
mock_sync(&server, &*test_json::LEAVE_SYNC_EVENT, Some(sync_token.clone())).await;
@@ -160,7 +159,7 @@ async fn join_leave_room() {
client.sync_once(SyncSettings::default().token(sync_token)).await.unwrap();
assert_eq!(room.state(), RoomState::Left);
let room = client.get_room(room_id).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
assert_eq!(room.state(), RoomState::Left);
}
@@ -273,7 +272,7 @@ async fn left_rooms() {
assert!(!client.left_rooms().is_empty());
assert!(client.invited_rooms().is_empty());
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
assert_eq!(room.state(), RoomState::Left);
}
@@ -360,7 +359,7 @@ async fn whoami() {
async fn room_update_channel() {
let (client, server) = logged_in_client().await;
let mut rx = client.subscribe_to_room_updates(room_id!("!SVkFJHzfwvuaIEawgC:localhost"));
let mut rx = client.subscribe_to_room_updates(&DEFAULT_TEST_ROOM_ID);
mock_sync(&server, &*test_json::SYNC, None).await;
let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
@@ -387,7 +386,6 @@ async fn room_update_channel() {
#[cfg(all(feature = "e2e-encryption", not(target_arch = "wasm32")))]
#[async_test]
async fn request_encryption_event_before_sending() {
let room_id = &test_json::DEFAULT_SYNC_ROOM_ID;
let (client, server) = logged_in_client().await;
mock_sync(&server, &*test_json::SYNC, None).await;
@@ -396,7 +394,8 @@ async fn request_encryption_event_before_sending() {
.await
.expect("We should be able to performa an initial sync");
let room = client.get_room(room_id).expect("We should know about our default room");
let room =
client.get_room(&DEFAULT_TEST_ROOM_ID).expect("We should know about our default room");
Mock::given(method("GET"))
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/state/m.room.encryption/"))
@@ -438,7 +437,6 @@ async fn request_encryption_event_before_sending() {
// a DM.
#[async_test]
async fn marking_room_as_dm() {
let room_id = &test_json::DEFAULT_SYNC_ROOM_ID;
let (client, server) = logged_in_client().await;
mock_sync(&server, &*test_json::SYNC, None).await;
@@ -500,7 +498,7 @@ async fn marking_room_as_dm() {
client
.account()
.mark_as_dm(room_id, &users)
.mark_as_dm(&DEFAULT_TEST_ROOM_ID, &users)
.await
.expect("We should be able to mark the room as a DM");

16
crates/matrix-sdk/tests/integration/room/common.rs
View File

@@ -4,7 +4,7 @@ use assert_matches::assert_matches;
use matrix_sdk::{config::SyncSettings, room::RoomMember, DisplayName, RoomMemberships};
use matrix_sdk_test::{
async_test, bulk_room_members, sync_timeline_event, test_json, JoinedRoomBuilder,
StateTestEvent, SyncResponseBuilder,
StateTestEvent, SyncResponseBuilder, DEFAULT_TEST_ROOM_ID,
};
use ruma::{
event_id,
@@ -39,7 +39,7 @@ async fn user_presence() {
let _response = client.sync_once(sync_settings).await.unwrap();
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
let members: Vec<RoomMember> = room.members(RoomMemberships::ACTIVE).await.unwrap();
assert_eq!(2, members.len());
@@ -54,7 +54,7 @@ async fn calculate_room_names_from_summary() {
let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
let _response = client.sync_once(sync_settings).await.unwrap();
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
assert_eq!(DisplayName::Calculated("example2".to_owned()), room.display_name().await.unwrap());
}
@@ -70,7 +70,7 @@ async fn room_names() {
let sync_token = client.sync_once(sync_settings).await.unwrap().next_batch;
assert_eq!(client.rooms().len(), 1);
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
assert_eq!(DisplayName::Aliased("tutorial".to_owned()), room.display_name().await.unwrap());
@@ -89,15 +89,13 @@ async fn room_names() {
#[async_test]
async fn test_state_event_getting() {
let room_id = &test_json::DEFAULT_SYNC_ROOM_ID;
let (client, server) = logged_in_client().await;
let sync = json!({
"next_batch": "1234",
"rooms": {
"join": {
"!SVkFJHzfwvuaIEawgC:localhost": {
*DEFAULT_TEST_ROOM_ID: {
"state": {
"events": [
{
@@ -150,12 +148,12 @@ async fn test_state_event_getting() {
mock_sync(&server, sync, None).await;
let room = client.get_room(room_id);
let room = client.get_room(&DEFAULT_TEST_ROOM_ID);
assert!(room.is_none());
client.sync_once(SyncSettings::default()).await.unwrap();
let room = client.get_room(room_id).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
let state_events = room.get_state_events(StateEventType::RoomEncryption).await.unwrap();
assert_eq!(state_events.len(), 1);

38
crates/matrix-sdk/tests/integration/room/joined.rs
View File

@@ -10,7 +10,7 @@ use matrix_sdk::{
room::Receipts,
};
use matrix_sdk_base::RoomState;
use matrix_sdk_test::{async_test, test_json};
use matrix_sdk_test::{async_test, test_json, DEFAULT_TEST_ROOM_ID};
use ruma::{
api::client::{membership::Invite3pidInit, receipt::create_receipt::v3::ReceiptType},
assign, event_id,
@@ -43,7 +43,7 @@ async fn invite_user_by_id() {
let _response = client.sync_once(sync_settings).await.unwrap();
let user = user_id!("@example:localhost");
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
room.invite_user_by_id(user).await.unwrap();
}
@@ -65,7 +65,7 @@ async fn invite_user_by_3pid() {
let _response = client.sync_once(sync_settings).await.unwrap();
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
room.invite_user_by_3pid(
Invite3pidInit {
@@ -97,7 +97,7 @@ async fn leave_room() -> Result<(), anyhow::Error> {
let _response = client.sync_once(sync_settings).await?;
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
room.leave().await?;
@@ -124,7 +124,7 @@ async fn ban_user() {
let _response = client.sync_once(sync_settings).await.unwrap();
let user = user_id!("@example:localhost");
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
room.ban_user(user, None).await.unwrap();
}
@@ -147,7 +147,7 @@ async fn kick_user() {
let _response = client.sync_once(sync_settings).await.unwrap();
let user = user_id!("@example:localhost");
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
room.kick_user(user, None).await.unwrap();
}
@@ -170,7 +170,7 @@ async fn send_single_receipt() {
let _response = client.sync_once(sync_settings).await.unwrap();
let event_id = event_id!("$xxxxxx:example.org").to_owned();
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
room.send_single_receipt(ReceiptType::Read, ReceiptThread::Unthreaded, event_id).await.unwrap();
}
@@ -193,7 +193,7 @@ async fn send_multiple_receipts() {
let _response = client.sync_once(sync_settings).await.unwrap();
let event_id = event_id!("$xxxxxx:example.org").to_owned();
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
let receipts = Receipts::new().fully_read_marker(event_id);
room.send_multiple_receipts(receipts).await.unwrap();
@@ -216,7 +216,7 @@ async fn typing_notice() {
let _response = client.sync_once(sync_settings).await.unwrap();
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
room.typing_notice(true).await.unwrap();
}
@@ -240,9 +240,7 @@ async fn room_state_event_send() {
let _response = client.sync_once(sync_settings).await.unwrap();
let room_id = &test_json::DEFAULT_SYNC_ROOM_ID;
let room = client.get_room(room_id).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
let avatar_url = mxc_uri!("mxc://example.org/avA7ar");
let member_event = assign!(RoomMemberEventContent::new(MembershipState::Join), {
@@ -271,7 +269,7 @@ async fn room_message_send() {
let _response = client.sync_once(sync_settings).await.unwrap();
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
let content = RoomMessageEventContent::text_plain("Hello world");
let txn_id = TransactionId::new();
@@ -313,7 +311,7 @@ async fn room_attachment_send() {
let _response = client.sync_once(sync_settings).await.unwrap();
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
let response = room
.send_attachment(
@@ -363,7 +361,7 @@ async fn room_attachment_send_info() {
let _response = client.sync_once(sync_settings).await.unwrap();
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
let config = AttachmentConfig::new().info(AttachmentInfo::Image(BaseImageInfo {
height: Some(uint!(600)),
@@ -415,7 +413,7 @@ async fn room_attachment_send_wrong_info() {
let _response = client.sync_once(sync_settings).await.unwrap();
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
let config = AttachmentConfig::new().info(AttachmentInfo::Video(BaseVideoInfo {
height: Some(uint!(600)),
@@ -474,7 +472,7 @@ async fn room_attachment_send_info_thumbnail() {
let _response = client.sync_once(sync_settings).await.unwrap();
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
let config = AttachmentConfig::with_thumbnail(Thumbnail {
data: b"Thumbnail".to_vec(),
@@ -511,7 +509,7 @@ async fn room_redact() {
.mount(&server)
.await;
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
let event_id = event_id!("$xxxxxxxx:example.com");
@@ -542,7 +540,7 @@ async fn fetch_members_deduplication() {
.mount(&server)
.await;
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
let mut tasks = Vec::new();
@@ -572,7 +570,7 @@ async fn set_name() {
let sync_settings = SyncSettings::new();
client.sync_once(sync_settings).await.unwrap();
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
let name = "The room name";
Mock::given(method("PUT"))

9
crates/matrix-sdk/tests/integration/room/left.rs
View File

@@ -2,7 +2,7 @@ use std::time::Duration;
use matrix_sdk::config::SyncSettings;
use matrix_sdk_base::RoomState;
use matrix_sdk_test::{async_test, test_json};
use matrix_sdk_test::{async_test, test_json, DEFAULT_TEST_ROOM_ID};
use serde_json::json;
use wiremock::{
matchers::{header, method, path_regex},
@@ -27,7 +27,7 @@ async fn forget_room() {
let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
let _response = client.sync_once(sync_settings).await.unwrap();
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
assert_eq!(room.state(), RoomState::Left);
room.forget().await.unwrap();
@@ -41,8 +41,7 @@ async fn rejoin_room() {
.and(path_regex(r"^/_matrix/client/r0/rooms/.*/join"))
.and(header("authorization", "Bearer 1234"))
.respond_with(
ResponseTemplate::new(200)
.set_body_json(json!({ "room_id": *test_json::DEFAULT_SYNC_ROOM_ID })),
ResponseTemplate::new(200).set_body_json(json!({ "room_id": *DEFAULT_TEST_ROOM_ID })),
)
.mount(&server)
.await;
@@ -51,7 +50,7 @@ async fn rejoin_room() {
let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
let _response = client.sync_once(sync_settings).await.unwrap();
let room = client.get_room(&test_json::DEFAULT_SYNC_ROOM_ID).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
assert_eq!(room.state(), RoomState::Left);
room.join().await.unwrap();

7
crates/matrix-sdk/tests/integration/room/notification_mode.rs
View File

@@ -5,7 +5,7 @@ use matrix_sdk::{config::SyncSettings, notification_settings::RoomNotificationMo
use matrix_sdk_base::RoomState;
use matrix_sdk_test::{
async_test, GlobalAccountDataTestEvent, InvitedRoomBuilder, JoinedRoomBuilder,
SyncResponseBuilder,
SyncResponseBuilder, DEFAULT_TEST_ROOM_ID,
};
use ruma::room_id;
use serde_json::json;
@@ -18,7 +18,6 @@ use crate::{logged_in_client, mock_sync};
#[async_test]
async fn get_notification_mode() {
let room_id = room_id!("!SVkFJHzfwvuaIEawgC:localhost");
let room_no_rules_id = room_id!("!jEsUZKDJdhlrceRyVU:localhost");
let room_not_joined_id = room_id!("!aBfUOMDJhmtucfVzGa:localhost");
let (client, server) = logged_in_client().await;
@@ -27,7 +26,7 @@ async fn get_notification_mode() {
// Add the rooms for the tests
let mut ev_builder = SyncResponseBuilder::new();
ev_builder.add_joined_room(JoinedRoomBuilder::new(room_id));
ev_builder.add_joined_room(JoinedRoomBuilder::new(&DEFAULT_TEST_ROOM_ID));
ev_builder.add_joined_room(JoinedRoomBuilder::new(room_no_rules_id));
ev_builder.add_invited_room(InvitedRoomBuilder::new(room_not_joined_id));
ev_builder.add_global_account_data_event(GlobalAccountDataTestEvent::PushRules);
@@ -37,7 +36,7 @@ async fn get_notification_mode() {
server.reset().await;
// Joined room with a user-defined rule
let room = client.get_room(room_id).unwrap();
let room = client.get_room(&DEFAULT_TEST_ROOM_ID).unwrap();
assert_eq!(room.state(), RoomState::Joined);
let mode = room.notification_mode().await;
assert_matches!(mode, Some(RoomNotificationMode::AllMessages));

2
crates/matrix-sdk/tests/integration/widget.rs
View File

@@ -61,7 +61,7 @@ async fn run_test_driver(init_on_content_load: bool) -> (MockServer, WidgetDrive
let sync_settings = SyncSettings::new().timeout(Duration::from_millis(3000));
let mut ev_builder = SyncResponseBuilder::new();
ev_builder.add_joined_room(JoinedRoomBuilder::new(ROOM_ID.clone()));
ev_builder.add_joined_room(JoinedRoomBuilder::new(&ROOM_ID));
mock_sync(&mock_server, ev_builder.build_json_sync_response(), None).await;
let _response = client.sync_once(sync_settings.clone()).await.unwrap();

6
testing/matrix-sdk-test/src/lib.rs
View File

@@ -3,7 +3,7 @@ pub use matrix_sdk_test_macros::async_test;
use once_cell::sync::Lazy;
use ruma::{
api::{client::sync::sync_events::v3::Response as SyncResponse, IncomingResponse},
user_id, UserId,
room_id, user_id, RoomId, UserId,
};
use serde_json::Value as JsonValue;
@@ -49,6 +49,10 @@ pub static ALICE: Lazy<&UserId> = Lazy::new(|| user_id!("@alice:server.name"));
pub static BOB: Lazy<&UserId> = Lazy::new(|| user_id!("@bob:other.server"));
pub static CAROL: Lazy<&UserId> = Lazy::new(|| user_id!("@carol:other.server"));
/// The default room ID for tests.
pub static DEFAULT_TEST_ROOM_ID: Lazy<&RoomId> =
Lazy::new(|| room_id!("!SVkFJHzfwvuaIEawgC:localhost"));
/// Embedded sync response files
pub enum SyncResponseFile {
All,

12
testing/matrix-sdk-test/src/sync_builder/invited_room.rs
View File

@@ -1,10 +1,10 @@
use ruma::{
api::client::sync::sync_events::v3::InvitedRoom, events::AnyStrippedStateEvent, serde::Raw,
OwnedRoomId,
OwnedRoomId, RoomId,
};
use super::StrippedStateTestEvent;
use crate::test_json;
use crate::DEFAULT_TEST_ROOM_ID;
pub struct InvitedRoomBuilder {
pub(super) room_id: OwnedRoomId,
@@ -14,10 +14,10 @@ pub struct InvitedRoomBuilder {
impl InvitedRoomBuilder {
/// Create a new `InvitedRoomBuilder` for the given room ID.
///
/// If the room ID is [`test_json::DEFAULT_SYNC_ROOM_ID`],
/// If the room ID is [`DEFAULT_TEST_ROOM_ID`],
/// [`InvitedRoomBuilder::default()`] can be used instead.
pub fn new(room_id: impl Into<OwnedRoomId>) -> Self {
Self { room_id: room_id.into(), inner: Default::default() }
pub fn new(room_id: &RoomId) -> Self {
Self { room_id: room_id.to_owned(), inner: Default::default() }
}
/// Add an event to the state.
@@ -38,6 +38,6 @@ impl InvitedRoomBuilder {
impl Default for InvitedRoomBuilder {
fn default() -> Self {
Self::new(test_json::DEFAULT_SYNC_ROOM_ID.to_owned())
Self::new(&DEFAULT_TEST_ROOM_ID)
}
}

12
testing/matrix-sdk-test/src/sync_builder/joined_room.rs
View File

@@ -4,12 +4,12 @@ use ruma::{
AnyRoomAccountDataEvent, AnySyncEphemeralRoomEvent, AnySyncStateEvent, AnySyncTimelineEvent,
},
serde::Raw,
OwnedRoomId,
OwnedRoomId, RoomId,
};
use serde_json::{from_value as from_json_value, Value as JsonValue};
use super::{EphemeralTestEvent, RoomAccountDataTestEvent, StateTestEvent};
use crate::test_json;
use crate::DEFAULT_TEST_ROOM_ID;
pub struct JoinedRoomBuilder {
pub(super) room_id: OwnedRoomId,
@@ -19,10 +19,10 @@ pub struct JoinedRoomBuilder {
impl JoinedRoomBuilder {
/// Create a new `JoinedRoomBuilder` for the given room ID.
///
/// If the room ID is [`test_json::DEFAULT_SYNC_ROOM_ID`],
/// If the room ID is [`DEFAULT_TEST_ROOM_ID`],
/// [`JoinedRoomBuilder::default()`] can be used instead.
pub fn new(room_id: impl Into<OwnedRoomId>) -> Self {
Self { room_id: room_id.into(), inner: Default::default() }
pub fn new(room_id: &RoomId) -> Self {
Self { room_id: room_id.to_owned(), inner: Default::default() }
}
/// Add an event to the timeline.
@@ -127,6 +127,6 @@ impl JoinedRoomBuilder {
impl Default for JoinedRoomBuilder {
fn default() -> Self {
Self::new(test_json::DEFAULT_SYNC_ROOM_ID.to_owned())
Self::new(&DEFAULT_TEST_ROOM_ID)
}
}

12
testing/matrix-sdk-test/src/sync_builder/left_room.rs
View File

@@ -2,11 +2,11 @@ use ruma::{
api::client::sync::sync_events::v3::LeftRoom,
events::{AnyRoomAccountDataEvent, AnySyncStateEvent, AnySyncTimelineEvent},
serde::Raw,
OwnedRoomId,
OwnedRoomId, RoomId,
};
use super::{RoomAccountDataTestEvent, StateTestEvent};
use crate::test_json;
use crate::DEFAULT_TEST_ROOM_ID;
pub struct LeftRoomBuilder {
pub(super) room_id: OwnedRoomId,
@@ -16,10 +16,10 @@ pub struct LeftRoomBuilder {
impl LeftRoomBuilder {
/// Create a new `LeftRoomBuilder` for the given room ID.
///
/// If the room ID is [`test_json::DEFAULT_SYNC_ROOM_ID`],
/// If the room ID is [`DEFAULT_TEST_ROOM_ID`],
/// [`LeftRoomBuilder::default()`] can be used instead.
pub fn new(room_id: impl Into<OwnedRoomId>) -> Self {
Self { room_id: room_id.into(), inner: Default::default() }
pub fn new(room_id: &RoomId) -> Self {
Self { room_id: room_id.to_owned(), inner: Default::default() }
}
/// Add an event to the timeline.
@@ -97,6 +97,6 @@ impl LeftRoomBuilder {
impl Default for LeftRoomBuilder {
fn default() -> Self {
Self::new(test_json::DEFAULT_SYNC_ROOM_ID.to_owned())
Self::new(&DEFAULT_TEST_ROOM_ID)
}
}

4
testing/matrix-sdk-test/src/test_json/mod.rs
View File

@@ -21,8 +21,8 @@ pub use api_responses::{
};
pub use members::MEMBERS;
pub use sync::{
DEFAULT_SYNC_ROOM_ID, DEFAULT_SYNC_SUMMARY, INVITE_SYNC, LEAVE_SYNC, LEAVE_SYNC_EVENT,
MORE_SYNC, MORE_SYNC_2, SYNC, VOIP_SYNC,
DEFAULT_SYNC_SUMMARY, INVITE_SYNC, LEAVE_SYNC, LEAVE_SYNC_EVENT, MORE_SYNC, MORE_SYNC_2, SYNC,
VOIP_SYNC,
};
pub use sync_events::{
ALIAS, ALIASES, DIRECT, ENCRYPTION, MEMBER, MEMBER_ADDITIONAL, MEMBER_BAN, MEMBER_INVITE,

21
testing/matrix-sdk-test/src/test_json/sync.rs
View File

@@ -1,12 +1,9 @@
//! Complete sync responses.
use once_cell::sync::Lazy;
use ruma::{room_id, RoomId};
use serde_json::{json, Value as JsonValue};
/// The default room ID where sync events are added.
pub static DEFAULT_SYNC_ROOM_ID: Lazy<&RoomId> =
Lazy::new(|| room_id!("!SVkFJHzfwvuaIEawgC:localhost"));
use crate::DEFAULT_TEST_ROOM_ID;
pub static SYNC: Lazy<JsonValue> = Lazy::new(|| {
json!({
@@ -33,7 +30,7 @@ pub static SYNC: Lazy<JsonValue> = Lazy::new(|| {
"rooms": {
"invite": {},
"join": {
"!SVkFJHzfwvuaIEawgC:localhost": {
*DEFAULT_TEST_ROOM_ID: {
"summary": {},
"account_data": {
"events": [
@@ -58,7 +55,7 @@ pub static SYNC: Lazy<JsonValue> = Lazy::new(|| {
}
}
},
"room_id": "!SVkFJHzfwvuaIEawgC:localhost",
"room_id": *DEFAULT_TEST_ROOM_ID,
"type": "m.receipt"
},
]
@@ -282,7 +279,7 @@ pub static DEFAULT_SYNC_SUMMARY: Lazy<JsonValue> = Lazy::new(|| {
"rooms": {
"invite": {},
"join": {
"!SVkFJHzfwvuaIEawgC:localhost": {
*DEFAULT_TEST_ROOM_ID: {
"summary": {
"m.heroes": [
"@example2:localhost"
@@ -540,7 +537,7 @@ pub static MORE_SYNC: Lazy<JsonValue> = Lazy::new(|| {
"rooms": {
"invite": {},
"join": {
"!SVkFJHzfwvuaIEawgC:localhost": {
*DEFAULT_TEST_ROOM_ID: {
"summary": {},
"account_data": {
"events": []
@@ -705,7 +702,7 @@ pub static MORE_SYNC_2: Lazy<JsonValue> = Lazy::new(|| {
"next_batch": "s526_47314_0_7_1_1_1_11444_3",
"rooms": {
"join": {
"!SVkFJHzfwvuaIEawgC:localhost": {
*DEFAULT_TEST_ROOM_ID: {
"timeline": {
"events": [
{
@@ -909,7 +906,7 @@ pub static LEAVE_SYNC: Lazy<JsonValue> = Lazy::new(|| {
"invite": {},
"join": {},
"leave": {
"!SVkFJHzfwvuaIEawgC:localhost": {
*DEFAULT_TEST_ROOM_ID: {
"summary": {},
"account_data": {
"events": []
@@ -1185,7 +1182,7 @@ pub static LEAVE_SYNC_EVENT: Lazy<JsonValue> = Lazy::new(|| {
"join": {},
"invite": {},
"leave": {
"!SVkFJHzfwvuaIEawgC:localhost": {
*DEFAULT_TEST_ROOM_ID: {
"timeline": {
"events": [
{
@@ -1246,7 +1243,7 @@ pub static VOIP_SYNC: Lazy<JsonValue> = Lazy::new(|| {
"rooms": {
"invite": {},
"join": {
"!SVkFJHzfwvuaIEawgC:localhost": {
*DEFAULT_TEST_ROOM_ID: {
"summary": {},
"account_data": {
"events": []

6
testing/matrix-sdk-test/src/test_json/sync_events.rs
View File

@@ -3,6 +3,8 @@
use once_cell::sync::Lazy;
use serde_json::{json, Value as JsonValue};
use crate::DEFAULT_TEST_ROOM_ID;
pub static ALIAS: Lazy<JsonValue> = Lazy::new(|| {
json!({
"content": {
@@ -58,7 +60,7 @@ pub static CREATE: Lazy<JsonValue> = Lazy::new(|| {
pub static DIRECT: Lazy<JsonValue> = Lazy::new(|| {
json!({
"content": {
"@invited:localhost": ["!SVkFJHzfwvuaIEawgC:localhost"],
"@invited:localhost": [*DEFAULT_TEST_ROOM_ID],
},
"event_id": "$757957878228ekrDs:localhost",
"origin_server_ts": 17195787,
@@ -420,7 +422,7 @@ pub static PUSH_RULES: Lazy<JsonValue> = Lazy::new(|| {
"value": "default"
}
],
"rule_id": "!SVkFJHzfwvuaIEawgC:localhost",
"rule_id": *DEFAULT_TEST_ROOM_ID,
"default": false,
"enabled": true
}