From d4973642da5a922fa23d50c6f2846805e4942197 Mon Sep 17 00:00:00 2001 From: Lucio Franco Date: Tue, 22 Feb 2022 16:21:39 -0500 Subject: [PATCH] chore: Remove MockStream (#923) --- tests/compression/src/bidirectional_stream.rs | 4 +- tests/compression/src/client_stream.rs | 16 ++------ tests/compression/src/compressing_request.rs | 12 ++---- tests/compression/src/compressing_response.rs | 28 ++++--------- tests/compression/src/lib.rs | 2 +- tests/compression/src/server_stream.rs | 12 ++---- tests/compression/src/util.rs | 39 +------------------ 7 files changed, 20 insertions(+), 93 deletions(-) diff --git a/tests/compression/src/bidirectional_stream.rs b/tests/compression/src/bidirectional_stream.rs index 53dc833..55461cd 100644 --- a/tests/compression/src/bidirectional_stream.rs +++ b/tests/compression/src/bidirectional_stream.rs @@ -36,9 +36,7 @@ async fn client_enabled_server_enabled() { .into_inner(), ) .add_service(svc) - .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( - MockStream(server), - )])) + .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)])) .await .unwrap(); } diff --git a/tests/compression/src/client_stream.rs b/tests/compression/src/client_stream.rs index 620f917..e8ad6da 100644 --- a/tests/compression/src/client_stream.rs +++ b/tests/compression/src/client_stream.rs @@ -27,9 +27,7 @@ async fn client_enabled_server_enabled() { .into_inner(), ) .add_service(svc) - .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( - MockStream(server), - )])) + .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)])) .await .unwrap(); } @@ -73,9 +71,7 @@ async fn client_disabled_server_enabled() { .into_inner(), ) .add_service(svc) - .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( - MockStream(server), - )])) + .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)])) .await .unwrap(); } @@ -102,9 +98,7 @@ async fn client_enabled_server_disabled() { tokio::spawn(async move { Server::builder() .add_service(svc) - .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( - MockStream(server), - )])) + .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)])) .await .unwrap(); }); @@ -147,9 +141,7 @@ async fn compressing_response_from_client_stream() { .into_inner(), ) .add_service(svc) - .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( - MockStream(server), - )])) + .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)])) .await .unwrap(); } diff --git a/tests/compression/src/compressing_request.rs b/tests/compression/src/compressing_request.rs index eb81ccb..a535294 100644 --- a/tests/compression/src/compressing_request.rs +++ b/tests/compression/src/compressing_request.rs @@ -29,9 +29,7 @@ async fn client_enabled_server_enabled() { .into_inner(), ) .add_service(svc) - .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( - MockStream(server), - )])) + .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)])) .await .unwrap(); } @@ -60,9 +58,7 @@ async fn client_enabled_server_disabled() { tokio::spawn(async move { Server::builder() .add_service(svc) - .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( - MockStream(server), - )])) + .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)])) .await .unwrap(); }); @@ -98,9 +94,7 @@ async fn client_mark_compressed_without_header_server_enabled() { async move { Server::builder() .add_service(svc) - .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( - MockStream(server), - )])) + .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)])) .await .unwrap(); } diff --git a/tests/compression/src/compressing_response.rs b/tests/compression/src/compressing_response.rs index e60903d..28674a5 100644 --- a/tests/compression/src/compressing_response.rs +++ b/tests/compression/src/compressing_response.rs @@ -51,9 +51,7 @@ async fn client_enabled_server_enabled() { .into_inner(), ) .add_service(svc) - .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( - MockStream(server), - )])) + .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)])) .await .unwrap(); } @@ -93,9 +91,7 @@ async fn client_enabled_server_disabled() { .into_inner(), ) .add_service(svc) - .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( - MockStream(server), - )])) + .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)])) .await .unwrap(); } @@ -159,9 +155,7 @@ async fn client_disabled() { .into_inner(), ) .add_service(svc) - .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( - MockStream(server), - )])) + .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)])) .await .unwrap(); } @@ -198,9 +192,7 @@ async fn server_replying_with_unsupported_encoding() { .into_inner(), ) .add_service(svc) - .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( - MockStream(server), - )])) + .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)])) .await .unwrap(); }); @@ -241,9 +233,7 @@ async fn disabling_compression_on_single_response() { .into_inner(), ) .add_service(svc) - .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( - MockStream(server), - )])) + .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)])) .await .unwrap(); } @@ -283,9 +273,7 @@ async fn disabling_compression_on_response_but_keeping_compression_on_stream() { .into_inner(), ) .add_service(svc) - .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( - MockStream(server), - )])) + .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)])) .await .unwrap(); } @@ -340,9 +328,7 @@ async fn disabling_compression_on_response_from_client_stream() { .into_inner(), ) .add_service(svc) - .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( - MockStream(server), - )])) + .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)])) .await .unwrap(); } diff --git a/tests/compression/src/lib.rs b/tests/compression/src/lib.rs index de806b5..87e0544 100644 --- a/tests/compression/src/lib.rs +++ b/tests/compression/src/lib.rs @@ -1,7 +1,7 @@ #![allow(unused_imports)] use self::util::*; -use crate::util::{mock_io_channel, MockStream}; +use crate::util::mock_io_channel; use futures::{Stream, StreamExt}; use std::convert::TryFrom; use std::{ diff --git a/tests/compression/src/server_stream.rs b/tests/compression/src/server_stream.rs index 2d302bf..3d82cff 100644 --- a/tests/compression/src/server_stream.rs +++ b/tests/compression/src/server_stream.rs @@ -24,9 +24,7 @@ async fn client_enabled_server_enabled() { .into_inner(), ) .add_service(svc) - .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( - MockStream(server), - )])) + .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)])) .await .unwrap(); } @@ -78,9 +76,7 @@ async fn client_disabled_server_enabled() { .into_inner(), ) .add_service(svc) - .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( - MockStream(server), - )])) + .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)])) .await .unwrap(); } @@ -125,9 +121,7 @@ async fn client_enabled_server_disabled() { .into_inner(), ) .add_service(svc) - .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>( - MockStream(server), - )])) + .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)])) .await .unwrap(); } diff --git a/tests/compression/src/util.rs b/tests/compression/src/util.rs index 75df07f..34fdc0f 100644 --- a/tests/compression/src/util.rs +++ b/tests/compression/src/util.rs @@ -87,43 +87,6 @@ pub fn measure_request_body_size_layer( }) } -#[derive(Debug)] -pub struct MockStream(pub tokio::io::DuplexStream); - -impl Connected for MockStream { - type ConnectInfo = (); - - fn connect_info(&self) -> Self::ConnectInfo {} -} - -impl AsyncRead for MockStream { - fn poll_read( - mut self: Pin<&mut Self>, - cx: &mut Context<'_>, - buf: &mut ReadBuf<'_>, - ) -> Poll> { - Pin::new(&mut self.0).poll_read(cx, buf) - } -} - -impl AsyncWrite for MockStream { - fn poll_write( - mut self: Pin<&mut Self>, - cx: &mut Context<'_>, - buf: &[u8], - ) -> Poll> { - Pin::new(&mut self.0).poll_write(cx, buf) - } - - fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { - Pin::new(&mut self.0).poll_flush(cx) - } - - fn poll_shutdown(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll> { - Pin::new(&mut self.0).poll_shutdown(cx) - } -} - #[allow(dead_code)] pub async fn mock_io_channel(client: tokio::io::DuplexStream) -> Channel { let mut client = Some(client); @@ -132,7 +95,7 @@ pub async fn mock_io_channel(client: tokio::io::DuplexStream) -> Channel { .unwrap() .connect_with_connector(service_fn(move |_: Uri| { let client = client.take().unwrap(); - async move { Ok::<_, std::io::Error>(MockStream(client)) } + async move { Ok::<_, std::io::Error>(client) } })) .await .unwrap()