[incubator-opendal] branch main updated: chore: Refactor behavior test (#2189)

[psiace]

This is an automated email from the ASF dual-hosted git repository.

psiace pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-opendal.git


The following commit(s) were added to refs/heads/main by this push:
     new 46822e6a chore: Refactor behavior test (#2189)
46822e6a is described below

commit 46822e6aacad4969235b66fa8e1c93e7b0dbd186
Author: Xuanwo <git...@xuanwo.io>
AuthorDate: Tue May 2 01:19:23 2023 +0800

    chore: Refactor behavior test (#2189)
    
    * chore: Refactor behavior test
    
    Signed-off-by: Xuanwo <git...@xuanwo.io>
    
    * We don't need cfg-if anymore
    
    Signed-off-by: Xuanwo <git...@xuanwo.io>
    
    ---------
    
    Signed-off-by: Xuanwo <git...@xuanwo.io>
---
 Cargo.lock                  |  1 -
 core/Cargo.toml             |  3 +--
 core/tests/behavior/main.rs | 45 ++++++++++++++++++++++++++++++++++-----------
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ae8f0cc8..6647caf4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2517,7 +2517,6 @@ dependencies = [
  "base64 0.21.0",
  "bb8",
  "bytes",
- "cfg-if",
  "chrono",
  "criterion",
  "dashmap",
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 6cc1341d..7c10ac0b 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -110,6 +110,7 @@ services-gcs = [
   "reqsign?/services-google",
   "reqsign?/reqwest_request",
 ]
+services-gdrive = []
 services-ghac = []
 services-hdfs = ["dep:hdrs"]
 services-http = []
@@ -124,7 +125,6 @@ services-obs = [
   "reqsign?/reqwest_request",
 ]
 services-onedrive = []
-services-gdrive = []
 services-oss = [
   "dep:reqsign",
   "reqsign?/services-aliyun",
@@ -216,7 +216,6 @@ tracing = { version = "0.1", optional = true }
 uuid = { version = "1", features = ["serde", "v4"] }
 
 [dev-dependencies]
-cfg-if = "1"
 criterion = { version = "0.4", features = ["async", "async_tokio"] }
 dotenvy = "0.15"
 env_logger = "0.10"
diff --git a/core/tests/behavior/main.rs b/core/tests/behavior/main.rs
index 991b0a6c..3bae994c 100644
--- a/core/tests/behavior/main.rs
+++ b/core/tests/behavior/main.rs
@@ -91,26 +91,49 @@ macro_rules! behavior_tests {
     };
 }
 
+#[cfg(feature = "services-azblob")]
 behavior_tests!(Azblob);
+#[cfg(feature = "services-azdfs")]
 behavior_tests!(Azdfs);
-cfg_if::cfg_if! { if #[cfg(feature = "services-dashmap")] { 
behavior_tests!(Dashmap); }}
+#[cfg(feature = "services-dashmap")]
+behavior_tests!(Dashmap);
+#[cfg(feature = "services-fs")]
 behavior_tests!(Fs);
-cfg_if::cfg_if! { if #[cfg(feature = "services-ftp")] { behavior_tests!(Ftp); 
}}
-cfg_if::cfg_if! { if #[cfg(feature = "services-memcached")] { 
behavior_tests!(Memcached); }}
+#[cfg(feature = "services-ftp")]
+behavior_tests!(Ftp);
+#[cfg(feature = "services-memcached")]
+behavior_tests!(Memcached);
+#[cfg(feature = "services-memory")]
 behavior_tests!(Memory);
-cfg_if::cfg_if! { if #[cfg(feature = "services-moka")] { 
behavior_tests!(Moka); }}
+#[cfg(feature = "services-moka")]
+behavior_tests!(Moka);
+#[cfg(feature = "services-gcs")]
 behavior_tests!(Gcs);
+#[cfg(feature = "services-ghac")]
 behavior_tests!(Ghac);
-cfg_if::cfg_if! { if #[cfg(feature = "services-ipfs")] { 
behavior_tests!(Ipfs); }}
+#[cfg(feature = "services-ipfs")]
+behavior_tests!(Ipfs);
+#[cfg(feature = "services-ipmfs")]
 behavior_tests!(Ipmfs);
-cfg_if::cfg_if! { if #[cfg(feature = "services-hdfs")] { 
behavior_tests!(Hdfs); }}
-cfg_if::cfg_if! { if #[cfg(feature = "services-http")] { 
behavior_tests!(Http); }}
+#[cfg(feature = "services-hdfs")]
+behavior_tests!(Hdfs);
+#[cfg(feature = "services-http")]
+behavior_tests!(Http);
+#[cfg(feature = "services-obs")]
 behavior_tests!(Obs);
-cfg_if::cfg_if! { if #[cfg(feature = "services-redis")] { 
behavior_tests!(Redis); }}
-cfg_if::cfg_if! { if #[cfg(feature = "services-rocksdb")] { 
behavior_tests!(Rocksdb); }}
+#[cfg(feature = "services-redis")]
+behavior_tests!(Redis);
+#[cfg(feature = "services-rocksdb")]
+behavior_tests!(Rocksdb);
+#[cfg(feature = "services-oss")]
 behavior_tests!(Oss);
+#[cfg(feature = "services-s3")]
 behavior_tests!(S3);
-cfg_if::cfg_if! { if #[cfg(feature = "services-sftp")] { 
behavior_tests!(Sftp); }}
-cfg_if::cfg_if! { if #[cfg(feature = "services-sled")] { 
behavior_tests!(Sled); }}
+#[cfg(feature = "services-sftp")]
+behavior_tests!(Sftp);
+#[cfg(feature = "services-sled")]
+behavior_tests!(Sled);
+#[cfg(feature = "services-webdav")]
 behavior_tests!(Webdav);
+#[cfg(feature = "services-webhdfs")]
 behavior_tests!(Webhdfs);