Merge pull request #90 from http-rs/zero-test

create a long chunked test

Author: yoshuawuyts

Cargo.toml

@@ -26,3 +26,4 @@ log = "0.4"
 pretty_assertions = "0.6.1"
 async-std = { version = "1.4.0", features = ["unstable", "attributes"] }
 tempfile = "3.1.0"
+async-test = "1.0.0"

src/server/encode.rs

@@ -225,12 +225,14 @@ impl Read for Encoder {
         // we keep track how many bytes of the head and body we've read
         // in this call of `poll_read`
         self.bytes_read = 0;
-        match self.state {
+        let res = match self.state {
             EncoderState::Start => self.encode_start(cx, buf),
             EncoderState::Head => self.encode_head(cx, buf),
             EncoderState::FixedBody => self.encode_fixed_body(cx, buf),
             EncoderState::ChunkedBody => self.encode_chunked_body(cx, buf),
             EncoderState::Done => Poll::Ready(Ok(0)),
-        }
+        };
+        // dbg!(String::from_utf8(buf[..self.bytes_read].to_vec()).unwrap());
+        res
     }
 }

tests/common/mod.rs

@@ -71,6 +71,7 @@ impl TestCase {
         }
     }
 
+    #[allow(dead_code)]
     pub async fn read_result(&self) -> String {
         use async_std::prelude::*;
         let mut result = String::new();
@@ -80,6 +81,7 @@ impl TestCase {
         result
     }
 
+    #[allow(dead_code)]
     pub async fn read_expected(&self) -> String {
         use async_std::prelude::*;
         let mut expected = std::string::String::new();
@@ -92,15 +94,16 @@ impl TestCase {
         expected
     }
 
+    #[allow(dead_code)]
     pub(crate) async fn assert(self) {
         let mut actual = self.read_result().await;
         let mut expected = self.read_expected().await;
         assert!(!actual.is_empty(), "Received empty reply");
         assert!(!expected.is_empty(), "Missing expected fixture");
 
         // munge actual and expected so that we don't rely on dates matching exactly
-        munge_date(&mut expected, &mut actual);
-        pretty_assertions::assert_eq!(expected, actual);
+        munge_date(&mut actual, &mut expected);
+        pretty_assertions::assert_eq!(actual, expected);
     }
 }
 
@@ -109,14 +112,16 @@ pub(crate) fn fixture_path(relative_path: &str) -> PathBuf {
     directory.join("tests").join(relative_path)
 }
 
-pub(crate) fn munge_date(expected: &mut String, actual: &mut String) {
+pub(crate) fn munge_date(actual: &mut String, expected: &mut String) {
     if let Some(i) = expected.find("{DATE}") {
         match actual.find("date: ") {
             Some(j) => {
                 let eol = actual[j + 6..].find("\r\n").expect("missing eol");
                 expected.replace_range(i..i + 6, &actual[j + 6..j + 6 + eol]);
             }
-            None => expected.replace_range(i..i + 6, ""),
+            None => {
+                expected.replace_range(i..i + 6, "");
+            }
         }
     }
 }