DGNum/rust-irc
6
0
Fork 0
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Updated tests to compile.

Browse source
This commit is contained in:
Aaron Weiss 2017-06-19 14:42:27 -04:00
parent cf3ee671ed
commit 1c1e4af311
No known key found for this signature in database
GPG key ID: 0237035D9BF03AE2
2 changed files with 1 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/client/conn.rs
View file

@ -250,38 +250,11 @@ mod test {
use client::data::Message;
use client::data::Command::PRIVMSG;
#[cfg(feature = "encode")]
fn send_to<C: Connection, M: Into<Message>>(conn: &C, msg: M, encoding: &str) -> Result<()> {
conn.send(&msg.into().to_string(), encoding)
}
#[cfg(not(feature = "encode"))]
fn send_to<C: Connection, M: Into<Message>>(conn: &C, msg: M) -> Result<()> {
conn.send(&msg.into().to_string())
}
#[test]
#[cfg(not(feature = "encode"))]
fn send() {
let conn = MockConnection::empty();
assert!(send_to(&conn, PRIVMSG("test".to_owned(), "Testing!".to_owned())).is_ok());
let data = conn.written().unwrap();
assert_eq!(&data[..], "PRIVMSG test :Testing!\r\n");
}
#[test]
#[cfg(not(feature = "encode"))]
fn send_str() {
let exp = "PRIVMSG test :Testing!\r\n";
let conn = MockConnection::empty();
assert!(send_to(&conn, exp).is_ok());
let data = conn.written().unwrap();
assert_eq!(&data[..], exp);
}
#[test]
#[cfg(feature = "encode")]
fn send_utf8() {
let conn = MockConnection::empty();
assert!(
@ -296,7 +269,6 @@ mod test {
}
#[test]
#[cfg(feature = "encode")]
fn send_utf8_str() {
let exp = "PRIVMSG test :€ŠšŽžŒœŸ\r\n";
let conn = MockConnection::empty();
@ -306,7 +278,6 @@ mod test {
}
#[test]
#[cfg(feature = "encode")]
fn send_iso885915() {
let conn = MockConnection::empty();
assert!(
@ -321,7 +292,6 @@ mod test {
}
#[test]
#[cfg(feature = "encode")]
fn send_iso885915_str() {
let exp = "PRIVMSG test :€ŠšŽžŒœŸ\r\n";
let conn = MockConnection::empty();
@ -331,14 +301,6 @@ mod test {
}
#[test]
#[cfg(not(feature = "encode"))]
fn recv() {
let conn = MockConnection::new("PRIVMSG test :Testing!\r\n");
assert_eq!(&conn.recv().unwrap()[..], "PRIVMSG test :Testing!\r\n");
}
#[test]
#[cfg(feature = "encode")]
fn recv_utf8() {
let conn = MockConnection::new("PRIVMSG test :Testing!\r\n");
assert_eq!(
@ -348,7 +310,6 @@ mod test {
}
#[test]
#[cfg(feature = "encode")]
fn recv_iso885915() {
let data = [0xA4, 0xA6, 0xA8, 0xB4, 0xB8, 0xBC, 0xBD, 0xBE];
let conn = MockConnection::from_byte_vec({

8
src/client/server/mod.rs
View file

@ -702,7 +702,7 @@ mod test {
use client::data::Config;
#[cfg(not(feature = "nochanlists"))]
use client::data::User;
use client::data::command::Command::{PART, PRIVMSG};
use proto::command::Command::{PART, PRIVMSG};
pub fn test_config() -> Config {
Config {
@ -716,16 +716,10 @@ mod test {
}
}
#[cfg(feature = "encode")]
pub fn get_server_value(server: IrcServer) -> String {
server.conn().written(server.config().encoding()).unwrap()
}
#[cfg(not(feature = "encode"))]
pub fn get_server_value(server: IrcServer) -> String {
server.conn().written().unwrap()
}
#[test]
fn iterator() {
let exp = "PRIVMSG test :Hi!\r\nPRIVMSG test :This is a test!\r\n\