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

src/header/common/accept_encoding.rs

@@ -16,6 +16,14 @@ header! {
     #[doc="codings          = content-coding / \"identity\" / \"*\""]
     #[doc="```"]
     (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)]

src/header/common/access_control_allow_headers.rs

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

src/header/common/access_control_allow_methods.rs

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

src/header/common/access_control_request_headers.rs

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

src/header/common/access_control_request_method.rs

@@ -7,4 +7,4 @@ header! {
     #[doc="The `Access-Control-Request-Method` header indicates which method will be"]
     #[doc="used in the actual request as part of the preflight request."]
     (AccessControlRequestMethod, "Access-Control-Request-Method") => [Method]
-}
+}

src/header/common/allow.rs

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

src/header/common/mod.rs

@@ -125,7 +125,7 @@ macro_rules! header {
     // $nn:expr: Nice name of the header
 
     // 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])*
         #[derive(Clone, Debug, PartialEq)]
         pub struct $id(pub Vec<$item>);
@@ -149,6 +149,14 @@ macro_rules! header {
                 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
@@ -180,6 +188,7 @@ macro_rules! header {
         mod $tm{
             use $crate::header::*;
             use $crate::mime::*;
+            use $crate::method::Method;
             use super::$id as HeaderField;
             $($tf)*
         }
@@ -253,6 +262,7 @@ macro_rules! header {
         mod $tm{
             use $crate::header::*;
             use $crate::mime::*;
+            use $crate::method::Method;
             use super::$id as HeaderField;
             $($tf)*
         }