Merge pull request #27 from yoshuawuyts/fix-tests

Fix tests

Author: yoshuawuyts

tests/common/mod.rs

@@ -5,10 +5,22 @@ macro_rules! assert {
     ($actual:expr, $expected:expr, $block:expr) => {
         task::block_on(async {
             $block.await.unwrap();
-            pretty_assertions::assert_eq!(
-                std::str::from_utf8(&$actual).unwrap(),
-                std::str::from_utf8(&$expected).unwrap()
-            );
+            let mut actual = std::string::String::from_utf8($actual).unwrap();
+            let mut expected = std::string::String::from_utf8($expected).unwrap();
+            match expected.find("{DATE}") {
+                Some(i) => {
+                    expected.replace_range(i..i + 6, "");
+                    match expected.get(i..i + 1) {
+                        Some(byte) => {
+                            let j = actual[i..].find(byte).expect("Byte not found");
+                            actual.replace_range(i..i + j, "");
+                        }
+                        None => expected.replace_range(i.., ""),
+                    }
+                }
+                None => {}
+            }
+            pretty_assertions::assert_eq!(actual, expected);
         })
     };
 }

tests/fixtures/response1.txt

@@ -1,3 +1,5 @@
 HTTP/1.1 200 OK
 Content-Length: 0
+Date: {DATE}
+Content-Type: text/plain; charset=utf-8
 

tests/server.rs

@@ -1,20 +1,22 @@
 mod common;
-use async_h1::{server, Body};
+use async_h1::server;
+use async_std::io::Cursor;
 use async_std::task;
 use common::read_fixture;
-use http::Response;
+use http_types::{Response, StatusCode};
 
 #[test]
 fn test_basic_request() {
     let request = read_fixture("request1");
     let expected = read_fixture("response1");
     let mut actual = Vec::new();
+    let addr = "http://example.com";
 
     assert!(
         actual,
         expected,
-        server::connect(&request[..], &mut actual, |_req| {
-            async { Ok(Response::new(Body::empty("".as_bytes()))) }
+        server::accept(addr, Cursor::new(request), &mut actual, |_req| {
+            async { Ok(Response::new(StatusCode::Ok).set_body_string("".to_owned())?) }
         })
     );
 }