Skip to content

test(model): bitflags static assertions + serde #2088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spring4175 merged 2 commits into from
Jan 28, 2023
Merged

test(model): bitflags static assertions + serde #2088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0c3306
test(model): bitflags static assertions + serde
spring4175 Jan 25, 2023
a5908bd
fix
spring4175 Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions twilight-model/src/channel/flags.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,60 @@ impl Serialize for ChannelFlags {
serializer.serialize_u64(self.bits())
}
}

#[cfg(test)]
mod tests {
use super::ChannelFlags;
use serde::{Deserialize, Serialize};
use serde_test::Token;
use static_assertions::{assert_impl_all, const_assert_eq};
use std::{
fmt::{Binary, Debug, LowerHex, Octal, UpperHex},
hash::Hash,
ops::{
BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign, Not, Sub, SubAssign,
},
};

assert_impl_all!(
ChannelFlags: Binary,
BitAnd,
BitAndAssign,
BitOr,
BitOrAssign,
BitXor,
BitXorAssign,
Clone,
Copy,
Debug,
Deserialize<'static>,
Eq,
Extend<ChannelFlags>,
FromIterator<ChannelFlags>,
Hash,
LowerHex,
Not,
Octal,
Ord,
PartialEq,
PartialOrd,
Send,
Serialize,
Sub,
SubAssign,
Sync,
UpperHex
);
const_assert_eq!(ChannelFlags::PINNED.bits(), 1 << 1);
const_assert_eq!(ChannelFlags::REQUIRE_TAG.bits(), 1 << 4);

#[test]
fn serde() {
serde_test::assert_tokens(
&ChannelFlags::PINNED,
&[Token::U64(ChannelFlags::PINNED.bits())],
);
// Deserialization truncates unknown bits.
serde_test::assert_de_tokens(&ChannelFlags::empty(), &[Token::U64(1 << 63)]);
}
}
54 changes: 50 additions & 4 deletions twilight-model/src/channel/message/flags.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,65 @@ impl Serialize for MessageFlags {
mod tests {
use super::MessageFlags;
use serde::{Deserialize, Serialize};
use static_assertions::assert_impl_all;
use std::{fmt::Debug, hash::Hash};
use serde_test::Token;
use static_assertions::{assert_impl_all, const_assert_eq};
use std::{
fmt::{Binary, Debug, LowerHex, Octal, UpperHex},
hash::Hash,
ops::{
BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign, Not, Sub, SubAssign,
},
};

assert_impl_all!(
MessageFlags: Copy,
MessageFlags: Binary,
BitAnd,
BitAndAssign,
BitOr,
BitOrAssign,
BitXor,
BitXorAssign,
Clone,
Copy,
Debug,
Deserialize<'static>,
Eq,
Extend<MessageFlags>,
FromIterator<MessageFlags>,
Hash,
LowerHex,
Not,
Octal,
Ord,
PartialEq,
PartialOrd,
Send,
Serialize,
Sync
Sub,
SubAssign,
Sync,
UpperHex
);
const_assert_eq!(MessageFlags::CROSSPOSTED.bits(), 1);
const_assert_eq!(MessageFlags::IS_CROSSPOST.bits(), 1 << 1);
const_assert_eq!(MessageFlags::SUPPRESS_EMBEDS.bits(), 1 << 2);
const_assert_eq!(MessageFlags::SOURCE_MESSAGE_DELETED.bits(), 1 << 3);
const_assert_eq!(MessageFlags::URGENT.bits(), 1 << 4);
const_assert_eq!(MessageFlags::HAS_THREAD.bits(), 1 << 5);
const_assert_eq!(MessageFlags::EPHEMERAL.bits(), 1 << 6);
const_assert_eq!(MessageFlags::LOADING.bits(), 1 << 7);
const_assert_eq!(
MessageFlags::FAILED_TO_MENTION_SOME_ROLES_IN_THREAD.bits(),
1 << 8
);

#[test]
fn serde() {
serde_test::assert_tokens(
&MessageFlags::CROSSPOSTED,
&[Token::U64(MessageFlags::CROSSPOSTED.bits())],
);
// Deserialization truncates unknown bits.
serde_test::assert_de_tokens(&MessageFlags::empty(), &[Token::U64(1 << 63)]);
}
}
77 changes: 77 additions & 0 deletions twilight-model/src/gateway/intents.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,3 +288,80 @@ impl Serialize for Intents {
serializer.serialize_u64(self.bits())
}
}

#[cfg(test)]
mod tests {
#![allow(deprecated)]

use super::Intents;
use serde::{Deserialize, Serialize};
use serde_test::Token;
use static_assertions::{assert_impl_all, const_assert_eq};
use std::{
fmt::{Binary, Debug, LowerHex, Octal, UpperHex},
hash::Hash,
ops::{
BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign, Not, Sub, SubAssign,
},
};

assert_impl_all!(
Intents: Binary,
BitAnd,
BitAndAssign,
BitOr,
BitOrAssign,
BitXor,
BitXorAssign,
Clone,
Copy,
Debug,
Deserialize<'static>,
Eq,
Extend<Intents>,
FromIterator<Intents>,
Hash,
LowerHex,
Not,
Octal,
Ord,
PartialEq,
PartialOrd,
Send,
Serialize,
Sub,
SubAssign,
Sync,
UpperHex
);
const_assert_eq!(Intents::GUILDS.bits(), 1);
const_assert_eq!(Intents::GUILD_MEMBERS.bits(), 1 << 1);
const_assert_eq!(Intents::GUILD_BANS.bits(), 1 << 2);
const_assert_eq!(Intents::GUILD_MODERATION.bits(), 1 << 2);
const_assert_eq!(Intents::GUILD_EMOJIS_AND_STICKERS.bits(), 1 << 3);
const_assert_eq!(Intents::GUILD_INTEGRATIONS.bits(), 1 << 4);
const_assert_eq!(Intents::GUILD_WEBHOOKS.bits(), 1 << 5);
const_assert_eq!(Intents::GUILD_INVITES.bits(), 1 << 6);
const_assert_eq!(Intents::GUILD_VOICE_STATES.bits(), 1 << 7);
const_assert_eq!(Intents::GUILD_PRESENCES.bits(), 1 << 8);
const_assert_eq!(Intents::GUILD_MESSAGES.bits(), 1 << 9);
const_assert_eq!(Intents::GUILD_MESSAGE_REACTIONS.bits(), 1 << 10);
const_assert_eq!(Intents::GUILD_MESSAGE_TYPING.bits(), 1 << 11);
const_assert_eq!(Intents::DIRECT_MESSAGES.bits(), 1 << 12);
const_assert_eq!(Intents::DIRECT_MESSAGE_REACTIONS.bits(), 1 << 13);
const_assert_eq!(Intents::DIRECT_MESSAGE_TYPING.bits(), 1 << 14);
const_assert_eq!(Intents::MESSAGE_CONTENT.bits(), 1 << 15);
const_assert_eq!(Intents::GUILD_SCHEDULED_EVENTS.bits(), 1 << 16);
const_assert_eq!(Intents::AUTO_MODERATION_CONFIGURATION.bits(), 1 << 20);
const_assert_eq!(Intents::AUTO_MODERATION_EXECUTION.bits(), 1 << 21);

#[test]
fn serde() {
serde_test::assert_tokens(
&Intents::MESSAGE_CONTENT,
&[Token::U64(Intents::MESSAGE_CONTENT.bits())],
);
// Deserialization truncates unknown bits.
serde_test::assert_de_tokens(&Intents::empty(), &[Token::U64(1 << 63)]);
}
}
64 changes: 64 additions & 0 deletions twilight-model/src/gateway/presence/activity_flags.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,67 @@ impl Serialize for ActivityFlags {
serializer.serialize_u64(self.bits())
}
}

#[cfg(test)]
mod tests {
use super::ActivityFlags;
use serde::{Deserialize, Serialize};
use serde_test::Token;
use static_assertions::{assert_impl_all, const_assert_eq};
use std::{
fmt::{Binary, Debug, LowerHex, Octal, UpperHex},
hash::Hash,
ops::{
BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign, Not, Sub, SubAssign,
},
};

assert_impl_all!(
ActivityFlags: Binary,
BitAnd,
BitAndAssign,
BitOr,
BitOrAssign,
BitXor,
BitXorAssign,
Clone,
Copy,
Debug,
Deserialize<'static>,
Eq,
Extend<ActivityFlags>,
FromIterator<ActivityFlags>,
Hash,
LowerHex,
Not,
Octal,
Ord,
PartialEq,
PartialOrd,
Send,
Serialize,
Sub,
SubAssign,
Sync,
UpperHex
);
const_assert_eq!(ActivityFlags::INSTANCE.bits(), 1);
const_assert_eq!(ActivityFlags::JOIN.bits(), 1 << 1);
const_assert_eq!(ActivityFlags::SPECTATE.bits(), 1 << 2);
const_assert_eq!(ActivityFlags::JOIN_REQUEST.bits(), 1 << 3);
const_assert_eq!(ActivityFlags::SYNC.bits(), 1 << 4);
const_assert_eq!(ActivityFlags::PLAY.bits(), 1 << 5);
const_assert_eq!(ActivityFlags::PARTY_PRIVACY_FRIENDS.bits(), 1 << 6);
const_assert_eq!(ActivityFlags::PARTY_PRIVACY_VOICE_CHANNEL.bits(), 1 << 7);
const_assert_eq!(ActivityFlags::EMBEDDED.bits(), 1 << 8);

#[test]
fn serde() {
serde_test::assert_tokens(
&ActivityFlags::EMBEDDED,
&[Token::U64(ActivityFlags::EMBEDDED.bits())],
);
// Deserialization truncates unknown bits.
serde_test::assert_de_tokens(&ActivityFlags::empty(), &[Token::U64(1 << 63)]);
}
}
93 changes: 93 additions & 0 deletions twilight-model/src/guild/permissions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,96 @@ impl Serialize for Permissions {
serializer.serialize_str(&self.bits().to_string())
}
}

#[cfg(test)]
mod tests {
use super::Permissions;
use serde::{Deserialize, Serialize};
use serde_test::Token;
use static_assertions::{assert_impl_all, const_assert_eq};
use std::{
fmt::{Binary, Debug, LowerHex, Octal, UpperHex},
hash::Hash,
ops::{
BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign, Not, Sub, SubAssign,
},
};

assert_impl_all!(
Permissions: Binary,
BitAnd,
BitAndAssign,
BitOr,
BitOrAssign,
BitXor,
BitXorAssign,
Clone,
Copy,
Debug,
Deserialize<'static>,
Eq,
Extend<Permissions>,
FromIterator<Permissions>,
Hash,
LowerHex,
Not,
Octal,
Ord,
PartialEq,
PartialOrd,
Send,
Serialize,
Sub,
SubAssign,
Sync,
UpperHex
);
const_assert_eq!(Permissions::CREATE_INVITE.bits(), 1);
const_assert_eq!(Permissions::KICK_MEMBERS.bits(), 1 << 1);
const_assert_eq!(Permissions::BAN_MEMBERS.bits(), 1 << 2);
const_assert_eq!(Permissions::ADMINISTRATOR.bits(), 1 << 3);
const_assert_eq!(Permissions::MANAGE_CHANNELS.bits(), 1 << 4);
const_assert_eq!(Permissions::MANAGE_GUILD.bits(), 1 << 5);
const_assert_eq!(Permissions::ADD_REACTIONS.bits(), 1 << 6);
const_assert_eq!(Permissions::VIEW_AUDIT_LOG.bits(), 1 << 7);
const_assert_eq!(Permissions::PRIORITY_SPEAKER.bits(), 1 << 8);
const_assert_eq!(Permissions::STREAM.bits(), 1 << 9);
const_assert_eq!(Permissions::VIEW_CHANNEL.bits(), 1 << 10);
const_assert_eq!(Permissions::SEND_MESSAGES.bits(), 1 << 11);
const_assert_eq!(Permissions::SEND_TTS_MESSAGES.bits(), 1 << 12);
const_assert_eq!(Permissions::MANAGE_MESSAGES.bits(), 1 << 13);
const_assert_eq!(Permissions::EMBED_LINKS.bits(), 1 << 14);
const_assert_eq!(Permissions::ATTACH_FILES.bits(), 1 << 15);
const_assert_eq!(Permissions::READ_MESSAGE_HISTORY.bits(), 1 << 16);
const_assert_eq!(Permissions::MENTION_EVERYONE.bits(), 1 << 17);
const_assert_eq!(Permissions::USE_EXTERNAL_EMOJIS.bits(), 1 << 18);
const_assert_eq!(Permissions::VIEW_GUILD_INSIGHTS.bits(), 1 << 19);
const_assert_eq!(Permissions::CONNECT.bits(), 1 << 20);
const_assert_eq!(Permissions::SPEAK.bits(), 1 << 21);
const_assert_eq!(Permissions::MUTE_MEMBERS.bits(), 1 << 22);
const_assert_eq!(Permissions::DEAFEN_MEMBERS.bits(), 1 << 23);
const_assert_eq!(Permissions::MOVE_MEMBERS.bits(), 1 << 24);
const_assert_eq!(Permissions::USE_VAD.bits(), 1 << 25);
const_assert_eq!(Permissions::CHANGE_NICKNAME.bits(), 1 << 26);
const_assert_eq!(Permissions::MANAGE_NICKNAMES.bits(), 1 << 27);
const_assert_eq!(Permissions::MANAGE_ROLES.bits(), 1 << 28);
const_assert_eq!(Permissions::MANAGE_WEBHOOKS.bits(), 1 << 29);
const_assert_eq!(Permissions::MANAGE_EMOJIS_AND_STICKERS.bits(), 1 << 30);
const_assert_eq!(Permissions::USE_SLASH_COMMANDS.bits(), 1 << 31);
const_assert_eq!(Permissions::REQUEST_TO_SPEAK.bits(), 1 << 32);
const_assert_eq!(Permissions::MANAGE_EVENTS.bits(), 1 << 33);
const_assert_eq!(Permissions::MANAGE_THREADS.bits(), 1 << 34);
const_assert_eq!(Permissions::CREATE_PUBLIC_THREADS.bits(), 1 << 35);
const_assert_eq!(Permissions::CREATE_PRIVATE_THREADS.bits(), 1 << 36);
const_assert_eq!(Permissions::USE_EXTERNAL_STICKERS.bits(), 1 << 37);
const_assert_eq!(Permissions::SEND_MESSAGES_IN_THREADS.bits(), 1 << 38);
const_assert_eq!(Permissions::USE_EMBEDDED_ACTIVITIES.bits(), 1 << 39);
const_assert_eq!(Permissions::MODERATE_MEMBERS.bits(), 1 << 40);

#[test]
fn serde() {
serde_test::assert_tokens(&Permissions::CREATE_INVITE, &[Token::Str("1")]);
// Deserialization truncates unknown bits.
serde_test::assert_de_tokens(&Permissions::empty(), &[Token::Str("9223372036854775808")]);
}
}
Loading