chore(test): Refactor default stubs test

Author: tottoto

tests/default_stubs/Cargo.toml

@@ -7,8 +7,10 @@ name = "default_stubs"
 [dependencies]
 tokio = {version = "1.0", features = ["macros", "rt-multi-thread", "net"]}
 tokio-stream = {version = "0.1", features = ["net"]}
-rand = "0.9"
 tonic = {path = "../../tonic"}
 
+[dev-dependencies]
+rand = "0.9"
+
 [build-dependencies]
 tonic-build = {path = "../../tonic-build" }

tests/default_stubs/src/lib.rs

@@ -1,16 +1,12 @@
-#![allow(unused_imports)]
-
-mod test_defaults;
-
 use std::pin::Pin;
-use tokio_stream::{Stream, StreamExt};
+use tokio_stream::Stream;
 use tonic::{Request, Response, Status, Streaming};
 
 tonic::include_proto!("test");
 tonic::include_proto!("test_default");
 
 #[derive(Debug, Default)]
-struct Svc;
+pub struct Svc;
 
 #[tonic::async_trait]
 impl test_server::Test for Svc {

tests/default_stubs/src/test_defaults.rs renamed to tests/default_stubs/tests/default.rs

@@ -1,21 +1,17 @@
-#![allow(unused_imports)]
-
-use crate::test_client::TestClient;
-use crate::*;
-use rand::Rng as _;
+use default_stubs::test_client::TestClient;
+use default_stubs::*;
 use std::env;
 use std::fs;
 use std::net::SocketAddr;
 use tokio::net::TcpListener;
+use tokio_stream::{Stream, StreamExt};
 use tonic::transport::Channel;
 use tonic::transport::Server;
 
-#[cfg(test)]
 fn echo_requests_iter() -> impl Stream<Item = ()> {
     tokio_stream::iter(1..usize::MAX).map(|_| ())
 }
 
-#[cfg(test)]
 async fn test_default_stubs(
     mut client: TestClient<Channel>,
     mut client_default_stubs: TestClient<Channel>,
@@ -100,7 +96,6 @@ async fn test_default_stubs_uds() {
     test_default_stubs(client, client_default_stubs).await;
 }
 
-#[cfg(test)]
 async fn run_services_in_background() -> (SocketAddr, SocketAddr) {
     let svc = test_server::TestServer::new(Svc {});
     let svc_default_stubs = test_default_server::TestDefaultServer::new(Svc {});
@@ -132,8 +127,9 @@ async fn run_services_in_background() -> (SocketAddr, SocketAddr) {
     (addr, addr_default_stubs)
 }
 
-#[cfg(all(test, not(target_os = "windows")))]
+#[cfg(not(target_os = "windows"))]
 async fn run_services_in_background_uds() -> (String, String) {
+    use rand::Rng as _;
     use tokio::net::UnixListener;
 
     let svc = test_server::TestServer::new(Svc {});