chore(test): Move integration test for tonic-web to tests directory (#…

…1927)
hyperium · Sep 20, 2024 · 99b663e · 99b663e
1 parent ffd7794
commit 99b663e
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,7 +22,7 @@ members = [
   "tests/stream_conflict",
   "tests/root-crate-path",
   "tests/compression",
-  "tonic-web/tests/integration",
+  "tests/web",
   "tests/service_named_result",
   "tests/use_arc_self",
   "tests/default_stubs",

diff --git a/tonic-web/tests/integration/Cargo.toml → tests/web/Cargo.toml b/tonic-web/tests/integration/Cargo.toml → tests/web/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Juan Alvarez <j@yabit.io>"]
 edition = "2021"
-name = "integration"
+name = "test_web"
 publish = false
 version = "0.1.0"
 license = "MIT"
@@ -16,10 +16,10 @@ hyper-util = "0.1"
 prost = "0.13"
 tokio = { version = "1", features = ["macros", "rt", "net"] }
 tokio-stream = { version = "0.1", features = ["net"] }
-tonic = { path = "../../../tonic" }
+tonic = { path = "../../tonic" }
 
 [dev-dependencies]
-tonic-web = { path = "../../../tonic-web" }
+tonic-web = { path = "../../tonic-web" }
 
 [build-dependencies]
-tonic-build = { path = "../../../tonic-build" }
+tonic-build = { path = "../../tonic-build" }
diff --git a/tonic-web/tests/integration/LICENSE → tests/web/LICENSE b/tonic-web/tests/integration/LICENSE → tests/web/LICENSE
diff --git a/tonic-web/tests/integration/build.rs → tests/web/build.rs b/tonic-web/tests/integration/build.rs → tests/web/build.rs
diff --git a/tonic-web/tests/integration/proto/test.proto → tests/web/proto/test.proto b/tonic-web/tests/integration/proto/test.proto → tests/web/proto/test.proto
diff --git a/tonic-web/tests/integration/src/lib.rs → tests/web/src/lib.rs b/tonic-web/tests/integration/src/lib.rs → tests/web/src/lib.rs
diff --git a/tonic-web/tests/integration/tests/grpc.rs → tests/web/tests/grpc.rs b/tonic-web/tests/integration/tests/grpc.rs → tests/web/tests/grpc.rs
@@ -9,8 +9,8 @@ use tokio_stream::{self as stream, StreamExt};
 use tonic::transport::{Channel, Error, Server};
 use tonic::{Response, Streaming};
 
-use integration::pb::{test_client::TestClient, test_server::TestServer, Input};
-use integration::Svc;
+use test_web::pb::{test_client::TestClient, test_server::TestServer, Input};
+use test_web::Svc;
 use tonic_web::GrpcWebLayer;
 
 #[tokio::test]

diff --git a/...c-web/tests/integration/tests/grpc_web.rs → tests/web/tests/grpc_web.rs b/...c-web/tests/integration/tests/grpc_web.rs → tests/web/tests/grpc_web.rs
@@ -14,8 +14,8 @@ use tokio_stream::wrappers::TcpListenerStream;
 use tonic::body::BoxBody;
 use tonic::transport::Server;
 
-use integration::pb::{test_server::TestServer, Input, Output};
-use integration::Svc;
+use test_web::pb::{test_server::TestServer, Input, Output};
+use test_web::Svc;
 use tonic::Status;
 use tonic_web::GrpcWebLayer;
 
@@ -117,7 +117,7 @@ fn build_request(base_uri: String, content_type: &str, accept: &str) -> Request<
 
     let bytes = match content_type {
         "grpc-web" => encode_body(),
-        "grpc-web-text" => integration::util::base64::STANDARD
+        "grpc-web-text" => test_web::util::base64::STANDARD
             .encode(encode_body())
             .into(),
         _ => panic!("invalid content type {}", content_type),
@@ -139,7 +139,7 @@ async fn decode_body(body: Incoming, content_type: &str) -> (Output, Bytes) {
     let mut body = body.collect().await.unwrap().to_bytes();
 
     if content_type == "application/grpc-web-text+proto" {
-        body = integration::util::base64::STANDARD
+        body = test_web::util::base64::STANDARD
             .decode(body)
             .unwrap()
             .into()