From fed3c8046604fbf13039fe48fca2b86312d76eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Mon, 4 May 2020 14:15:55 +0200 Subject: [PATCH] crypto: Fix the tests now that events don't implement PartialEq. --- matrix_sdk_crypto/src/machine.rs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/matrix_sdk_crypto/src/machine.rs b/matrix_sdk_crypto/src/machine.rs index e5dae2eb..6d450583 100644 --- a/matrix_sdk_crypto/src/machine.rs +++ b/matrix_sdk_crypto/src/machine.rs @@ -1555,7 +1555,7 @@ mod test { message::{MessageEventContent, TextMessageEventContent}, }, to_device::{AnyToDeviceEvent, ToDeviceEncrypted}, - EventJson, EventType, + EventJson, EventType, UnsignedData, }; use matrix_sdk_types::identifiers::{DeviceId, EventId, RoomId, UserId}; @@ -2046,9 +2046,9 @@ mod test { bob.decrypt_to_device_event(&event).await.unwrap(); - let content = MessageEventContent::Text(TextMessageEventContent::new_plain( - "It is a secret to everybody", - )); + let plaintext = "It is a secret to everybody"; + + let content = MessageEventContent::Text(TextMessageEventContent::new_plain(plaintext)); let encrypted_content = alice.encrypt(&room_id, content.clone()).await.unwrap(); @@ -2058,7 +2058,7 @@ mod test { room_id: Some(room_id.clone()), sender: alice.user_id().clone(), content: encrypted_content, - unsigned: BTreeMap::new(), + unsigned: UnsignedData::default(), }; let decrypted_event = bob @@ -2075,6 +2075,10 @@ mod test { assert_eq!(&decrypted_event.sender, alice.user_id()); assert_eq!(&decrypted_event.room_id, &Some(room_id)); - assert_eq!(&decrypted_event.content, &content); + if let MessageEventContent::Text(c) = &decrypted_event.content { + assert_eq!(&c.body, plaintext); + } else { + panic!("Decrypted event has a missmatched content"); + } } }