diff --git a/ntex/src/http/body.rs b/ntex/src/http/body.rs index 4b3e0f8e..ad0e12e2 100644 --- a/ntex/src/http/body.rs +++ b/ntex/src/http/body.rs @@ -79,20 +79,6 @@ impl ResponseBody { ResponseBody::Other(b) => ResponseBody::Other(b), } } - - #[cfg(test)] - pub(crate) fn bin_ref(&self) -> &[u8] { - match self { - ResponseBody::Body(ref b) => match b { - Body::Bytes(ref bin) => &bin, - _ => panic!(), - }, - ResponseBody::Other(ref b) => match b { - Body::Bytes(ref bin) => &bin, - _ => panic!(), - }, - } - } } impl From for ResponseBody { @@ -544,6 +530,10 @@ mod tests { poll_fn(|cx| "test".poll_next_chunk(cx)).await.unwrap().ok(), Some(Bytes::from("test")) ); + assert_eq!( + poll_fn(|cx| "test".poll_next_chunk(cx)).await.unwrap().ok(), + Some(Bytes::from("test")) + ); } #[ntex_rt::test] @@ -579,6 +569,13 @@ mod tests { .ok(), Some(Bytes::from("test")) ); + assert_eq!( + poll_fn(|cx| Vec::from("test").poll_next_chunk(cx)) + .await + .unwrap() + .ok(), + Some(Bytes::from("test")) + ); } #[ntex_rt::test] @@ -592,6 +589,7 @@ mod tests { poll_fn(|cx| b.poll_next_chunk(cx)).await.unwrap().ok(), Some(Bytes::from("test")) ); + assert!(poll_fn(|cx| b.poll_next_chunk(cx)).await.is_none(),); } #[ntex_rt::test] @@ -605,6 +603,7 @@ mod tests { poll_fn(|cx| b.poll_next_chunk(cx)).await.unwrap().ok(), Some(Bytes::from("test")) ); + assert!(poll_fn(|cx| b.poll_next_chunk(cx)).await.is_none(),); } #[ntex_rt::test] @@ -620,6 +619,7 @@ mod tests { poll_fn(|cx| b.poll_next_chunk(cx)).await.unwrap().ok(), Some(Bytes::from("test")) ); + assert!(poll_fn(|cx| b.poll_next_chunk(cx)).await.is_none(),); } #[ntex_rt::test] diff --git a/ntex/src/http/error.rs b/ntex/src/http/error.rs index 4ec2a5c4..d52567e4 100644 --- a/ntex/src/http/error.rs +++ b/ntex/src/http/error.rs @@ -4,7 +4,6 @@ use std::str::Utf8Error; use std::string::FromUtf8Error; use std::{fmt, io}; -use derive_more::{Display, From}; use http::uri::InvalidUri; use http::{header, StatusCode}; @@ -67,7 +66,7 @@ where } /// A set of errors that can occur during parsing HTTP streams -#[derive(Debug, Display)] +#[derive(Debug, Display, From)] pub enum ParseError { /// An invalid `Method`, such as `GE.T`. #[display(fmt = "Invalid Method specified")] @@ -107,24 +106,6 @@ pub enum ParseError { impl std::error::Error for ParseError {} -impl From for ParseError { - fn from(err: io::Error) -> ParseError { - ParseError::Io(err) - } -} - -impl From for ParseError { - fn from(err: InvalidUri) -> ParseError { - ParseError::Uri(err) - } -} - -impl From for ParseError { - fn from(err: Utf8Error) -> ParseError { - ParseError::Utf8(err) - } -} - impl From for ParseError { fn from(err: FromUtf8Error) -> ParseError { ParseError::Utf8(err.utf8_error()) diff --git a/ntex/src/lib.rs b/ntex/src/lib.rs index f8389fe5..edb6ef26 100644 --- a/ntex/src/lib.rs +++ b/ntex/src/lib.rs @@ -24,6 +24,8 @@ #[macro_use] extern crate log; +#[macro_use] +extern crate derive_more; pub use ntex_rt_macros::{main, test}; diff --git a/ntex/src/web/responder.rs b/ntex/src/web/responder.rs index 7f38d04d..c979d8f6 100644 --- a/ntex/src/web/responder.rs +++ b/ntex/src/web/responder.rs @@ -467,7 +467,7 @@ pub(crate) mod tests { let resp: HttpResponse = responder("test").respond_to(&req).await; assert_eq!(resp.status(), StatusCode::OK); - assert_eq!(resp.body().bin_ref(), b"test"); + assert_eq!(resp.body().get_ref(), b"test"); assert_eq!( resp.headers().get(CONTENT_TYPE).unwrap(), HeaderValue::from_static("text/plain; charset=utf-8") @@ -475,7 +475,7 @@ pub(crate) mod tests { let resp: HttpResponse = responder(&b"test"[..]).respond_to(&req).await; assert_eq!(resp.status(), StatusCode::OK); - assert_eq!(resp.body().bin_ref(), b"test"); + assert_eq!(resp.body().get_ref(), b"test"); assert_eq!( resp.headers().get(CONTENT_TYPE).unwrap(), HeaderValue::from_static("application/octet-stream") @@ -483,7 +483,7 @@ pub(crate) mod tests { let resp: HttpResponse = responder("test".to_string()).respond_to(&req).await; assert_eq!(resp.status(), StatusCode::OK); - assert_eq!(resp.body().bin_ref(), b"test"); + assert_eq!(resp.body().get_ref(), b"test"); assert_eq!( resp.headers().get(CONTENT_TYPE).unwrap(), HeaderValue::from_static("text/plain; charset=utf-8") @@ -491,7 +491,7 @@ pub(crate) mod tests { let resp: HttpResponse = responder(&"test".to_string()).respond_to(&req).await; assert_eq!(resp.status(), StatusCode::OK); - assert_eq!(resp.body().bin_ref(), b"test"); + assert_eq!(resp.body().get_ref(), b"test"); assert_eq!( resp.headers().get(CONTENT_TYPE).unwrap(), HeaderValue::from_static("text/plain; charset=utf-8") @@ -501,7 +501,7 @@ pub(crate) mod tests { .respond_to(&req) .await; assert_eq!(resp.status(), StatusCode::OK); - assert_eq!(resp.body().bin_ref(), b"test"); + assert_eq!(resp.body().get_ref(), b"test"); assert_eq!( resp.headers().get(CONTENT_TYPE).unwrap(), HeaderValue::from_static("application/octet-stream") @@ -511,7 +511,7 @@ pub(crate) mod tests { .respond_to(&req) .await; assert_eq!(resp.status(), StatusCode::OK); - assert_eq!(resp.body().bin_ref(), b"test"); + assert_eq!(resp.body().get_ref(), b"test"); assert_eq!( resp.headers().get(CONTENT_TYPE).unwrap(), HeaderValue::from_static("application/octet-stream") @@ -536,7 +536,7 @@ pub(crate) mod tests { ) .await; assert_eq!(resp.status(), StatusCode::OK); - assert_eq!(resp.body().bin_ref(), b"test"); + assert_eq!(resp.body().get_ref(), b"test"); assert_eq!( resp.headers().get(CONTENT_TYPE).unwrap(), HeaderValue::from_static("text/plain; charset=utf-8") @@ -559,7 +559,7 @@ pub(crate) mod tests { .respond_to(&req) .await; assert_eq!(res.status(), StatusCode::BAD_REQUEST); - assert_eq!(res.body().bin_ref(), b"test"); + assert_eq!(res.body().get_ref(), b"test"); let res = responder("test".to_string()) .with_header("content-type", "json") @@ -567,7 +567,7 @@ pub(crate) mod tests { .await; assert_eq!(res.status(), StatusCode::OK); - assert_eq!(res.body().bin_ref(), b"test"); + assert_eq!(res.body().get_ref(), b"test"); assert_eq!( res.headers().get(CONTENT_TYPE).unwrap(), HeaderValue::from_static("json") @@ -583,7 +583,7 @@ pub(crate) mod tests { ) .await; assert_eq!(res.status(), StatusCode::BAD_REQUEST); - assert_eq!(res.body().bin_ref(), b"test"); + assert_eq!(res.body().get_ref(), b"test"); let req = TestRequest::default().to_http_request(); let res = CustomResponder::<_, DefaultError>::new(( @@ -594,7 +594,7 @@ pub(crate) mod tests { .respond_to(&req) .await; assert_eq!(res.status(), StatusCode::OK); - assert_eq!(res.body().bin_ref(), b"test"); + assert_eq!(res.body().get_ref(), b"test"); assert_eq!( res.headers().get(CONTENT_TYPE).unwrap(), HeaderValue::from_static("json") diff --git a/ntex/src/web/types/form.rs b/ntex/src/web/types/form.rs index 766f8ce4..6d7c847c 100644 --- a/ntex/src/web/types/form.rs +++ b/ntex/src/web/types/form.rs @@ -491,6 +491,6 @@ mod tests { HeaderValue::from_static("application/x-www-form-urlencoded") ); - assert_eq!(resp.body().bin_ref(), b"hello=world&counter=123"); + assert_eq!(resp.body().get_ref(), b"hello=world&counter=123"); } } diff --git a/ntex/src/web/types/json.rs b/ntex/src/web/types/json.rs index a98de727..f90f2110 100644 --- a/ntex/src/web/types/json.rs +++ b/ntex/src/web/types/json.rs @@ -438,7 +438,7 @@ mod tests { header::HeaderValue::from_static("application/json") ); - assert_eq!(resp.body().bin_ref(), b"{\"name\":\"test\"}"); + assert_eq!(resp.body().get_ref(), b"{\"name\":\"test\"}"); } #[ntex_rt::test]