test(sdk,ui): Update tests to the new API.

Author: Hywan

crates/matrix-sdk-ui/tests/integration/timeline/pinned_event.rs

@@ -771,10 +771,10 @@ async fn test_redacted_events_are_reflected_in_sync() {
     let room_id = room_id!("!test:localhost");
 
     let f = EventFactory::new().room(room_id).sender(*BOB);
-    let event_id = event_id!("$1");
+    let pinned_event_id = event_id!("$1");
     let pinned_event = f
         .text_msg("in the end")
-        .event_id(event_id!("$1"))
+        .event_id(pinned_event_id)
         .server_ts(MilliSecondsSinceUnixEpoch::now())
         .into_raw_sync();
 
@@ -784,7 +784,7 @@ async fn test_redacted_events_are_reflected_in_sync() {
     // Mock /relations for pinned timeline event.
     server
         .mock_room_relations()
-        .match_target_event(event_id.to_owned())
+        .match_target_event(pinned_event_id.to_owned())
         .match_limit(256)
         .ok(RoomRelationsResponseTemplate::default().events(Vec::<Raw<AnyTimelineEvent>>::new()))
         .mock_once()
@@ -794,7 +794,7 @@ async fn test_redacted_events_are_reflected_in_sync() {
     // Load initial timeline items: a text message and a `m.room.pinned_events` with
     // event $1
     let room = PinnedEventsSync::new(room_id)
-        .with_pinned_event_ids(vec!["$1"])
+        .with_pinned_event_ids(vec![pinned_event_id.as_str()])
         .mock_and_sync(&client, &server)
         .await
         .expect("Sync failed");
@@ -818,12 +818,13 @@ async fn test_redacted_events_are_reflected_in_sync() {
 
     assert_eq!(items.len(), 1 + 1); // event item + a date divider
     assert!(items[0].is_date_divider());
-    assert_eq!(items[1].as_event().unwrap().content().as_message().unwrap().body(), "in the end");
+    assert_eq!(items[1].as_event().unwrap().event_id(), Some(pinned_event_id));
     assert_pending!(timeline_stream);
 
+    let redaction_event_id = event_id!("$2");
     let redaction_event = f
-        .redaction(event_id!("$1"))
-        .event_id(event_id!("$2"))
+        .redaction(pinned_event_id)
+        .event_id(redaction_event_id)
         .server_ts(MilliSecondsSinceUnixEpoch::now())
         .into_raw_sync();
 

crates/matrix-sdk/tests/integration/room/pinned_events.rs

@@ -171,8 +171,10 @@ async fn test_pinned_events_are_loaded_from_network_then_are_reloaded_from_stora
             .build()
             .await;
 
+        let event_cache = client.event_cache();
+
         // Subscribe the event cache to sync updates.
-        client.event_cache().subscribe().unwrap();
+        event_cache.subscribe().unwrap();
 
         // Sync the room with the pinned event ID in the room state.
         //
@@ -181,19 +183,20 @@ async fn test_pinned_events_are_loaded_from_network_then_are_reloaded_from_stora
         // events.
         let pinned_events_state = f.room_pinned_events(vec![pinned_event_id.to_owned()]);
 
-        let room = server
+        let _room = server
             .sync_room(
                 &client,
                 JoinedRoomBuilder::new(room_id).add_state_bulk(vec![pinned_events_state.into()]),
             )
             .await;
 
-        // Get the room event cache and subscribe to pinned events.
-        let (room_event_cache, _drop_handles) = room.event_cache().await.unwrap();
+        // Get the pinned events cache and subscribe to it.
+        let (pinned_events_cache, _drop_handles) =
+            event_cache.pinned_events(room_id).await.unwrap();
 
-        // Subscribe to pinned events - this triggers PinnedEventsCache::new() which
-        // spawns a task that calls reload_from_storage() first.
-        let (events, mut subscriber) = room_event_cache.subscribe_to_pinned_events().await.unwrap();
+        // Getting the pinned events cache triggers `PinnedEventsCache::new()` which
+        // spawns a task that calls `reload_from_storage()` first.
+        let (events, mut subscriber) = pinned_events_cache.subscribe().await.unwrap();
         let mut events = events.into();
 
         // Wait for the background task to reload the events.
@@ -229,17 +232,19 @@ async fn test_pinned_events_are_loaded_from_network_then_are_reloaded_from_stora
         .build()
         .await;
 
+    let event_cache = client.event_cache();
+
     // Subscribe the event cache to sync updates.
-    client.event_cache().subscribe().unwrap();
+    event_cache.subscribe().unwrap();
 
-    let room = client.get_room(room_id).unwrap();
+    let _room = client.get_room(room_id).unwrap();
 
-    // Get the room event cache and subscribe to pinned events.
-    let (room_event_cache, _drop_handles) = room.event_cache().await.unwrap();
+    // Get the pinned events cache and subscribe to it.
+    let (pinned_events_cache, _drop_handles) = event_cache.pinned_events(room_id).await.unwrap();
 
-    // Subscribe to pinned events - this triggers PinnedEventsCache::new() which
-    // spawns a task that calls reload_from_storage() first.
-    let (events, mut subscriber) = room_event_cache.subscribe_to_pinned_events().await.unwrap();
+    // Getting the pinned events cache triggers `PinnedEventsCache::new()` which
+    // spawns a task that calls `reload_from_storage()` first.
+    let (events, mut subscriber) = pinned_events_cache.subscribe().await.unwrap();
     let mut events = events.into();
 
     // Wait for the background task to reload the events from storage.
@@ -277,8 +282,10 @@ async fn test_pinned_events_are_reloaded_from_storage_from_many_chunks() {
     let server = MatrixMockServer::new().await;
     let client = server.client_builder().build().await;
 
+    let event_cache = client.event_cache();
+
     // Create a non empty Event Cache store containing two chunks.
-    client.event_cache().subscribe().unwrap();
+    event_cache.subscribe().unwrap();
     client
         .event_cache_store()
         .lock()
@@ -308,14 +315,14 @@ async fn test_pinned_events_are_reloaded_from_storage_from_many_chunks() {
         .await
         .unwrap();
 
-    let room = server.sync_room(&client, JoinedRoomBuilder::new(room_id)).await;
+    let _room = server.sync_room(&client, JoinedRoomBuilder::new(room_id)).await;
 
-    // Get the room event cache and subscribe to pinned events.
-    let (room_event_cache, _drop_handles) = room.event_cache().await.unwrap();
+    // Get the pinned events cache and subscribe to it.
+    let (pinned_events_cache, _drop_handles) = event_cache.pinned_events(room_id).await.unwrap();
 
-    // Subscribe to pinned events - this triggers PinnedEventsCache::new() which
-    // spawns a task that calls reload_from_storage() first.
-    let (events, mut subscriber) = room_event_cache.subscribe_to_pinned_events().await.unwrap();
+    // Getting the pinned events cache triggers `PinnedEventsCache::new()` which
+    // spawns a task that calls `reload_from_storage()` first.
+    let (events, mut subscriber) = pinned_events_cache.subscribe().await.unwrap();
     let mut events = events.into();
 
     // Wait for the background task to reload the events.
@@ -368,9 +375,10 @@ async fn test_pinned_events_dont_include_thread_responses() {
         .await;
 
     let client = server.client_builder().build().await;
+    let event_cache = client.event_cache();
 
     // Subscribe the event cache to sync updates.
-    client.event_cache().subscribe().unwrap();
+    event_cache.subscribe().unwrap();
 
     // Sync the room with the pinned event ID in the room state.
     //
@@ -379,19 +387,19 @@ async fn test_pinned_events_dont_include_thread_responses() {
     // events.
     let pinned_events_state = f.room_pinned_events(vec![pinned_event_id.to_owned()]);
 
-    let room = server
+    let _room = server
         .sync_room(
             &client,
             JoinedRoomBuilder::new(room_id).add_state_bulk(vec![pinned_events_state.into()]),
         )
         .await;
 
     // Get the room event cache and subscribe to pinned events.
-    let (room_event_cache, _drop_handles) = room.event_cache().await.unwrap();
+    let (pinned_events_cache, _drop_handles) = event_cache.pinned_events(room_id).await.unwrap();
 
-    // Subscribe to pinned events - this triggers PinnedEventsCache::new() which
-    // spawns a task that calls reload_from_storage() first.
-    let (events, mut subscriber) = room_event_cache.subscribe_to_pinned_events().await.unwrap();
+    // Getting the pinned events cache triggers `PinnedEventsCache::new()` which
+    // spawns a task that calls `reload_from_storage()` first.
+    let (events, mut subscriber) = pinned_events_cache.subscribe().await.unwrap();
     let mut events = events.into();
 
     // Wait for the background task to reload the events.