Clean up tests with pretty assert

Author: rylev

Cargo.toml

@@ -20,3 +20,4 @@ futures-core-preview = "0.3.0-alpha.18"
 
 [dev-dependencies]
 futures-util = "0.3.0"
+pretty_assertions = "0.6.1"

tests/common/mod.rs

@@ -0,0 +1,34 @@
+use std::{fs::File, path::PathBuf};
+
+#[macro_export]
+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()
+            );
+        })
+    };
+}
+
+pub fn read_fixture(name: &str) -> Vec<u8> {
+    use std::io::Read;
+
+    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 mut result = Vec::<u8>::new();
+    for byte in contents {
+        if byte == 0x0A {
+            result.push(0x0D);
+        }
+        result.push(byte);
+    }
+    result
+}

tests/server.rs

@@ -1,44 +1,20 @@
+mod common;
 use async_h1::{server, Body};
 use async_std::task;
+use common::read_fixture;
 use http::Response;
-use std::{fs::File, io, path::PathBuf};
 
 #[test]
-fn test_keep_alive() {
+fn test_basic_request() {
     let request = read_fixture("request1");
-    let mut actual = Vec::new();
-    let request: &[u8] = &request;
-    let body: &[u8] = "".as_bytes();
-
     let expected = read_fixture("response1");
-    let expected: &[u8] = &expected;
+    let mut actual = Vec::new();
 
-    task::block_on(async {
-        server::connect(request, &mut actual, |req| {
-            async { Ok(Response::new(Body::empty(body))) }
+    assert!(
+        actual,
+        expected,
+        server::connect(&request[..], &mut actual, |_req| {
+            async { Ok(Response::new(Body::empty("".as_bytes()))) }
         })
-        .await
-        .unwrap();
-        assert!(actual == expected);
-    });
-}
-
-fn read_fixture(name: &str) -> Vec<u8> {
-    use std::io::Read;
-
-    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 mut result = Vec::<u8>::new();
-    for byte in contents {
-        if byte == 0x0A {
-            result.push(0x0D);
-        }
-        result.push(byte);
-    }
-    result
+    );
 }