test(headers): Add tests for possibly empty list headers.

This commit is contained in:
Pyfisch
2015-04-26 14:32:10 +02:00
parent 18f717fcf1
commit 76a4a01348
7 changed files with 53 additions and 19 deletions

View File

@@ -16,6 +16,14 @@ header! {
#[doc="codings = content-coding / \"identity\" / \"*\""] #[doc="codings = content-coding / \"identity\" / \"*\""]
#[doc="```"] #[doc="```"]
(AcceptEncoding, "Accept-Encoding") => (QualityItem<Encoding>)* (AcceptEncoding, "Accept-Encoding") => (QualityItem<Encoding>)*
test_accept_encoding {
test_header!(test1, vec![b"compress, gzip".to_vec()]);
test_header!(test2, vec![b"".to_vec()]);
test_header!(test3, vec![b"*".to_vec()]);
test_header!(test4, vec![b"compress;q=0.5, gzip;q=1.0".to_vec()]);
test_header!(test5, vec![b"gzip;q=1.0, identity; q=0.5, *;q=0".to_vec()]);
}
} }
#[cfg(test)] #[cfg(test)]

View File

@@ -8,4 +8,6 @@ header! {
#[doc="response to a preflight request, which header field names can be used"] #[doc="response to a preflight request, which header field names can be used"]
#[doc="during the actual request."] #[doc="during the actual request."]
(AccessControlAllowHeaders, "Access-Control-Allow-Headers") => (UniCase<String>)* (AccessControlAllowHeaders, "Access-Control-Allow-Headers") => (UniCase<String>)*
test_access_control_allow_headers {}
} }

View File

@@ -8,4 +8,6 @@ header! {
#[doc="response to a preflight request, which methods can be used during the"] #[doc="response to a preflight request, which methods can be used during the"]
#[doc="actual request."] #[doc="actual request."]
(AccessControlAllowMethods, "Access-Control-Allow-Methods") => (Method)* (AccessControlAllowMethods, "Access-Control-Allow-Methods") => (Method)*
test_access_control_allow_methods {}
} }

View File

@@ -8,4 +8,6 @@ header! {
#[doc="be used in the actual request as part of the preflight request."] #[doc="be used in the actual request as part of the preflight request."]
#[doc="during the actual request."] #[doc="during the actual request."]
(AccessControlRequestHeaders, "Access-Control-Request-Headers") => (UniCase<String>)* (AccessControlRequestHeaders, "Access-Control-Request-Headers") => (UniCase<String>)*
test_access_control_request_headers {}
} }

View File

@@ -13,23 +13,33 @@ header! {
#[doc="Allow = #method"] #[doc="Allow = #method"]
#[doc="```"] #[doc="```"]
(Allow, "Allow") => (Method)* (Allow, "Allow") => (Method)*
}
#[cfg(test)] test_allow {
mod tests { // From the RFC
use super::Allow; test_header!(
use header::Header; test1,
use method::Method::{self, Options, Get, Put, Post, Delete, Head, Trace, Connect, Patch, Extension}; vec![b"GET, HEAD, PUT"],
Some(HeaderField(vec![Method::Get, Method::Head, Method::Put])));
#[test] // Own tests
fn test_allow() { test_header!(
let mut allow: Option<Allow>; test2,
vec![b"OPTIONS, GET, PUT, POST, DELETE, HEAD, TRACE, CONNECT, PATCH, fOObAr"],
allow = Header::parse_header([b"OPTIONS,GET,PUT,POST,DELETE,HEAD,TRACE,CONNECT,PATCH,fOObAr".to_vec()].as_ref()); Some(HeaderField(vec![
assert_eq!(allow, Some(Allow(vec![Options, Get, Put, Post, Delete, Head, Trace, Connect, Patch, Extension("fOObAr".to_string())]))); Method::Options,
Method::Get,
allow = Header::parse_header([b"".to_vec()].as_ref()); Method::Put,
assert_eq!(allow, Some(Allow(Vec::<Method>::new()))); Method::Post,
Method::Delete,
Method::Head,
Method::Trace,
Method::Connect,
Method::Patch,
Method::Extension("fOObAr".to_string())])));
// FIXME: Formatting fails
// test_header!(
// test3,
// vec![b""],
// Some(HeaderField(Vec::<Method>::new())));
} }
} }

View File

@@ -125,7 +125,7 @@ macro_rules! header {
// $nn:expr: Nice name of the header // $nn:expr: Nice name of the header
// List header, zero or more items // List header, zero or more items
($(#[$a:meta])*($id:ident, $n:expr) => ($item:ty)*) => { ($(#[$a:meta])*($id:ident, $n:expr) => ($item:ty)* $tm:ident{$($tf:item)*}) => {
$(#[$a])* $(#[$a])*
#[derive(Clone, Debug, PartialEq)] #[derive(Clone, Debug, PartialEq)]
pub struct $id(pub Vec<$item>); pub struct $id(pub Vec<$item>);
@@ -149,6 +149,14 @@ macro_rules! header {
self.fmt_header(f) self.fmt_header(f)
} }
} }
#[allow(unused_imports)]
mod $tm{
use $crate::header::*;
use $crate::mime::*;
use $crate::method::Method;
use super::$id as HeaderField;
$($tf)*
}
}; };
// List header, one or more items // List header, one or more items
@@ -180,6 +188,7 @@ macro_rules! header {
mod $tm{ mod $tm{
use $crate::header::*; use $crate::header::*;
use $crate::mime::*; use $crate::mime::*;
use $crate::method::Method;
use super::$id as HeaderField; use super::$id as HeaderField;
$($tf)* $($tf)*
} }
@@ -253,6 +262,7 @@ macro_rules! header {
mod $tm{ mod $tm{
use $crate::header::*; use $crate::header::*;
use $crate::mime::*; use $crate::mime::*;
use $crate::method::Method;
use super::$id as HeaderField; use super::$id as HeaderField;
$($tf)* $($tf)*
} }