Merge pull request #35 from yoshuawuyts/hex-files

use carriage return in fixtures

Author: rylev

tests/common/mod.rs

@@ -1,12 +1,19 @@
-use std::{fs::File, path::PathBuf};
+use async_std::fs::File;
+use async_std::io::{self, Read, Write};
+use async_std::path::PathBuf;
+use async_std::sync::Arc;
+use async_std::task::{Context, Poll};
+use std::pin::Pin;
 
 #[macro_export]
 macro_rules! assert {
-    ($actual:expr, $expected:expr, $block:expr) => {
+    ($actual:expr, $expected_file:expr, $block:expr) => {
         task::block_on(async {
+            use async_std::io::prelude::*;
             $block.await.unwrap();
             let mut actual = std::string::String::from_utf8($actual).unwrap();
-            let mut expected = std::string::String::from_utf8($expected).unwrap();
+            let mut expected = std::string::String::new();
+            $expected_file.read_to_string(&mut expected).await.unwrap();
             match expected.find("{DATE}") {
                 Some(i) => {
                     expected.replace_range(i..i + 6, "");
@@ -25,22 +32,38 @@ macro_rules! assert {
     };
 }
 
-pub fn read_fixture(name: &str) -> Vec<u8> {
-    use std::io::Read;
-
+pub async fn read_fixture(name: &str) -> TestFile {
     let directory: PathBuf = env!("CARGO_MANIFEST_DIR").into();
     let path: PathBuf = format!("tests/fixtures/{}.txt", name).into();
-    let mut file = File::open(directory.join(path)).expect("Reading fixture file didn't work");
-    let mut contents = Vec::new();
-    file.read_to_end(&mut contents)
-        .expect("Couldn't read fixture files contents");
+    let file = File::open(directory.join(path))
+        .await
+        .expect("Reading fixture file didn't work");
+    TestFile(Arc::new(file))
+}
+
+#[derive(Clone)]
+pub struct TestFile(Arc<File>);
+
+impl Read for TestFile {
+    fn poll_read(
+        self: Pin<&mut Self>,
+        cx: &mut Context,
+        buf: &mut [u8],
+    ) -> Poll<io::Result<usize>> {
+        Pin::new(&mut &*self.0).poll_read(cx, buf)
+    }
+}
+
+impl Write for TestFile {
+    fn poll_write(self: Pin<&mut Self>, cx: &mut Context, buf: &[u8]) -> Poll<io::Result<usize>> {
+        Pin::new(&mut &*self.0).poll_write(cx, buf)
+    }
+
+    fn poll_flush(self: Pin<&mut Self>, cx: &mut Context) -> Poll<io::Result<()>> {
+        Pin::new(&mut &*self.0).poll_flush(cx)
+    }
 
-    let mut result = Vec::<u8>::new();
-    for byte in contents {
-        if byte == 0x0A {
-            result.push(0x0D);
-        }
-        result.push(byte);
+    fn poll_close(self: Pin<&mut Self>, cx: &mut Context) -> Poll<io::Result<()>> {
+        Pin::new(&mut &*self.0).poll_close(cx)
     }
-    result
 }

tests/fixtures/request1.txt

@@ -1,7 +1,7 @@
-POST / HTTP/1.1
-Host: localhost:8080
-User-Agent: curl/7.54.0
-Accept: */*
-Content-Length: 2
-Content-Type: application/x-www-form-urlencoded
-
+POST / HTTP/1.1
+Host: localhost:8080
+User-Agent: curl/7.54.0
+Accept: */*
+Content-Length: 2
+Content-Type: application/x-www-form-urlencoded
+

tests/fixtures/response1.txt

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

tests/server.rs

@@ -1,26 +1,27 @@
 mod common;
 use async_h1::server;
-use async_std::io::Cursor;
 use async_std::task;
 use common::read_fixture;
 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";
+    task::block_on(async {
+        let request = read_fixture("request1").await;
+        let mut expected = read_fixture("response1").await;
+        let mut actual = Vec::new();
+        let addr = "http://example.com";
 
-    assert!(
-        actual,
-        expected,
-        server::accept(addr, Cursor::new(request), &mut actual, |_req| {
-            async {
-                let mut resp = Response::new(StatusCode::Ok);
-                resp.set_body("");
-                Ok(resp)
-            }
-        })
-    );
+        assert!(
+            actual,
+            expected,
+            server::accept(addr, request.clone(), &mut actual, |_req| {
+                async {
+                    let mut resp = Response::new(StatusCode::Ok);
+                    resp.set_body("");
+                    Ok(resp)
+                }
+           })
+        );
+    })
 }