From 0b83007954c49b5d206f32359f6d89e9f9337a23 Mon Sep 17 00:00:00 2001 From: Maybe Waffle Date: Wed, 1 Feb 2023 16:57:42 +0400 Subject: [PATCH] Add some deserialization tests for topic-related types/values --- crates/teloxide-core/src/types.rs | 2 +- .../src/types/forum_topic_created.rs | 17 ++++++++++ crates/teloxide-core/src/types/message.rs | 34 +++++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/crates/teloxide-core/src/types.rs b/crates/teloxide-core/src/types.rs index fc7a47b2..8737244a 100644 --- a/crates/teloxide-core/src/types.rs +++ b/crates/teloxide-core/src/types.rs @@ -496,7 +496,7 @@ pub(crate) mod serde_rgb { } let json = format!("{}", 0x00AABBCC); - let Struct { color } = serde_json::from_str(&json).unwrap(); + let Struct { color } = serde_json::from_str(&json).unwrap(); assert_eq!(color, [0xAA, 0xBB, 0xCC]) } diff --git a/crates/teloxide-core/src/types/forum_topic_created.rs b/crates/teloxide-core/src/types/forum_topic_created.rs index cf4a91b6..fe209f62 100644 --- a/crates/teloxide-core/src/types/forum_topic_created.rs +++ b/crates/teloxide-core/src/types/forum_topic_created.rs @@ -19,3 +19,20 @@ pub struct ForumTopicCreated { // FIXME: CustomEmojiId pub icon_custom_emoji_id: Option, } + +#[cfg(test)] +mod tests { + use crate::types::ForumTopicCreated; + + #[test] + fn deserialization() { + let json = + r#"{"icon_color":9367192,"icon_custom_emoji_id":"5312536423851630001","name":"???"}"#; + + let event = serde_json::from_str::(json).unwrap(); + + assert_eq!(event.name, "???"); + assert_eq!(event.icon_color, [0x8E, 0xEE, 0x98]); + assert_eq!(event.icon_custom_emoji_id.as_deref(), Some("5312536423851630001")); + } +} diff --git a/crates/teloxide-core/src/types/message.rs b/crates/teloxide-core/src/types/message.rs index 64afdea1..0fcbc1a8 100644 --- a/crates/teloxide-core/src/types/message.rs +++ b/crates/teloxide-core/src/types/message.rs @@ -117,6 +117,8 @@ pub struct MessageCommon { pub reply_markup: Option, /// `true`, if the message is sent to a forum topic. + // FIXME: `is_topic_message` is included even in service messages, like ForumTopicCreated. + // more this to `Message` #[serde(default)] pub is_topic_message: bool, @@ -1838,4 +1840,36 @@ mod tests { assert!(!entities.is_empty()); assert_eq!(entities[0].kind().clone(), MessageEntityKind::Url); } + + #[test] + fn topic_created() { + let json = r#"{ + "chat":{"id":-1001847508954,"is_forum":true,"title":"twest","type":"supergroup"}, + "date":1675229139, + "forum_topic_created":{ + "icon_color":9367192, + "icon_custom_emoji_id":"5312536423851630001", + "name":"???" + }, + "from":{ + "first_name":"вафель'", + "id":1253681278, + "is_bot":false, + "language_code":"en", + "username":"wafflelapkin" + }, + "is_topic_message":true, + "message_id":4, + "message_thread_id":4 + }"#; + + let message: Message = serde_json::from_str(json).unwrap(); + } + + #[test] + fn topic_message() { + let json = r#"{"chat":{"id":-1001847508954,"is_forum":true,"title":"twest","type":"supergroup"},"date":1675229140,"from":{"first_name":"вафель'","id":1253681278,"is_bot":false,"language_code":"en","username":"wafflelapkin"},"is_topic_message":true,"message_id":5,"message_thread_id":4,"reply_to_message":{"chat":{"id":-1001847508954,"is_forum":true,"title":"twest","type":"supergroup"},"date":1675229139,"forum_topic_created":{"icon_color":9367192,"icon_custom_emoji_id":"5312536423851630001","name":"???"},"from":{"first_name":"вафель'","id":1253681278,"is_bot":false,"language_code":"en","username":"wafflelapkin"},"is_topic_message":true,"message_id":4,"message_thread_id":4},"text":"blah"}"#; + + let message: Message = serde_json::from_str(json).unwrap(); + } }