Skip to content

Commit 5a8eaa4

Browse files
committed
conduit-test: Remove RequestExt implementation for MockRequest
1 parent e556631 commit 5a8eaa4

File tree

1 file changed

+3
-34
lines changed

1 file changed

+3
-34
lines changed

conduit-test/src/lib.rs

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use bytes::Bytes;
22
use hyper::Request;
3-
use std::io::{Cursor, Read};
3+
use std::io::Cursor;
44

55
use conduit::{
66
header::{HeaderValue, IntoHeaderName},
7-
Extensions, HeaderMap, Method, Uri,
7+
Method,
88
};
99

1010
pub struct MockRequest {
@@ -42,35 +42,6 @@ impl MockRequest {
4242
}
4343
}
4444

45-
impl conduit::RequestExt for MockRequest {
46-
fn method(&self) -> &Method {
47-
self.request.method()
48-
}
49-
50-
fn uri(&self) -> &Uri {
51-
self.request.uri()
52-
}
53-
54-
fn content_length(&self) -> Option<u64> {
55-
Some(self.request.body().get_ref().len() as u64)
56-
}
57-
58-
fn headers(&self) -> &HeaderMap {
59-
self.request.headers()
60-
}
61-
62-
fn body(&mut self) -> &mut dyn Read {
63-
self.request.body_mut()
64-
}
65-
66-
fn extensions(&self) -> &Extensions {
67-
self.request.extensions()
68-
}
69-
fn extensions_mut(&mut self) -> &mut Extensions {
70-
self.request.extensions_mut()
71-
}
72-
}
73-
7445
impl From<MockRequest> for Request<hyper::Body> {
7546
fn from(mock_request: MockRequest) -> Self {
7647
let (parts, body) = mock_request.request.into_parts();
@@ -82,15 +53,14 @@ impl From<MockRequest> for Request<hyper::Body> {
8253
mod tests {
8354
use super::MockRequest;
8455

85-
use conduit::{header, Method, RequestExt};
56+
use conduit::{header, Method};
8657

8758
#[test]
8859
fn simple_request_test() {
8960
let req = MockRequest::new(Method::GET, "/").into_inner();
9061

9162
assert_eq!(req.method(), Method::GET);
9263
assert_eq!(req.uri(), "/");
93-
assert_eq!(req.content_length(), Some(0));
9464
assert_eq!(req.headers().len(), 0);
9565
assert_eq!(req.body().get_ref(), "");
9666
}
@@ -104,7 +74,6 @@ mod tests {
10474
assert_eq!(req.method(), Method::POST);
10575
assert_eq!(req.uri(), "/articles");
10676
assert_eq!(req.body().get_ref(), "Hello world");
107-
assert_eq!(req.content_length(), Some(11));
10877
}
10978

11079
#[test]

0 commit comments

Comments
 (0)