Merge pull request #481 from pyfisch/headertests

Add tests for headers

src/header/common/accept.rs

@@ -27,32 +27,39 @@ header! {
     #[doc="* Using always Mime types to represent `media-range` differs from the ABNF."]
     #[doc="* **FIXME**: `accept-ext` is not supported."]
     (Accept, "Accept") => (QualityItem<Mime>)+
-}
-
-#[cfg(test)]
-mod tests {
-    use mime::*;
-
-    use header::{Header, Quality, QualityItem, qitem};
-
-    use super::Accept;
-
-    #[test]
-    fn test_parse_header_no_quality() {
-        let a: Accept = Header::parse_header([b"text/plain; charset=utf-8".to_vec()].as_ref()).unwrap();
-        let b = Accept(vec![
-            qitem(Mime(TopLevel::Text, SubLevel::Plain, vec![(Attr::Charset, Value::Utf8)])),
-        ]);
-        assert_eq!(a, b);
-    }
 
-    #[test]
-    fn test_parse_header_with_quality() {
-        let a: Accept = Header::parse_header([b"text/plain; charset=utf-8; q=0.5".to_vec()].as_ref()).unwrap();
-        let b = Accept(vec![
-            QualityItem::new(Mime(TopLevel::Text, SubLevel::Plain, vec![(Attr::Charset, Value::Utf8)]), Quality(500)),
-        ]);
-        assert_eq!(a, b);
+    test_accept {
+        // Tests from the RFC
+        // FIXME: Test fails, first value containing a "*" fails to parse
+        // test_header!(
+        //    test1,
+        //    vec![b"audio/*; q=0.2, audio/basic"],
+        //    Some(HeaderField(vec![
+        //        QualityItem::new(Mime(TopLevel::Audio, SubLevel::Star, vec![]), Quality(200)),
+        //        qitem(Mime(TopLevel::Audio, SubLevel::Ext("basic".to_string()), vec![])),
+        //        ])));
+        test_header!(
+            test2,
+            vec![b"text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c"],
+            Some(HeaderField(vec![
+                QualityItem::new(Mime(TopLevel::Text, SubLevel::Plain, vec![]), Quality(500)),
+                qitem(Mime(TopLevel::Text, SubLevel::Html, vec![])),
+                QualityItem::new(Mime(TopLevel::Text, SubLevel::Ext("x-dvi".to_string()), vec![]), Quality(800)),
+                qitem(Mime(TopLevel::Text, SubLevel::Ext("x-c".to_string()), vec![])),
+                ])));
+        // Custom tests
+        test_header!(
+            test3,
+            vec![b"text/plain; charset=utf-8"],
+            Some(Accept(vec![
+                qitem(Mime(TopLevel::Text, SubLevel::Plain, vec![(Attr::Charset, Value::Utf8)])),
+                ])));
+        test_header!(
+            test4,
+            vec![b"text/plain; charset=utf-8; q=0.5"],
+            Some(Accept(vec![
+                QualityItem::new(Mime(TopLevel::Text, SubLevel::Plain, vec![(Attr::Charset, Value::Utf8)]), Quality(500)),
+            ])));
     }
 }
 

src/header/common/accept_charset.rs

@@ -16,18 +16,8 @@ header! {
     #[doc="Accept-Charset = 1#( ( charset / \"*\" ) [ weight ] )"]
     #[doc="```"]
     (AcceptCharset, "Accept-Charset") => (QualityItem<Charset>)+
-}
-
 
-#[test]
-fn test_parse_header() {
-    use header::{self, q};
-    let a: AcceptCharset = header::Header::parse_header(
-        [b"iso-8859-5, iso-8859-6;q=0.8".to_vec()].as_ref()).unwrap();
-    let b = AcceptCharset(vec![
-        QualityItem { item: Charset::Iso_8859_5, quality: q(1.0) },
-        QualityItem { item: Charset::Iso_8859_6, quality: q(0.8) },
-    ]);
-    assert_eq!(format!("{}", a), format!("{}", b));
-    assert_eq!(a, b);
+    test_accept_charset {
+        test_header!(test1, vec![b"iso-8859-5, unicode-1-1;q=0.8"]);
+    }
 }

src/header/common/accept_encoding.rs

@@ -16,6 +16,17 @@ header! {
     #[doc="codings          = content-coding / \"identity\" / \"*\""]
     #[doc="```"]
     (AcceptEncoding, "Accept-Encoding") => (QualityItem<Encoding>)*
+
+    test_accept_encoding {
+        // From the RFC
+        test_header!(test1, vec![b"compress, gzip"]);
+        test_header!(test2, vec![b""]);
+        test_header!(test3, vec![b"*"]);
+        // Note: Removed quality 1 from gzip
+        test_header!(test4, vec![b"compress;q=0.5, gzip"]);
+        // FIXME: Formatting of 0 as quality value
+        // test_header!(test5, vec![b"gzip;q=1.0, identity; q=0.5, *;q=0"]);
+    }
 }
 
 #[cfg(test)]

src/header/common/accept_language.rs

@@ -49,6 +49,10 @@ header! {
     #[doc="language-range  = <language-range, see [RFC4647], Section 2.1>"]
     #[doc="```"]
     (AcceptLanguage, "Accept-Language") => (QualityItem<Language>)+
+
+    test_accept_language {
+        test_header!(test1, vec![b"da, en-gb;q=0.8, en;q=0.7"]);
+    }
 }
 
 #[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_max_age.rs

@@ -5,4 +5,6 @@ header! {
     #[doc="The `Access-Control-Max-Age` header indicates how long the results of a"]
     #[doc="preflight request can be cached in a preflight result cache."]
     (AccessControlMaxAge, "Access-Control-Max-Age") => [u32]
-}
+
+    test_access_control_max_age {}
+}

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,6 @@ 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]
-}
+
+    test_access_control_request_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/content_encoding.rs

@@ -17,6 +17,8 @@ header! {
     #[doc="Content-Encoding = 1#content-coding"]
     #[doc="```"]
     (ContentEncoding, "Content-Encoding") => (Encoding)+
+
+    test_content_encoding {}
 }
 
 bench_header!(single, ContentEncoding, { vec![b"gzip".to_vec()] });

src/header/common/content_length.rs

@@ -16,6 +16,11 @@ header! {
     #[doc="Content-Length = 1*DIGIT"]
     #[doc="```"]
     (ContentLength, "Content-Length") => [u64]
+
+    test_content_length {
+        // Testcase from RFC
+        test_header!(test1, vec![b"3495"], Some(HeaderField(3495)));
+    }
 }
 
 bench_header!(bench, ContentLength, { vec![b"42349984".to_vec()] });

src/header/common/content_type.rs

@@ -17,6 +17,15 @@ header! {
     #[doc="Content-Type = media-type"]
     #[doc="```"]
     (ContentType, "Content-Type") => [Mime]
+
+    test_content_type {
+        test_header!(
+            test1,
+            // FIXME: Should be b"text/html; charset=ISO-8859-4" but mime crate lowercases
+            // the whole value so parsing and formatting the value gives a different result
+            vec![b"text/html; charset=iso-8859-4"],
+            Some(HeaderField(Mime(TopLevel::Text, SubLevel::Html, vec![(Attr::Charset, Value::Ext("iso-8859-4".to_string()))]))));
+    }
 }
 
 bench_header!(bench, ContentType, { vec![b"application/json; charset=utf-8".to_vec()] });

src/header/common/date.rs

@@ -11,6 +11,10 @@ header! {
     #[doc="Date = HTTP-date"]
     #[doc="```"]
     (Date, "Date") => [HttpDate]
+
+    test_date {
+        test_header!(test1, vec![b"Tue, 15 Nov 1994 08:12:31 GMT"]);
+    }
 }
 
 bench_header!(imf_fixdate, Date, { vec![b"Sun, 07 Nov 1994 08:48:37 GMT".to_vec()] });

src/header/common/etag.rs

@@ -18,6 +18,12 @@ header! {
     #[doc="ETag       = entity-tag"]
     #[doc="```"]
     (ETag, "ETag") => [EntityTag]
+
+    test_etag {
+        test_header!(test1, vec![b"\"xyzzy\""], Some(HeaderField(EntityTag::new(false, "xyzzy".to_string()))));
+        test_header!(test2, vec![b"W/\"xyzzy\""], Some(HeaderField(EntityTag::new(true, "xyzzy".to_string()))));
+        test_header!(test3, vec![b"\"\""], Some(HeaderField(EntityTag::new(false, "".to_string()))));
+    }
 }
 
 #[cfg(test)]

src/header/common/expires.rs

@@ -15,6 +15,11 @@ header! {
     #[doc="Expires = HTTP-date"]
     #[doc="```"]
     (Expires, "Expires") => [HttpDate]
+
+    test_expires {
+        // Testcase from RFC
+        test_header!(test1, vec![b"Thu, 01 Dec 1994 16:00:00 GMT"]);
+    }
 }
 
 bench_header!(imf_fixdate, Expires, { vec![b"Sun, 07 Nov 1994 08:48:37 GMT".to_vec()] });

src/header/common/if_match.rs

@@ -21,24 +21,21 @@ header! {
     #[doc="If-Match = \"*\" / 1#entity-tag"]
     #[doc="```"]
     (IfMatch, "If-Match") => {Any / (EntityTag)+}
-}
 
-#[test]
-fn test_parse_header() {
-    use header::Header;
-    {
-        let a: IfMatch = Header::parse_header(
-        [b"*".to_vec()].as_ref()).unwrap();
-        assert_eq!(a, IfMatch::Any);
-    }
-    {
-        let a: IfMatch = Header::parse_header(
-            [b"\"xyzzy\", \"r2d2xxxx\", \"c3piozzzz\"".to_vec()].as_ref()).unwrap();
-        let b = IfMatch::Items(
-            vec![EntityTag::new(false, "xyzzy".to_string()),
-                 EntityTag::new(false, "r2d2xxxx".to_string()),
-                 EntityTag::new(false, "c3piozzzz".to_string())]);
-        assert_eq!(a, b);
+    test_if_match {
+        test_header!(
+            test1,
+            vec![b"\"xyzzy\""],
+            Some(HeaderField::Items(
+                vec![EntityTag::new(false, "xyzzy".to_string())])));
+        test_header!(
+            test2,
+            vec![b"\"xyzzy\", \"r2d2xxxx\", \"c3piozzzz\""],
+            Some(HeaderField::Items(
+                vec![EntityTag::new(false, "xyzzy".to_string()),
+                     EntityTag::new(false, "r2d2xxxx".to_string()),
+                     EntityTag::new(false, "c3piozzzz".to_string())])));
+        test_header!(test3, vec![b"*"], Some(IfMatch::Any));
     }
 }
 

src/header/common/if_modified_since.rs

@@ -15,6 +15,11 @@ header! {
     #[doc="If-Unmodified-Since = HTTP-date"]
     #[doc="```"]
     (IfModifiedSince, "If-Modified-Since") => [HttpDate]
+
+    test_if_modified_since {
+        // Testcase from RFC
+        test_header!(test1, vec![b"Sat, 29 Oct 1994 19:43:31 GMT"]);
+    }
 }
 
 bench_header!(imf_fixdate, IfModifiedSince, { vec![b"Sun, 07 Nov 1994 08:48:37 GMT".to_vec()] });

src/header/common/if_none_match.rs

@@ -20,6 +20,14 @@ header! {
     #[doc="If-None-Match = \"*\" / 1#entity-tag"]
     #[doc="```"]
     (IfNoneMatch, "If-None-Match") => {Any / (EntityTag)+}
+
+    test_if_none_match {
+        test_header!(test1, vec![b"\"xyzzy\""]);
+        test_header!(test2, vec![b"W/\"xyzzy\""]);
+        test_header!(test3, vec![b"\"xyzzy\", \"r2d2xxxx\", \"c3piozzzz\""]);
+        test_header!(test4, vec![b"W/\"xyzzy\", W/\"r2d2xxxx\", W/\"c3piozzzz\""]);
+        test_header!(test5, vec![b"*"]);
+    }
 }
 
 #[cfg(test)]

src/header/common/if_unmodified_since.rs

@@ -15,6 +15,11 @@ header! {
     #[doc="If-Unmodified-Since = HTTP-date"]
     #[doc="```"]
     (IfUnmodifiedSince, "If-Unmodified-Since") => [HttpDate]
+
+    test_if_unmodified_since {
+        // Testcase from RFC
+        test_header!(test1, vec![b"Sat, 29 Oct 1994 19:43:31 GMT"]);
+    }
 }
 
 bench_header!(imf_fixdate, IfUnmodifiedSince, { vec![b"Sun, 07 Nov 1994 08:48:37 GMT".to_vec()] });

src/header/common/last_modified.rs

@@ -13,6 +13,10 @@ header! {
     #[doc="Expires = HTTP-date"]
     #[doc="```"]
     (LastModified, "Last-Modified") => [HttpDate]
+
+    test_last_modified {
+        // Testcase from RFC
+        test_header!(test1, vec![b"Sat, 29 Oct 1994 19:43:31 GMT"]);}
 }
 
 bench_header!(imf_fixdate, LastModified, { vec![b"Sun, 07 Nov 1994 08:48:37 GMT".to_vec()] });

src/header/common/location.rs

@@ -14,6 +14,12 @@ header! {
     // TODO: Use URL
     (Location, "Location") => [String]
 
+    test_location {
+        // Testcase from RFC
+        test_header!(test1, vec![b"/People.html#tim"]);
+        test_header!(test2, vec![b"http://www.example.net/index.html"]);
+    }
+
 }
 
 bench_header!(bench, Location, { vec![b"http://foo.com/hello:3000".to_vec()] });