summaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
author魏曹先生 <1992414357@qq.com>2025-09-26 17:38:54 +0800
committer魏曹先生 <1992414357@qq.com>2025-09-26 17:39:36 +0800
commit4951e2e98bab7a2996893939ee77f0279145b556 (patch)
tree78138b8564d132edba20226a7522532746bfb79e /crates
parente8160eda1b68a42b8d861bbec5e9c1dc555ea783 (diff)
refactor: downgrade tcp_connection functionality to test utilities
- Remove handle, target, target_configure, target_connection modules from main library - Create test_utils module in test project to contain temporary connection functionality - Update import paths in test files - Keep instance and error modules as core functionality - Adjust vcs_test configurations to adapt to new test structure
Diffstat (limited to 'crates')
-rw-r--r--crates/utils/tcp_connection/src/lib.rs6
-rw-r--r--crates/utils/tcp_connection/tcp_connection_test/src/lib.rs3
-rw-r--r--crates/utils/tcp_connection/tcp_connection_test/src/test_challenge.rs13
-rw-r--r--crates/utils/tcp_connection/tcp_connection_test/src/test_connection.rs7
-rw-r--r--crates/utils/tcp_connection/tcp_connection_test/src/test_file_transfer.rs13
-rw-r--r--crates/utils/tcp_connection/tcp_connection_test/src/test_msgpack.rs7
-rw-r--r--crates/utils/tcp_connection/tcp_connection_test/src/test_tcp_target_build.rs7
-rw-r--r--crates/utils/tcp_connection/tcp_connection_test/src/test_utils.rs4
-rw-r--r--crates/utils/tcp_connection/tcp_connection_test/src/test_utils/handle.rs (renamed from crates/utils/tcp_connection/src/handle.rs)3
-rw-r--r--crates/utils/tcp_connection/tcp_connection_test/src/test_utils/target.rs (renamed from crates/utils/tcp_connection/src/target.rs)7
-rw-r--r--crates/utils/tcp_connection/tcp_connection_test/src/test_utils/target_configure.rs (renamed from crates/utils/tcp_connection/src/target_configure.rs)0
-rw-r--r--crates/utils/tcp_connection/tcp_connection_test/src/test_utils/target_connection.rs (renamed from crates/utils/tcp_connection/src/target_connection.rs)5
-rw-r--r--crates/vcs/src/service/standard_handle.rs15
-rw-r--r--crates/vcs/vcs_test/Cargo.toml1
-rw-r--r--crates/vcs/vcs_test/src/test_virtual_file_creation_and_update.rs2
15 files changed, 44 insertions, 49 deletions
diff --git a/crates/utils/tcp_connection/src/lib.rs b/crates/utils/tcp_connection/src/lib.rs
index 928457b..a5b5c20 100644
--- a/crates/utils/tcp_connection/src/lib.rs
+++ b/crates/utils/tcp_connection/src/lib.rs
@@ -1,10 +1,4 @@
-pub mod target;
-pub mod target_configure;
-pub mod target_connection;
-
#[allow(dead_code)]
pub mod instance;
-pub mod handle;
-
pub mod error;
diff --git a/crates/utils/tcp_connection/tcp_connection_test/src/lib.rs b/crates/utils/tcp_connection/tcp_connection_test/src/lib.rs
index beba25b..c9372d4 100644
--- a/crates/utils/tcp_connection/tcp_connection_test/src/lib.rs
+++ b/crates/utils/tcp_connection/tcp_connection_test/src/lib.rs
@@ -12,3 +12,6 @@ pub mod test_file_transfer;
#[cfg(test)]
pub mod test_msgpack;
+
+pub mod test_utils;
+pub use test_utils::*;
diff --git a/crates/utils/tcp_connection/tcp_connection_test/src/test_challenge.rs b/crates/utils/tcp_connection/tcp_connection_test/src/test_challenge.rs
index 95b0e3c..2fc1a87 100644
--- a/crates/utils/tcp_connection/tcp_connection_test/src/test_challenge.rs
+++ b/crates/utils/tcp_connection/tcp_connection_test/src/test_challenge.rs
@@ -1,16 +1,17 @@
use std::{env::current_dir, time::Duration};
-use tcp_connection::{
- handle::{ClientHandle, ServerHandle},
- instance::ConnectionInstance,
- target::TcpServerTarget,
- target_configure::ServerTargetConfig,
-};
+use tcp_connection::instance::ConnectionInstance;
use tokio::{
join,
time::{sleep, timeout},
};
+use crate::test_utils::{
+ handle::{ClientHandle, ServerHandle},
+ target::TcpServerTarget,
+ target_configure::ServerTargetConfig,
+};
+
pub(crate) struct ExampleChallengeClientHandle;
impl ClientHandle<ExampleChallengeServerHandle> for ExampleChallengeClientHandle {
diff --git a/crates/utils/tcp_connection/tcp_connection_test/src/test_connection.rs b/crates/utils/tcp_connection/tcp_connection_test/src/test_connection.rs
index 79aac65..8c3ab01 100644
--- a/crates/utils/tcp_connection/tcp_connection_test/src/test_connection.rs
+++ b/crates/utils/tcp_connection/tcp_connection_test/src/test_connection.rs
@@ -1,12 +1,13 @@
use std::time::Duration;
-use tcp_connection::{
+use tcp_connection::instance::ConnectionInstance;
+use tokio::{join, time::sleep};
+
+use crate::test_utils::{
handle::{ClientHandle, ServerHandle},
- instance::ConnectionInstance,
target::TcpServerTarget,
target_configure::ServerTargetConfig,
};
-use tokio::{join, time::sleep};
pub(crate) struct ExampleClientHandle;
diff --git a/crates/utils/tcp_connection/tcp_connection_test/src/test_file_transfer.rs b/crates/utils/tcp_connection/tcp_connection_test/src/test_file_transfer.rs
index 9425d30..4237ea7 100644
--- a/crates/utils/tcp_connection/tcp_connection_test/src/test_file_transfer.rs
+++ b/crates/utils/tcp_connection/tcp_connection_test/src/test_file_transfer.rs
@@ -1,16 +1,17 @@
use std::{env::current_dir, time::Duration};
-use tcp_connection::{
- handle::{ClientHandle, ServerHandle},
- instance::ConnectionInstance,
- target::TcpServerTarget,
- target_configure::ServerTargetConfig,
-};
+use tcp_connection::instance::ConnectionInstance;
use tokio::{
join,
time::{sleep, timeout},
};
+use crate::test_utils::{
+ handle::{ClientHandle, ServerHandle},
+ target::TcpServerTarget,
+ target_configure::ServerTargetConfig,
+};
+
pub(crate) struct ExampleFileTransferClientHandle;
impl ClientHandle<ExampleFileTransferServerHandle> for ExampleFileTransferClientHandle {
diff --git a/crates/utils/tcp_connection/tcp_connection_test/src/test_msgpack.rs b/crates/utils/tcp_connection/tcp_connection_test/src/test_msgpack.rs
index 7344d64..7a7dc1f 100644
--- a/crates/utils/tcp_connection/tcp_connection_test/src/test_msgpack.rs
+++ b/crates/utils/tcp_connection/tcp_connection_test/src/test_msgpack.rs
@@ -1,12 +1,13 @@
use serde::{Deserialize, Serialize};
use std::time::Duration;
-use tcp_connection::{
+use tcp_connection::instance::ConnectionInstance;
+use tokio::{join, time::sleep};
+
+use crate::test_utils::{
handle::{ClientHandle, ServerHandle},
- instance::ConnectionInstance,
target::TcpServerTarget,
target_configure::ServerTargetConfig,
};
-use tokio::{join, time::sleep};
#[derive(Debug, PartialEq, Serialize, Deserialize)]
struct TestData {
diff --git a/crates/utils/tcp_connection/tcp_connection_test/src/test_tcp_target_build.rs b/crates/utils/tcp_connection/tcp_connection_test/src/test_tcp_target_build.rs
index bcaada3..aa1ec74 100644
--- a/crates/utils/tcp_connection/tcp_connection_test/src/test_tcp_target_build.rs
+++ b/crates/utils/tcp_connection/tcp_connection_test/src/test_tcp_target_build.rs
@@ -1,6 +1,7 @@
-use tcp_connection::target::TcpServerTarget;
-
-use crate::test_connection::{ExampleClientHandle, ExampleServerHandle};
+use crate::{
+ test_connection::{ExampleClientHandle, ExampleServerHandle},
+ test_utils::target::TcpServerTarget,
+};
#[test]
fn test_tcp_test_target_build() {
diff --git a/crates/utils/tcp_connection/tcp_connection_test/src/test_utils.rs b/crates/utils/tcp_connection/tcp_connection_test/src/test_utils.rs
new file mode 100644
index 0000000..badf27d
--- /dev/null
+++ b/crates/utils/tcp_connection/tcp_connection_test/src/test_utils.rs
@@ -0,0 +1,4 @@
+pub mod handle;
+pub mod target;
+pub mod target_configure;
+pub mod target_connection;
diff --git a/crates/utils/tcp_connection/src/handle.rs b/crates/utils/tcp_connection/tcp_connection_test/src/test_utils/handle.rs
index ee77b43..4f9bdbb 100644
--- a/crates/utils/tcp_connection/src/handle.rs
+++ b/crates/utils/tcp_connection/tcp_connection_test/src/test_utils/handle.rs
@@ -1,6 +1,7 @@
-use crate::instance::ConnectionInstance;
use std::future::Future;
+use tcp_connection::instance::ConnectionInstance;
+
pub trait ClientHandle<RequestServer> {
fn process(instance: ConnectionInstance) -> impl Future<Output = ()> + Send;
}
diff --git a/crates/utils/tcp_connection/src/target.rs b/crates/utils/tcp_connection/tcp_connection_test/src/test_utils/target.rs
index 88b931a..8972b2a 100644
--- a/crates/utils/tcp_connection/src/target.rs
+++ b/crates/utils/tcp_connection/tcp_connection_test/src/test_utils/target.rs
@@ -1,5 +1,3 @@
-use crate::handle::{ClientHandle, ServerHandle};
-use crate::target_configure::{ClientTargetConfig, ServerTargetConfig};
use serde::{Deserialize, Serialize};
use std::{
fmt::{Display, Formatter},
@@ -9,6 +7,11 @@ use std::{
};
use tokio::net::lookup_host;
+use crate::test_utils::{
+ handle::{ClientHandle, ServerHandle},
+ target_configure::{ClientTargetConfig, ServerTargetConfig},
+};
+
const DEFAULT_PORT: u16 = 8080;
#[derive(Debug, Serialize, Deserialize)]
diff --git a/crates/utils/tcp_connection/src/target_configure.rs b/crates/utils/tcp_connection/tcp_connection_test/src/test_utils/target_configure.rs
index d739ac9..d739ac9 100644
--- a/crates/utils/tcp_connection/src/target_configure.rs
+++ b/crates/utils/tcp_connection/tcp_connection_test/src/test_utils/target_configure.rs
diff --git a/crates/utils/tcp_connection/src/target_connection.rs b/crates/utils/tcp_connection/tcp_connection_test/src/test_utils/target_connection.rs
index 0462f7b..d5bf2c3 100644
--- a/crates/utils/tcp_connection/src/target_connection.rs
+++ b/crates/utils/tcp_connection/tcp_connection_test/src/test_utils/target_connection.rs
@@ -1,12 +1,11 @@
+use tcp_connection::{error::TcpTargetError, instance::ConnectionInstance};
use tokio::{
net::{TcpListener, TcpSocket},
spawn,
};
-use crate::{
- error::TcpTargetError,
+use crate::test_utils::{
handle::{ClientHandle, ServerHandle},
- instance::ConnectionInstance,
target::TcpServerTarget,
target_configure::ServerTargetConfig,
};
diff --git a/crates/vcs/src/service/standard_handle.rs b/crates/vcs/src/service/standard_handle.rs
index 0d898b0..8b13789 100644
--- a/crates/vcs/src/service/standard_handle.rs
+++ b/crates/vcs/src/service/standard_handle.rs
@@ -1,16 +1 @@
-use tcp_connection::handle::{ClientHandle, ServerHandle};
-pub struct StandardClientHandle;
-pub struct StandardServerHandle;
-
-impl ClientHandle<StandardServerHandle> for StandardClientHandle {
- async fn process(instance: tcp_connection::instance::ConnectionInstance) {
- todo!()
- }
-}
-
-impl ServerHandle<StandardClientHandle> for StandardServerHandle {
- async fn process(instance: tcp_connection::instance::ConnectionInstance) {
- todo!()
- }
-}
diff --git a/crates/vcs/vcs_test/Cargo.toml b/crates/vcs/vcs_test/Cargo.toml
index 0ed51d8..1cc43ac 100644
--- a/crates/vcs/vcs_test/Cargo.toml
+++ b/crates/vcs/vcs_test/Cargo.toml
@@ -5,6 +5,7 @@ version.workspace = true
[dependencies]
tcp_connection = { path = "../../utils/tcp_connection" }
+tcp_connection_test = { path = "../../utils/tcp_connection/tcp_connection_test" }
cfg_file = { path = "../../utils/cfg_file", features = ["default"] }
vcs = { path = "../../vcs" }
diff --git a/crates/vcs/vcs_test/src/test_virtual_file_creation_and_update.rs b/crates/vcs/vcs_test/src/test_virtual_file_creation_and_update.rs
index 598e7be..d86c13a 100644
--- a/crates/vcs/vcs_test/src/test_virtual_file_creation_and_update.rs
+++ b/crates/vcs/vcs_test/src/test_virtual_file_creation_and_update.rs
@@ -1,7 +1,7 @@
use std::time::Duration;
use cfg_file::config::ConfigFile;
-use tcp_connection::{
+use tcp_connection_test::{
handle::{ClientHandle, ServerHandle},
target::TcpServerTarget,
target_configure::ServerTargetConfig,