From 27edb163e9cfee5cffa5c33aeb97a0169a0caaab Mon Sep 17 00:00:00 2001 From: Ivan Enderlin Date: Wed, 21 May 2025 09:48:09 +0200 Subject: [PATCH] chore(base): Move tests in the correct module. This patch moves tests about `RoomNotableTags` in the newly created `tags` module. --- crates/matrix-sdk-base/src/rooms/mod.rs | 35 ---------------------- crates/matrix-sdk-base/src/rooms/tags.rs | 38 +++++++++++++++++++++++- 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/crates/matrix-sdk-base/src/rooms/mod.rs b/crates/matrix-sdk-base/src/rooms/mod.rs index 2202ba840..c1516b07e 100644 --- a/crates/matrix-sdk-base/src/rooms/mod.rs +++ b/crates/matrix-sdk-base/src/rooms/mod.rs @@ -150,43 +150,8 @@ pub(crate) enum AccountDataSource { #[cfg(test)] mod tests { - use std::ops::Not; - - use ruma::events::tag::{TagInfo, TagName, Tags}; - - use super::{BaseRoomInfo, RoomNotableTags}; use crate::RoomDisplayName; - #[test] - fn test_handle_notable_tags_favourite() { - let mut base_room_info = BaseRoomInfo::default(); - - let mut tags = Tags::new(); - tags.insert(TagName::Favorite, TagInfo::default()); - - assert!(base_room_info.notable_tags.contains(RoomNotableTags::FAVOURITE).not()); - base_room_info.handle_notable_tags(&tags); - assert!(base_room_info.notable_tags.contains(RoomNotableTags::FAVOURITE)); - tags.clear(); - base_room_info.handle_notable_tags(&tags); - assert!(base_room_info.notable_tags.contains(RoomNotableTags::FAVOURITE).not()); - } - - #[test] - fn test_handle_notable_tags_low_priority() { - let mut base_room_info = BaseRoomInfo::default(); - - let mut tags = Tags::new(); - tags.insert(TagName::LowPriority, TagInfo::default()); - - assert!(base_room_info.notable_tags.contains(RoomNotableTags::LOW_PRIORITY).not()); - base_room_info.handle_notable_tags(&tags); - assert!(base_room_info.notable_tags.contains(RoomNotableTags::LOW_PRIORITY)); - tags.clear(); - base_room_info.handle_notable_tags(&tags); - assert!(base_room_info.notable_tags.contains(RoomNotableTags::LOW_PRIORITY).not()); - } - #[test] fn test_room_alias_from_room_display_name_lowercases() { assert_eq!( diff --git a/crates/matrix-sdk-base/src/rooms/tags.rs b/crates/matrix-sdk-base/src/rooms/tags.rs index 3c1b32b1d..e7ae6debf 100644 --- a/crates/matrix-sdk-base/src/rooms/tags.rs +++ b/crates/matrix-sdk-base/src/rooms/tags.rs @@ -71,10 +71,16 @@ mod tests { use std::ops::Not; use matrix_sdk_test::async_test; - use ruma::{room_id, serde::Raw, user_id}; + use ruma::{ + events::tag::{TagInfo, TagName, Tags}, + room_id, + serde::Raw, + user_id, + }; use serde_json::json; use stream_assert::{assert_pending, assert_ready}; + use super::{super::BaseRoomInfo, RoomNotableTags}; use crate::{ response_processors as processors, store::{RoomLoadSettings, StoreConfig}, @@ -272,4 +278,34 @@ mod tests { // The room is now marked as _not_ low priority. assert!(room.is_low_priority().not()); } + + #[test] + fn test_handle_notable_tags_favourite() { + let mut base_room_info = BaseRoomInfo::default(); + + let mut tags = Tags::new(); + tags.insert(TagName::Favorite, TagInfo::default()); + + assert!(base_room_info.notable_tags.contains(RoomNotableTags::FAVOURITE).not()); + base_room_info.handle_notable_tags(&tags); + assert!(base_room_info.notable_tags.contains(RoomNotableTags::FAVOURITE)); + tags.clear(); + base_room_info.handle_notable_tags(&tags); + assert!(base_room_info.notable_tags.contains(RoomNotableTags::FAVOURITE).not()); + } + + #[test] + fn test_handle_notable_tags_low_priority() { + let mut base_room_info = BaseRoomInfo::default(); + + let mut tags = Tags::new(); + tags.insert(TagName::LowPriority, TagInfo::default()); + + assert!(base_room_info.notable_tags.contains(RoomNotableTags::LOW_PRIORITY).not()); + base_room_info.handle_notable_tags(&tags); + assert!(base_room_info.notable_tags.contains(RoomNotableTags::LOW_PRIORITY)); + tags.clear(); + base_room_info.handle_notable_tags(&tags); + assert!(base_room_info.notable_tags.contains(RoomNotableTags::LOW_PRIORITY).not()); + } }