Fixed test compilation.
This commit is contained in:
parent
87f3b65649
commit
fcca39a98d
4 changed files with 16 additions and 13 deletions
|
@ -133,7 +133,8 @@ impl<T: IrcRead, U: IrcWrite> Connection<T, U> {
|
|||
#[cfg(not(feature = "encode"))]
|
||||
pub fn send<M: Into<Message>>(&self, to_msg: M) -> Result<()> {
|
||||
let mut writer = self.writer.lock().unwrap();
|
||||
try!(writer.write_all(&to_msg.into::<Message>().into_string().as_bytes()));
|
||||
let msg: Message = to_msg.into();
|
||||
try!(writer.write_all(&msg.into_string().as_bytes()));
|
||||
writer.flush()
|
||||
}
|
||||
|
||||
|
|
|
@ -103,7 +103,7 @@ impl<'a> From<&'a str> for Message {
|
|||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use super::{Message, ToMessage};
|
||||
use super::Message;
|
||||
|
||||
#[test]
|
||||
fn new() {
|
||||
|
@ -171,14 +171,16 @@ mod test {
|
|||
args: vec![format!("test")],
|
||||
suffix: Some(format!("Testing!")),
|
||||
};
|
||||
assert_eq!("PRIVMSG test :Testing!\r\n".to_message(), message);
|
||||
let msg: Message = "PRIVMSG test :Testing!\r\n".into();
|
||||
assert_eq!(msg, message);
|
||||
let message = Message {
|
||||
prefix: Some(format!("test!test@test")),
|
||||
command: format!("PRIVMSG"),
|
||||
args: vec![format!("test")],
|
||||
suffix: Some(format!("Still testing!")),
|
||||
};
|
||||
assert_eq!(":test!test@test PRIVMSG test :Still testing!\r\n".to_message(), message);
|
||||
let msg: Message = ":test!test@test PRIVMSG test :Still testing!\r\n".into();
|
||||
assert_eq!(msg, message);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
@ -189,14 +191,15 @@ mod test {
|
|||
prefix: Some(format!("test!test@test")),
|
||||
command: format!("COMMAND"),
|
||||
args: vec![format!("ARG:test")],
|
||||
suffix: Some(format!("Still testing!")),
|
||||
suffix: Some(format!("Testing!")),
|
||||
};
|
||||
assert_eq!(":test!test@test COMMAND ARG:test :Still testing!\r\n".to_message(), message);
|
||||
let msg: Message = ":test!test@test COMMAND ARG:test :Testing!\r\n".into();
|
||||
assert_eq!(msg, message);
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[should_panic]
|
||||
fn to_message_invalid_format() {
|
||||
":invalid :message".to_message();
|
||||
let _: Message = ":invalid :message".into();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -332,15 +332,14 @@ impl FromStr for Response {
|
|||
#[cfg(test)]
|
||||
mod test {
|
||||
use super::Response;
|
||||
use client::data::message::ToMessage;
|
||||
|
||||
#[test]
|
||||
fn from_message() {
|
||||
assert_eq!(Response::from_message(
|
||||
&":irc.test.net 353 test = #test :test\r\n".to_message()
|
||||
&":irc.test.net 353 test = #test :test\r\n".into()
|
||||
).unwrap(), Response::RPL_NAMREPLY);
|
||||
assert_eq!(Response::from_message(
|
||||
&":irc.test.net 433 <nick> :Nickname is already in use\r\n".to_message()
|
||||
&":irc.test.net 433 <nick> :Nickname is already in use\r\n".into()
|
||||
).unwrap(), Response::ERR_NICKNAMEINUSE);
|
||||
}
|
||||
|
||||
|
|
|
@ -311,10 +311,9 @@ mod test {
|
|||
use std::default::Default;
|
||||
use std::io::{Cursor, sink};
|
||||
use client::conn::Connection;
|
||||
use client::data::{Config, User};
|
||||
use client::data::{Config, Message, User};
|
||||
use client::data::command::Command::PRIVMSG;
|
||||
use client::data::kinds::IrcRead;
|
||||
use client::data::message::ToMessage;
|
||||
use client::test::buf_empty;
|
||||
|
||||
pub fn test_config() -> Config {
|
||||
|
@ -357,7 +356,8 @@ mod test {
|
|||
));
|
||||
let mut messages = String::new();
|
||||
for command in server.iter_cmd() {
|
||||
messages.push_str(&command.unwrap().to_message().into_string());
|
||||
let msg: Message = command.unwrap().into();
|
||||
messages.push_str(&msg.into_string());
|
||||
}
|
||||
assert_eq!(&messages[..], exp);
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue