From f1489ae2c8e774083eddc135a3457bdef5466be1 Mon Sep 17 00:00:00 2001 From: Alexis Mousset Date: Fri, 27 Feb 2015 16:58:57 +0100 Subject: [PATCH] Update tests to follow rust upgrade --- examples/client.rs | 8 ++++---- src/client/server_info.rs | 4 ++-- src/extension.rs | 10 +++++----- src/lib.rs | 8 ++++---- src/response.rs | 22 +++++++++++----------- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/examples/client.rs b/examples/client.rs index f6d4814..7070c51 100644 --- a/examples/client.rs +++ b/examples/client.rs @@ -8,14 +8,14 @@ // except according to those terms. #![feature(default_type_params)] -#![feature(phase)] #[phase(plugin, link)] extern crate log; +#[macro_use] extern crate log; extern crate smtp; extern crate getopts; -use std::io::stdin; +use std::old_io::stdin; use std::string::String; -use std::io::net::ip::Port; +use std::old_io::net::ip::Port; use std::os; use getopts::{optopt, optflag, getopts, OptGroup, usage}; @@ -35,7 +35,7 @@ fn sendmail(source_address: &str, recipient_addresses: &[&str], message: &str, s email.subject(subject); email.date_now(); - let mut client = Client::new((server, port)); + let mut client: Client = Client::new((server, port)); client.set_hello_name(my_hostname); client.send(email) } diff --git a/src/client/server_info.rs b/src/client/server_info.rs index 1e9f577..f1b6d3e 100644 --- a/src/client/server_info.rs +++ b/src/client/server_info.rs @@ -67,11 +67,11 @@ mod test { assert_eq!(format!("{}", ServerInfo{ name: "name".to_string(), esmtp_features: Some(vec![Extension::EightBitMime]) - }), "name with [8BITMIME]".to_string()); + }), "name with [EightBitMime]".to_string()); assert_eq!(format!("{}", ServerInfo{ name: "name".to_string(), esmtp_features: Some(vec![Extension::EightBitMime, Extension::Size(42)]) - }), "name with [8BITMIME, SIZE=42]".to_string()); + }), "name with [EightBitMime, Size(42)]".to_string()); assert_eq!(format!("{}", ServerInfo{ name: "name".to_string(), esmtp_features: None diff --git a/src/extension.rs b/src/extension.rs index 5bccbc6..88716e8 100644 --- a/src/extension.rs +++ b/src/extension.rs @@ -120,12 +120,12 @@ mod test { #[test] fn test_from_str() { - assert_eq!("8BITMIME".parse::(), Some(Extension::EightBitMime)); - assert_eq!("SIZE 42".parse::(), Some(Extension::Size(42))); - assert_eq!("SIZ 42".parse::(), None); - assert_eq!("SIZE 4a2".parse::(), None); + assert_eq!("8BITMIME".parse::(), Ok(Extension::EightBitMime)); + assert_eq!("SIZE 42".parse::(), Ok(Extension::Size(42))); + assert!("SIZ 42".parse::().is_err()); + assert!("SIZE 4a2".parse::().is_err()); // TODO: accept trailing spaces ? - assert_eq!("SIZE 42 ".parse::(), None); + assert!("SIZE 42 ".parse::().is_err()); } #[test] diff --git a/src/lib.rs b/src/lib.rs index 751b564..72dbf7a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -41,7 +41,7 @@ //! email.date_now(); //! //! // Open a local connection on port 25 -//! let mut client = Client::localhost(); +//! let mut client: Client = Client::localhost(); //! // Send the email //! let result = client.send(email); //! @@ -68,7 +68,7 @@ //! email.date_now(); //! //! // Connect to a remote server on a custom port -//! let mut client = Client::new(("server.tld", 10025)); +//! let mut client: Client = Client::new(("server.tld", 10025)); //! // Set the name sent during EHLO/HELO, default is `localhost` //! client.set_hello_name("my.hostname.tld"); //! // Enable connection reuse @@ -100,7 +100,7 @@ //! "Hello world !" //! ); //! -//! let mut client = Client::localhost(); +//! let mut client: Client = Client::localhost(); //! let result = client.send(email); //! assert!(result.is_ok()); //! ``` @@ -114,7 +114,7 @@ //! use smtp::client::Client; //! use smtp::common::SMTP_PORT; //! -//! let mut email_client = Client::new(("localhost", SMTP_PORT)); +//! let mut email_client: Client = Client::new(("localhost", SMTP_PORT)); //! let _ = email_client.connect(); //! let _ = email_client.ehlo(); //! let _ = email_client.mail("user@example.com"); diff --git a/src/response.rs b/src/response.rs index 0849560..045a633 100644 --- a/src/response.rs +++ b/src/response.rs @@ -84,40 +84,40 @@ mod test { #[test] fn test_from_str() { assert_eq!("200 response message".parse::(), - Some(Response{ + Ok(Response{ code: 200, message: Some("response message".to_string()) }) ); assert_eq!("200-response message".parse::(), - Some(Response{ + Ok(Response{ code: 200, message: Some("response message".to_string()) }) ); assert_eq!("200".parse::(), - Some(Response{ + Ok(Response{ code: 200, message: None }) ); assert_eq!("200 ".parse::(), - Some(Response{ + Ok(Response{ code: 200, message: None }) ); assert_eq!("200-response\r\nmessage".parse::(), - Some(Response{ + Ok(Response{ code: 200, message: Some("response\r\nmessage".to_string()) }) ); - assert_eq!("2000response message".parse::(), None); - assert_eq!("20a response message".parse::(), None); - assert_eq!("20 ".parse::(), None); - assert_eq!("20".parse::(), None); - assert_eq!("2".parse::(), None); - assert_eq!("".parse::(), None); + assert!("2000response message".parse::().is_err()); + assert!("20a response message".parse::().is_err()); + assert!("20 ".parse::().is_err()); + assert!("20".parse::().is_err()); + assert!("2".parse::().is_err()); + assert!("".parse::().is_err()); } }