support dinghy

Cargo.toml

@@ -1,6 +1,6 @@
 
 [workspace]
-members = ["ezlogcli", "ezlog-core", "examples/android_preview", "examples/nest_log", "examples/hello_world"]
+members = ["ezlogcli", "ezlog-core", "examples/android_preview", "examples/nest_log", "examples/hello_world", "test-compat"]
 resolver = "2"
 
 # https://github.com/johnthagen/min-sized-rust

bump.sh

@@ -11,6 +11,10 @@ find . -path "$EXCLUDE_DIR" -prune -o -type f \( -name "*.toml" -o -name "*.kt"
 # clippy check
 cargo clippy --all --all-features -- -D warnings
 
+# dinghy test
+cargo dinghy -vvv -d android test -p ezlog
+cargo dinghy -vvv -d ios test -p ezlog
+
 # build iOS
 pushd ios
 sh b_ios.sh

examples/hello_world/Cargo.toml

@@ -11,4 +11,5 @@ log = "0.4"
 env_logger = "0"
 dirs = "5.0"
 time = { version = "0.3", default-features = false, features = ["macros"] }
-rand = "0.8"
+rand = "0.8"
+test-compat = { path = "../../test-compat" }

examples/hello_world/src/main.rs

@@ -97,8 +97,7 @@ fn get_config() -> EZLogConfig {
     EZLogConfigBuilder::new()
         .level(Level::Trace)
         .dir_path(
-            dirs::cache_dir()
-                .unwrap()
+            test_compat::test_path()
                 .into_os_string()
                 .into_string()
                 .expect("dir path error"),

ezlog-core/Cargo.toml

@@ -50,4 +50,5 @@ windows-sys = { version = "0.45", features = ["Win32_System_Threading", "Win32_F
 
 [dev-dependencies]
 dirs = "5.0"
-time = { version = "0.3", default-features = false, features = ["macros"] }
+time = { version = "0.3", default-features = false, features = ["macros"] }
+test-compat = { path = "../test-compat" }

ezlog-core/src/appender.rs

@@ -472,8 +472,7 @@ mod tests {
         let nonce = b"unique nonce";
         EZLogConfigBuilder::new()
             .dir_path(
-                dirs::cache_dir()
-                    .unwrap()
+                test_compat::test_path()
                     .into_os_string()
                     .into_string()
                     .unwrap(),
@@ -543,8 +542,7 @@ mod tests {
 
         let c = EZLogConfigBuilder::new()
             .dir_path(
-                dirs::cache_dir()
-                    .unwrap()
+                test_compat::test_path()
                     .into_os_string()
                     .into_string()
                     .unwrap(),
@@ -576,8 +574,7 @@ mod tests {
 
         let c = EZLogConfigBuilder::new()
             .dir_path(
-                dirs::cache_dir()
-                    .unwrap()
+                test_compat::test_path()
                     .into_os_string()
                     .into_string()
                     .unwrap(),

ezlog-core/src/config.rs

@@ -680,7 +680,7 @@ mod tests {
 
     #[test]
     fn test_query_log_files() {
-        let temp = dirs::cache_dir().unwrap().join("ezlog_test_config");
+        let temp = test_compat::test_path().join("ezlog_test_config");
         if temp.exists() {
             fs::remove_dir_all(&temp).unwrap();
         }

ezlog-core/src/decode.rs

@@ -311,8 +311,7 @@ mod tests {
         let nonce = b"unique nonce";
         crate::EZLogConfigBuilder::new()
             .dir_path(
-                dirs::cache_dir()
-                    .unwrap()
+                test_compat::test_path()
                     .join(path)
                     .into_os_string()
                     .into_string()

ezlog-core/src/lib.rs

@@ -903,7 +903,7 @@ mod tests {
 
     #[test]
     fn test_request_logs() {
-        let mut cache_dir = dirs::cache_dir().unwrap();
+        let mut cache_dir = test_compat::test_path();
         cache_dir.push("test");
         std::fs::create_dir_all(&cache_dir).unwrap();
         let dir_clone = cache_dir.clone();

ezlog-core/tests/integration_test.rs

@@ -59,8 +59,7 @@ fn test_logger_create() {
     ezlog::InitBuilder::new().debug(true).init();
     let config = EZLogConfigBuilder::new()
         .dir_path(
-            dirs::cache_dir()
-                .unwrap()
+            test_compat::test_path()
                 .into_os_string()
                 .into_string()
                 .expect("dir path error"),

test-compat/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "test-compat"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+dirs = "5.0"

test-compat/src/lib.rs

@@ -0,0 +1,9 @@
+use std::path::PathBuf;
+
+pub fn test_path() -> PathBuf {
+    if cfg!(target_os = "android") {
+        std::env::current_dir().unwrap()
+    } else {
+        dirs::cache_dir().unwrap()
+    }
+}