From 94bac190e9ca7baa228ad7aafc93226b683863ca Mon Sep 17 00:00:00 2001
From: photowey <photowey@gmail.com>
Date: Fri, 19 Jul 2024 02:24:55 +0800
Subject: [PATCH] feat: Update: 1.remove imports mod;2.add hold-on ut.

Signed-off-by: photowey <photowey@gmail.com>
---
 crates/env/src/tests/env_unix_tests.rs   | 40 ++++++++++++++++--------
 crates/env/src/tests/env_windows_test.rs | 38 +++++++++++++++-------
 2 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/crates/env/src/tests/env_unix_tests.rs b/crates/env/src/tests/env_unix_tests.rs
index 2ee0cf3..445e4fb 100644
--- a/crates/env/src/tests/env_unix_tests.rs
+++ b/crates/env/src/tests/env_unix_tests.rs
@@ -18,25 +18,39 @@
 
 #![allow(unused_imports)]
 
-// @formatter:off
 // ----------------------------------------------------------------
 
-#[rustfmt::skip]
-use imports::*;
+use omigacore::collection::table::{Table, Value};
 
-#[rustfmt::skip]
-mod imports {
-    pub use omigacore::collection::table::{Table, Value};
+use crate::env::standard::StandardEnvironment;
+use crate::env::Environment;
+use crate::reader::registry::ConfigReaderRegistry;
+use crate::reader::toml::TomlConfigReader;
 
-    pub use crate::env::Environment;
-    pub use crate::env::standard::StandardEnvironment;
-    pub use crate::reader::registry::ConfigReaderRegistry;
-    pub use crate::reader::toml::TomlConfigReader;
-}
-
-// @formatter:on
 // ----------------------------------------------------------------
 
+#[test]
+fn test_hold_on_imports() {
+    let rvt = StandardEnvironment::builder()
+        .with_table(Table::new())
+        .with_registry(Box::new(ConfigReaderRegistry::default()))
+        .with_reader(Box::new(TomlConfigReader::default()))
+        .with_config("omiga".to_string())
+        .with_profile("dev".to_string())
+        .with_format("toml".to_string())
+        .build();
+
+    let mut environment = rvt.unwrap();
+    environment
+        .set("io.github.photowey", Value::String("omiga".to_string()))
+        .expect("Set failed");
+
+    assert_eq!(
+        environment.get("io.github.photowey"),
+        Ok(&Value::String("omiga".to_string()))
+    );
+}
+
 #[test]
 #[cfg(unix)]
 fn test_standard_environment_builder_os_unix() {
diff --git a/crates/env/src/tests/env_windows_test.rs b/crates/env/src/tests/env_windows_test.rs
index 0c22817..9b0ffc4 100644
--- a/crates/env/src/tests/env_windows_test.rs
+++ b/crates/env/src/tests/env_windows_test.rs
@@ -20,21 +20,37 @@
 
 // ----------------------------------------------------------------
 
-#[rustfmt::skip]
-use imports::*;
+use omigacore::collection::table::{Table, Value};
 
-#[rustfmt::skip]
-mod imports {
-    pub use omigacore::collection::table::{Table, Value};
-
-    pub use crate::env::Environment;
-    pub use crate::env::standard::StandardEnvironment;
-    pub use crate::reader::registry::ConfigReaderRegistry;
-    pub use crate::reader::toml::TomlConfigReader;
-}
+use crate::env::standard::StandardEnvironment;
+use crate::env::Environment;
+use crate::reader::registry::ConfigReaderRegistry;
+use crate::reader::toml::TomlConfigReader;
 
 // ----------------------------------------------------------------
 
+#[test]
+fn test_hold_on_imports() {
+    let rvt = StandardEnvironment::builder()
+        .with_table(Table::new())
+        .with_registry(Box::new(ConfigReaderRegistry::default()))
+        .with_reader(Box::new(TomlConfigReader::default()))
+        .with_config("omiga".to_string())
+        .with_profile("dev".to_string())
+        .with_format("toml".to_string())
+        .build();
+
+    let mut environment = rvt.unwrap();
+    environment
+        .set("io.github.photowey", Value::String("omiga".to_string()))
+        .expect("Set failed");
+
+    assert_eq!(
+        environment.get("io.github.photowey"),
+        Ok(&Value::String("omiga".to_string()))
+    );
+}
+
 #[test]
 #[cfg(windows)]
 fn test_standard_environment_builder_os_windows() {