berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix tests to fail on previous implementation

This commit is contained in:
tyranron 2020-01-23 17:44:49 +01:00
parent a39910fec7
commit cd70e67e79
No known key found for this signature in database
GPG Key ID: 762E144FB230A4F0
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
actix-http/src/body.rs
View File

@ -451,7 +451,6 @@ where
#[cfg(test)]
mod tests {
use super::*;
use bytes::BufMut;
use futures::stream;
use futures_util::future::poll_fn;
@ -613,12 +612,19 @@ mod tests {
#[actix_rt::test]
async fn skips_empty_chunks() {
let body = BodyStream::new(stream::iter(
let mut body = BodyStream::new(stream::iter(
["1", "", "2"]
.iter()
.map(|&v| Ok(Bytes::from(v)) as Result<Bytes, ()>),
));
assert_eq!(read_all(body).await.unwrap(), Bytes::from("12"));
assert_eq!(
poll_fn(|cx| body.poll_next(cx)).await.unwrap().ok(),
Some(Bytes::from("1")),
);
assert_eq!(
poll_fn(|cx| body.poll_next(cx)).await.unwrap().ok(),
Some(Bytes::from("2")),
);
}
}
@ -627,25 +633,18 @@ mod tests {
#[actix_rt::test]
async fn skips_empty_chunks() {
let body = SizedStream::new(
let mut body = SizedStream::new(
2,
stream::iter(
["1", "", "2"]
.iter()
.map(|&v| Ok(Bytes::from(v))),
),
stream::iter(["1", "", "2"].iter().map(|&v| Ok(Bytes::from(v)))),
);
assert_eq!(
poll_fn(|cx| body.poll_next(cx)).await.unwrap().ok(),
Some(Bytes::from("1")),
);
assert_eq!(
poll_fn(|cx| body.poll_next(cx)).await.unwrap().ok(),
Some(Bytes::from("2")),
);
assert_eq!(read_all(body).await.unwrap(), Bytes::from("12"));
}
}
async fn read_all<B: MessageBody>(mut body: B) -> Result<Bytes, Error> {
use futures::StreamExt as _;
let mut bytes = BytesMut::new();
while let Some(b) = stream::poll_fn(|cx| body.poll_next(cx)).next().await {
bytes.put(b?);
}
Ok(bytes.freeze())
}
}