Fix no-feature tests

1 files changed, 66 insertions, 63 deletions

diff --git a/tests/test_channels.rs b/tests/test_channels.rs
index 5ceb333..8da96a1 100644
--- a/tests/test_channels.rs
+++ b/tests/test_channels.rs
@@ -1,79 +1,82 @@
 extern crate serenity;
 
-use serenity::model::*;
-use std::collections::HashMap;
-use std::sync::{Arc, RwLock};
+#[cfg(feature="utils")]
+mod utils {
+    use serenity::model::*;
+    use std::collections::HashMap;
+    use std::sync::{Arc, RwLock};
 
-fn group() -> Group {
-    Group {
-        channel_id: ChannelId(1),
-        icon: None,
-        last_message_id: None,
-        last_pin_timestamp: None,
-        name: None,
-        owner_id: UserId(2),
-        recipients: HashMap::new(),
+    fn group() -> Group {
+        Group {
+            channel_id: ChannelId(1),
+            icon: None,
+            last_message_id: None,
+            last_pin_timestamp: None,
+            name: None,
+            owner_id: UserId(2),
+            recipients: HashMap::new(),
+        }
     }
-}
 
-fn guild_channel() -> GuildChannel {
-    GuildChannel {
-        id: ChannelId(1),
-        bitrate: None,
-        guild_id: GuildId(2),
-        kind: ChannelType::Text,
-        last_message_id: None,
-        last_pin_timestamp: None,
-        name: "nsfw-stuff".to_owned(),
-        permission_overwrites: vec![],
-        position: 0,
-        topic: None,
-        user_limit: None,
+    fn guild_channel() -> GuildChannel {
+        GuildChannel {
+            id: ChannelId(1),
+            bitrate: None,
+            guild_id: GuildId(2),
+            kind: ChannelType::Text,
+            last_message_id: None,
+            last_pin_timestamp: None,
+            name: "nsfw-stuff".to_owned(),
+            permission_overwrites: vec![],
+            position: 0,
+            topic: None,
+            user_limit: None,
+        }
     }
-}
 
-fn private_channel() -> PrivateChannel {
-    PrivateChannel {
-        id: ChannelId(1),
-        last_message_id: None,
-        last_pin_timestamp: None,
-        kind: ChannelType::Private,
-        recipient: Arc::new(RwLock::new(User {
-            id: UserId(2),
-            avatar: None,
-            bot: false,
-            discriminator: 1,
-            name: "ab".to_owned(),
-        })),
+    fn private_channel() -> PrivateChannel {
+        PrivateChannel {
+            id: ChannelId(1),
+            last_message_id: None,
+            last_pin_timestamp: None,
+            kind: ChannelType::Private,
+            recipient: Arc::new(RwLock::new(User {
+                id: UserId(2),
+                avatar: None,
+                bot: false,
+                discriminator: 1,
+                name: "ab".to_owned(),
+            })),
+        }
     }
-}
 
-#[test]
-fn nsfw_checks() {
-    let mut channel = guild_channel();
-    assert!(channel.is_nsfw());
-    channel.kind = ChannelType::Voice;
-    assert!(!channel.is_nsfw());
+    #[test]
+    fn nsfw_checks() {
+        let mut channel = guild_channel();
+        assert!(channel.is_nsfw());
+        channel.kind = ChannelType::Voice;
+        assert!(!channel.is_nsfw());
 
-    channel.kind = ChannelType::Text;
-    channel.name = "nsfw-".to_owned();
-    assert!(channel.is_nsfw());
+        channel.kind = ChannelType::Text;
+        channel.name = "nsfw-".to_owned();
+        assert!(channel.is_nsfw());
 
-    channel.name = "nsfw".to_owned();
-    assert!(channel.is_nsfw());
-    channel.kind = ChannelType::Voice;
-    assert!(!channel.is_nsfw());
-    channel.kind = ChannelType::Text;
+        channel.name = "nsfw".to_owned();
+        assert!(channel.is_nsfw());
+        channel.kind = ChannelType::Voice;
+        assert!(!channel.is_nsfw());
+        channel.kind = ChannelType::Text;
 
-    channel.name = "nsf".to_owned();
-    assert!(!channel.is_nsfw());
+        channel.name = "nsf".to_owned();
+        assert!(!channel.is_nsfw());
 
-    let channel = Channel::Guild(Arc::new(RwLock::new(channel)));
-    assert!(!channel.is_nsfw());
+        let channel = Channel::Guild(Arc::new(RwLock::new(channel)));
+        assert!(!channel.is_nsfw());
 
-    let group = group();
-    assert!(!group.is_nsfw());
+        let group = group();
+        assert!(!group.is_nsfw());
 
-    let private_channel = private_channel();
-    assert!(!private_channel.is_nsfw());
+        let private_channel = private_channel();
+        assert!(!private_channel.is_nsfw());
+    }
 }