From fff3abf985ef6f238627c87bcc8571503e2fc78b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 13 May 2020 16:25:42 +0200
Subject: [PATCH] bae: More room creation tests.

---
 matrix_sdk_base/src/client.rs | 37 ++++++++++++++++++++++++++++++
 matrix_sdk_test/src/lib.rs    | 42 +++++++++++++++++++++++++++--------
 2 files changed, 70 insertions(+), 9 deletions(-)

diff --git a/matrix_sdk_base/src/client.rs b/matrix_sdk_base/src/client.rs
index 7d4de0c9..bc44b00a 100644
--- a/matrix_sdk_base/src/client.rs
+++ b/matrix_sdk_base/src/client.rs
@@ -1434,8 +1434,12 @@ mod test {
     use crate::identifiers::{RoomId, UserId};
     use crate::{events::collections::all::RoomEvent, BaseClient, Session};
     use matrix_sdk_test::{async_test, EventBuilder, EventsFile};
+    use serde_json::json;
     use std::convert::TryFrom;
 
+    #[cfg(target_arch = "wasm32")]
+    use wasm_bindgen_test::*;
+
     fn get_client() -> BaseClient {
         let session = Session {
             access_token: "1234".to_owned(),
@@ -1465,4 +1469,37 @@ mod test {
         let room = client.get_joined_room(&room_id).await;
         assert!(room.is_some());
     }
+
+    #[async_test]
+    async fn test_left_room_creation() {
+        let room_id = RoomId::try_from("!left_room:localhost").unwrap();
+        let mut sync_response = EventBuilder::default()
+            .add_custom_left_event(
+                &room_id,
+                json!({
+                    "content": {
+                        "displayname": "example",
+                        "membership": "join"
+                    },
+                    "event_id": "$151800140517rfvjc:localhost",
+                    "membership": "join",
+                    "origin_server_ts": 0,
+                    "sender": "@example:localhost",
+                    "state_key": "@example:localhost",
+                    "type": "m.room.member",
+                }),
+                RoomEvent::RoomMember,
+            )
+            .build_sync_response();
+
+        let client = get_client();
+
+        client
+            .receive_sync_response(&mut sync_response)
+            .await
+            .unwrap();
+
+        let room = client.get_left_room(&room_id).await;
+        assert!(room.is_some());
+    }
 }
diff --git a/matrix_sdk_test/src/lib.rs b/matrix_sdk_test/src/lib.rs
index 6605dbda..ad4bf3ec 100644
--- a/matrix_sdk_test/src/lib.rs
+++ b/matrix_sdk_test/src/lib.rs
@@ -50,9 +50,9 @@ pub struct EventBuilder {
     /// The events that determine the state of a `Room`.
     joined_room_events: HashMap<RoomId, Vec<RoomEvent>>,
     /// The events that determine the state of a `Room`.
-    invited_room_events: Vec<AnyStrippedStateEvent>,
+    invited_room_events: HashMap<RoomId, Vec<AnyStrippedStateEvent>>,
     /// The events that determine the state of a `Room`.
-    left_room_events: Vec<RoomEvent>,
+    left_room_events: HashMap<RoomId, Vec<RoomEvent>>,
     /// The presence events that determine the presence state of a `RoomMember`.
     presence_events: Vec<PresenceEvent>,
     /// The state events that determine the state of a `Room`.
@@ -150,6 +150,7 @@ impl EventBuilder {
 
     pub fn add_custom_invited_event<Ev: TryFromRaw>(
         mut self,
+        room_id: &RoomId,
         event: serde_json::Value,
         variant: fn(Ev) -> AnyStrippedStateEvent,
     ) -> Self {
@@ -157,12 +158,16 @@ impl EventBuilder {
             .unwrap()
             .deserialize()
             .unwrap();
-        self.invited_room_events.push(variant(event));
+        self.invited_room_events
+            .entry(room_id.clone())
+            .or_insert_with(Vec::new)
+            .push(variant(event));
         self
     }
 
     pub fn add_custom_left_event<Ev: TryFromRaw>(
         mut self,
+        room_id: &RoomId,
         event: serde_json::Value,
         variant: fn(Ev) -> RoomEvent,
     ) -> Self {
@@ -170,7 +175,10 @@ impl EventBuilder {
             .unwrap()
             .deserialize()
             .unwrap();
-        self.left_room_events.push(variant(event));
+        self.left_room_events
+            .entry(room_id.clone())
+            .or_insert_with(Vec::new)
+            .push(variant(event));
         self
     }
 
@@ -237,9 +245,9 @@ impl EventBuilder {
             }
         });
 
-        let mut rooms: HashMap<RoomId, serde_json::Value> = HashMap::new();
+        let mut joined_rooms: HashMap<RoomId, serde_json::Value> = HashMap::new();
 
-        rooms.insert(main_room_id, joined_room);
+        joined_rooms.insert(main_room_id, joined_room);
 
         for (room_id, events) in self.joined_room_events.drain() {
             let joined_room = serde_json::json!({
@@ -263,7 +271,23 @@ impl EventBuilder {
                     "notification_count": 11
                 }
             });
-            rooms.insert(room_id, joined_room);
+            joined_rooms.insert(room_id, joined_room);
+        }
+
+        let mut left_rooms: HashMap<RoomId, serde_json::Value> = HashMap::new();
+
+        for (room_id, events) in self.left_room_events.drain() {
+            let room = serde_json::json!({
+                "state": {
+                    "events": [],
+                },
+                "timeline": {
+                    "events": events,
+                    "limited": false,
+                    "prev_batch": "t392-516_47314_0_7_1_1_1_11444_1"
+                },
+            });
+            left_rooms.insert(room_id, room);
         }
 
         let body = serde_json::json! {
@@ -276,8 +300,8 @@ impl EventBuilder {
                 },
                 "rooms": {
                     "invite": {},
-                    "join": rooms,
-                    "leave": {}
+                    "join": joined_rooms,
+                    "leave": left_rooms,
                 },
                 "to_device": {
                     "events": []