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

Eliminated usage of MemWriter in tests.

Browse source
This commit is contained in:
Aaron Weiss 2015-02-17 13:32:19 -05:00
parent ed1c047124
commit 6d6e8e1765
2 changed files with 42 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -305,7 +305,7 @@ impl<'a, T: IrcReader, U: IrcWriter> Iterator for ServerIterator<'a, T, U> {
mod test {
use super::{IrcServer, Server};
use std::default::Default;
use std::old_io::{MemReader, MemWriter};
use std::old_io::MemReader;
use std::old_io::util::{NullReader, NullWriter};
use client::conn::Connection;
use client::data::{Config, User};
@ -324,8 +324,8 @@ mod test {
}
}
pub fn get_server_value<T: IrcReader>(server: IrcServer<T, MemWriter>) -> String {
let vec = server.conn().writer().get_ref().to_vec();
pub fn get_server_value<T: IrcReader>(server: IrcServer<T, Vec<u8>>) -> String {
let vec = server.conn().writer().clone();
String::from_utf8(vec).unwrap()
}
@ -347,7 +347,7 @@ mod test {
fn handle_message() {
let value = "PING :irc.test.net\r\n:irc.test.net 376 test :End of /MOTD command.\r\n";
let server = IrcServer::from_connection(test_config(), Connection::new(
MemReader::new(value.as_bytes().to_vec()), MemWriter::new()
MemReader::new(value.as_bytes().to_vec()), Vec::new()
));
for message in server.iter() {
println!("{:?}", message);
@ -364,7 +364,7 @@ mod test {
channels: Some(vec![format!("#test"), format!("#test2")]),
.. Default::default()
}, Connection::new(
MemReader::new(value.as_bytes().to_vec()), MemWriter::new()
MemReader::new(value.as_bytes().to_vec()), Vec::new()
));
for message in server.iter() {
println!("{:?}", message);
@ -382,7 +382,7 @@ mod test {
channels: Some(vec![format!("#test"), format!("#test2")]),
.. Default::default()
}, Connection::new(
MemReader::new(value.as_bytes().to_vec()), MemWriter::new()
MemReader::new(value.as_bytes().to_vec()), Vec::new()
));
for message in server.iter() {
println!("{:?}", message);
@ -395,7 +395,7 @@ mod test {
fn nickname_in_use() {
let value = ":irc.pdgn.co 433 * test :Nickname is already in use.";
let server = IrcServer::from_connection(test_config(), Connection::new(
MemReader::new(value.as_bytes().to_vec()), MemWriter::new()
MemReader::new(value.as_bytes().to_vec()), Vec::new()
));
for message in server.iter() {
println!("{:?}", message);
@ -409,7 +409,7 @@ mod test {
let value = ":irc.pdgn.co 433 * test :Nickname is already in use.\r\n\
:irc.pdgn.co 433 * test2 :Nickname is already in use.\r\n";
let server = IrcServer::from_connection(test_config(), Connection::new(
MemReader::new(value.as_bytes().to_vec()), MemWriter::new()
MemReader::new(value.as_bytes().to_vec()), Vec::new()
));
for message in server.iter() {
println!("{:?}", message);
@ -419,7 +419,7 @@ mod test {
#[test]
fn send() {
let server = IrcServer::from_connection(test_config(), Connection::new(
NullReader, MemWriter::new()
NullReader, Vec::new()
));
assert!(server.send(PRIVMSG("#test", "Hi there!")).is_ok());
assert_eq!(&get_server_value(server)[], "PRIVMSG #test :Hi there!\r\n");
@ -498,7 +498,7 @@ mod test {
fn finger_response() {
let value = ":test!test@test PRIVMSG test :\u{001}FINGER\u{001}\r\n";
let server = IrcServer::from_connection(test_config(), Connection::new(
MemReader::new(value.as_bytes().to_vec()), MemWriter::new()
MemReader::new(value.as_bytes().to_vec()), Vec::new()
));
for message in server.iter() {
println!("{:?}", message);
@ -512,7 +512,7 @@ mod test {
fn version_response() {
let value = ":test!test@test PRIVMSG test :\u{001}VERSION\u{001}\r\n";
let server = IrcServer::from_connection(test_config(), Connection::new(
MemReader::new(value.as_bytes().to_vec()), MemWriter::new()
MemReader::new(value.as_bytes().to_vec()), Vec::new()
));
for message in server.iter() {
println!("{:?}", message);
@ -526,7 +526,7 @@ mod test {
fn source_response() {
let value = ":test!test@test PRIVMSG test :\u{001}SOURCE\u{001}\r\n";
let server = IrcServer::from_connection(test_config(), Connection::new(
MemReader::new(value.as_bytes().to_vec()), MemWriter::new()
MemReader::new(value.as_bytes().to_vec()), Vec::new()
));
for message in server.iter() {
println!("{:?}", message);
@ -541,7 +541,7 @@ mod test {
fn ctcp_ping_response() {
let value = ":test!test@test PRIVMSG test :\u{001}PING test\u{001}\r\n";
let server = IrcServer::from_connection(test_config(), Connection::new(
MemReader::new(value.as_bytes().to_vec()), MemWriter::new()
MemReader::new(value.as_bytes().to_vec()), Vec::new()
));
for message in server.iter() {
println!("{:?}", message);
@ -554,7 +554,7 @@ mod test {
fn time_response() {
let value = ":test!test@test PRIVMSG test :\u{001}TIME\u{001}\r\n";
let server = IrcServer::from_connection(test_config(), Connection::new(
MemReader::new(value.as_bytes().to_vec()), MemWriter::new()
MemReader::new(value.as_bytes().to_vec()), Vec::new()
));
for message in server.iter() {
println!("{:?}", message);
@ -569,7 +569,7 @@ mod test {
fn user_info_response() {
let value = ":test!test@test PRIVMSG test :\u{001}USERINFO\u{001}\r\n";
let server = IrcServer::from_connection(test_config(), Connection::new(
MemReader::new(value.as_bytes().to_vec()), MemWriter::new()
MemReader::new(value.as_bytes().to_vec()), Vec::new()
));
for message in server.iter() {
println!("{:?}", message);

55
src/client/server/utils.rs
View file

@ -237,7 +237,6 @@ impl<'a, T: IrcReader, U: IrcWriter> Wrapper<'a, T, U> {
mod test {
use super::Wrapper;
use std::default::Default;
use std::old_io::MemWriter;
use std::old_io::util::NullReader;
use client::conn::Connection;
use client::data::Config;
@ -247,7 +246,7 @@ mod test {
#[test]
fn identify() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.identify().unwrap();
@ -262,7 +261,7 @@ mod test {
nickname: Some(format!("test")),
password: Some(format!("password")),
.. Default::default()
}, Connection::new(NullReader, MemWriter::new()));
}, Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.identify().unwrap();
@ -271,10 +270,10 @@ mod test {
PASS :password\r\nNICK :test\r\nUSER test 0 * :test\r\n");
}
#[test]
#[test]
fn send_pong() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_pong("irc.test.net").unwrap();
@ -286,7 +285,7 @@ mod test {
#[test]
fn send_join() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_join("#test,#test2,#test3").unwrap();
@ -298,7 +297,7 @@ mod test {
#[test]
fn send_oper() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_oper("test", "test").unwrap();
@ -310,7 +309,7 @@ mod test {
#[test]
fn send_privmsg() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_privmsg("#test", "Hi, everybody!").unwrap();
@ -322,7 +321,7 @@ mod test {
#[test]
fn send_notice() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_notice("#test", "Hi, everybody!").unwrap();
@ -334,7 +333,7 @@ mod test {
#[test]
fn send_topic_no_topic() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_topic("#test", "").unwrap();
@ -346,7 +345,7 @@ mod test {
#[test]
fn send_topic() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_topic("#test", "Testing stuff.").unwrap();
@ -358,7 +357,7 @@ mod test {
#[test]
fn send_kill() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_kill("test", "Testing kills.").unwrap();
@ -370,7 +369,7 @@ mod test {
#[test]
fn send_kick_no_message() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_kick("#test", "test", "").unwrap();
@ -382,7 +381,7 @@ mod test {
#[test]
fn send_kick() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_kick("#test", "test", "Testing kicks.").unwrap();
@ -394,7 +393,7 @@ mod test {
#[test]
fn send_mode_no_modeparams() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_mode("#test", "+i", "").unwrap();
@ -406,7 +405,7 @@ mod test {
#[test]
fn send_mode() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_mode("#test", "+o", "test").unwrap();
@ -418,7 +417,7 @@ mod test {
#[test]
fn send_samode_no_modeparams() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_samode("#test", "+i", "").unwrap();
@ -430,7 +429,7 @@ mod test {
#[test]
fn send_samode() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_samode("#test", "+o", "test").unwrap();
@ -442,7 +441,7 @@ mod test {
#[test]
fn send_sanick() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_sanick("test", "test2").unwrap();
@ -454,7 +453,7 @@ mod test {
#[test]
fn send_invite() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_invite("test", "#test").unwrap();
@ -467,7 +466,7 @@ mod test {
#[cfg(feature = "ctcp")]
fn send_ctcp() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_ctcp("test", "MESSAGE").unwrap();
@ -480,7 +479,7 @@ mod test {
#[cfg(feature = "ctcp")]
fn send_action() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_action("test", "tests.").unwrap();
@ -493,7 +492,7 @@ mod test {
#[cfg(feature = "ctcp")]
fn send_finger() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_finger("test").unwrap();
@ -506,7 +505,7 @@ mod test {
#[cfg(feature = "ctcp")]
fn send_version() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_version("test").unwrap();
@ -519,7 +518,7 @@ mod test {
#[cfg(feature = "ctcp")]
fn send_source() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_source("test").unwrap();
@ -532,7 +531,7 @@ mod test {
#[cfg(feature = "ctcp")]
fn send_user_info() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_user_info("test").unwrap();
@ -545,7 +544,7 @@ mod test {
#[cfg(feature = "ctcp")]
fn send_ctcp_ping() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_ctcp_ping("test").unwrap();
@ -560,7 +559,7 @@ mod test {
#[cfg(feature = "ctcp")]
fn send_time() {
let server = IrcServer::from_connection(test_config(),
Connection::new(NullReader, MemWriter::new()));
Connection::new(NullReader, Vec::new()));
{
let wrapper = Wrapper::new(&server);
wrapper.send_time("test").unwrap();