Merge pull request #2791 from PsiACE/meta-tests

[test] apply the new test style to 'common/meta'

Author: BohuTANG

common/meta/api/Cargo.toml

@@ -8,6 +8,10 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[lib]
+doctest = false
+test = false
+
 [dependencies]
 common-base = {path = "../../base" }
 common-datavalues = {path = "../../datavalues" }
@@ -16,8 +20,6 @@ common-meta-types = {path= "../types" }
 common-planners = {path = "../../planners"}
 common-tracing = { path = "../../tracing" }
 
-
-
 anyhow = "1.0.45"
 async-trait = "0.1"
 futures = "0.3"

common/meta/embedded/Cargo.toml

@@ -7,7 +7,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
-
+[lib]
+doctest = false
+test = false
 
 [dependencies]
 # Workspace dependencies

common/meta/embedded/src/lib.rs

@@ -24,9 +24,4 @@ mod kv_api_impl;
 mod meta_api_impl;
 mod meta_embedded;
 
-#[cfg(test)]
-mod kv_api_impl_test;
-#[cfg(test)]
-mod meta_api_impl_test;
-
 pub use meta_embedded::MetaEmbedded;

common/meta/embedded/src/kv_api_impl_test.rs renamed to common/meta/embedded/tests/it/kv_api_impl.rs

@@ -14,8 +14,7 @@
 
 use common_base::tokio;
 use common_meta_api::KVApiTestSuite;
-
-use crate::meta_embedded::MetaEmbedded;
+use common_meta_embedded::MetaEmbedded;
 
 #[tokio::test]
 async fn test_kv_write_read() -> anyhow::Result<()> {

common/meta/embedded/tests/it/main.rs

@@ -0,0 +1,16 @@
+//  Copyright 2021 Datafuse Labs.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+
+mod kv_api_impl;
+mod meta_api_impl;

common/meta/embedded/src/meta_api_impl_test.rs renamed to common/meta/embedded/tests/it/meta_api_impl.rs

@@ -14,8 +14,7 @@
 
 use common_base::tokio;
 use common_meta_api::MetaApiTestSuite;
-
-use crate::MetaEmbedded;
+use common_meta_embedded::MetaEmbedded;
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
 async fn test_meta_embedded_database_create_get_drop() -> anyhow::Result<()> {

common/meta/flight/Cargo.toml

@@ -6,6 +6,10 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lib]
+doctest = false
+test = false
+
 [dependencies] # In alphabetical order
 # Workspace dependencies
 common-arrow = {path = "../../arrow"}

common/meta/flight/src/lib.rs

@@ -12,14 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(test)]
-mod flight_client_test;
-
 mod flight_client;
 #[macro_use]
 mod flight_action;
 mod flight_client_conf;
-pub(crate) mod tests;
 
 pub mod impls;
 

common/meta/flight/src/tests/mod.rs

@@ -16,9 +16,9 @@ use std::time::Duration;
 
 use common_base::tokio;
 use common_meta_api::MetaApi;
+use common_meta_flight::MetaFlightClient;
 
-use crate::tests::start_flight_server;
-use crate::MetaFlightClient;
+use crate::start_flight_server;
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
 async fn test_flight_client_action_timeout() {

common/meta/flight/src/flight_client_test.rs renamed to common/meta/flight/tests/it/flight_client.rs

@@ -0,0 +1,18 @@
+//  Copyright 2021 Datafuse Labs.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+
+mod flight_client;
+mod flight_server;
+
+pub use flight_server::start_flight_server;

common/meta/flight/src/tests/flight_server.rs renamed to common/meta/flight/tests/it/flight_server.rs

@@ -7,6 +7,10 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lib]
+doctest = false
+test = false
+
 [dependencies]
 common-arrow = {path = "../../arrow"}
 common-exception = {path = "../../exception"}

common/meta/flight/tests/it/main.rs

@@ -17,10 +17,3 @@ pub mod log;
 pub mod sled_key_spaces;
 pub mod state;
 pub mod state_machine;
-
-#[macro_use]
-#[cfg(test)]
-mod testing;
-
-#[cfg(test)]
-mod raft_types_test;

common/meta/raft-store/Cargo.toml

@@ -14,7 +14,4 @@
 
 mod raft_log;
 
-#[cfg(test)]
-mod raft_log_test;
-
 pub use raft_log::RaftLog;

common/meta/raft-store/src/lib.rs

@@ -16,9 +16,6 @@
 mod raft_state;
 mod raft_state_kv;
 
-#[cfg(test)]
-mod raft_state_test;
-
 pub use raft_state::RaftState;
 pub use raft_state_kv::RaftStateKey;
 pub use raft_state_kv::RaftStateValue;

common/meta/raft-store/src/log/mod.rs

@@ -25,17 +25,12 @@ pub use table_lookup::TableLookupValue;
 
 pub mod applied_state;
 pub mod client_last_resp;
+pub mod placement;
 pub mod sm;
 mod sm_kv_api_impl;
 pub mod snapshot;
 pub mod state_machine_meta;
 pub mod table_lookup;
 
-pub mod placement;
-#[cfg(test)]
-mod placement_test;
-#[cfg(test)]
-mod state_machine_test;
-
 // will be accessed by other crate, can not cfg(test)
 pub mod testing;

common/meta/raft-store/src/state/mod.rs

@@ -17,11 +17,11 @@ use async_raft::raft::EntryNormal;
 use async_raft::raft::EntryPayload;
 use async_raft::LogId;
 use common_base::tokio;
+use common_meta_raft_store::log::RaftLog;
 use common_meta_types::Cmd;
 use common_meta_types::LogEntry;
 
 use crate::init_raft_store_ut;
-use crate::log::RaftLog;
 use crate::testing::new_raft_test_context;
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 1)]

common/meta/raft-store/src/state_machine/mod.rs

@@ -0,0 +1,20 @@
+//  Copyright 2021 Datafuse Labs.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+
+mod log;
+#[macro_use]
+mod testing;
+mod state;
+mod state_machine;
+mod types;

common/meta/raft-store/src/log/raft_log_test.rs renamed to common/meta/raft-store/tests/it/log.rs

@@ -13,9 +13,9 @@
 // limitations under the License.
 use async_raft::storage::HardState;
 use common_base::tokio;
+use common_meta_raft_store::state::RaftState;
 
 use crate::init_raft_store_ut;
-use crate::state::RaftState;
 use crate::testing::new_raft_test_context;
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 1)]

common/meta/raft-store/tests/it/main.rs

@@ -25,6 +25,12 @@ use async_raft::LogId;
 use common_base::tokio;
 use common_exception::ErrorCode;
 use common_meta_api::KVApi;
+use common_meta_raft_store::state_machine::testing::pretty_snapshot;
+use common_meta_raft_store::state_machine::testing::pretty_snapshot_iter;
+use common_meta_raft_store::state_machine::testing::snapshot_logs;
+use common_meta_raft_store::state_machine::AppliedState;
+use common_meta_raft_store::state_machine::SerializableSnapshot;
+use common_meta_raft_store::state_machine::StateMachine;
 use common_meta_types::Change;
 use common_meta_types::Cmd;
 use common_meta_types::KVMeta;
@@ -39,14 +45,10 @@ use maplit::hashmap;
 use pretty_assertions::assert_eq;
 
 use crate::init_raft_store_ut;
-use crate::state_machine::testing::pretty_snapshot;
-use crate::state_machine::testing::pretty_snapshot_iter;
-use crate::state_machine::testing::snapshot_logs;
-use crate::state_machine::AppliedState;
-use crate::state_machine::SerializableSnapshot;
-use crate::state_machine::StateMachine;
 use crate::testing::new_raft_test_context;
 
+mod placement;
+
 #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
 async fn test_state_machine_apply_non_dup_incr_seq() -> anyhow::Result<()> {
     let (_log_guards, ut_span) = init_raft_store_ut!();
@@ -86,7 +88,7 @@ async fn test_state_machine_apply_incr_seq() -> anyhow::Result<()> {
     let tc = new_raft_test_context();
     let mut sm = StateMachine::open(&tc.raft_config, 1).await?;
 
-    let cases = crate::state_machine::testing::cases_incr_seq();
+    let cases = common_meta_raft_store::state_machine::testing::cases_incr_seq();
 
     for (name, txid, k, want) in cases.iter() {
         let resp = sm

common/meta/raft-store/src/state/raft_state_test.rs renamed to common/meta/raft-store/tests/it/state.rs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::state_machine::placement::rand_n_from_m;
+use common_meta_raft_store::state_machine::placement::rand_n_from_m;
 
 #[test]
 fn test_rand_n_from_m() -> anyhow::Result<()> {

common/meta/raft-store/src/state_machine/state_machine_test.rs renamed to common/meta/raft-store/tests/it/state_machine/mod.rs

@@ -13,11 +13,10 @@
 // limitations under the License.
 
 use common_base::GlobalSequence;
+use common_meta_raft_store::config::RaftConfig;
 use common_meta_sled_store::get_sled_db;
 use common_meta_sled_store::sled;
 
-use crate::config::RaftConfig;
-
 pub struct RaftTestContext {
     pub raft_config: RaftConfig,
     pub db: sled::Db,

common/meta/raft-store/src/state_machine/placement_test.rs renamed to common/meta/raft-store/tests/it/state_machine/placement.rs

@@ -7,6 +7,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lib]
+doctest = false
+test = false
 
 [dependencies]
 common-exception = {path = "../../exception"}

common/meta/raft-store/src/testing.rs renamed to common/meta/raft-store/tests/it/testing.rs

@@ -31,8 +31,3 @@ mod db;
 mod sled_key_space;
 mod sled_serde;
 mod sled_tree;
-
-#[cfg(test)]
-mod sled_tree_test;
-#[cfg(test)]
-mod testing;

common/meta/raft-store/src/raft_types_test.rs renamed to common/meta/raft-store/tests/it/types.rs

@@ -0,0 +1,16 @@
+//  Copyright 2021 Datafuse Labs.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+
+mod sled_tree;
+mod testing;

common/meta/sled-store/Cargo.toml

@@ -17,13 +17,14 @@ use async_raft::raft::EntryNormal;
 use async_raft::raft::EntryPayload;
 use common_base::tokio;
 use common_base::GlobalSequence;
+use common_meta_sled_store::get_sled_db;
+use common_meta_sled_store::SledTree;
 use common_meta_types::Cmd;
 use common_meta_types::LogEntry;
 use common_meta_types::LogId;
 use common_meta_types::LogIndex;
 use common_meta_types::SeqV;
 
-use crate::get_sled_db;
 use crate::testing::fake_key_spaces::Files;
 use crate::testing::fake_key_spaces::GenericKV;
 use crate::testing::fake_key_spaces::Logs;
@@ -32,7 +33,6 @@ use crate::testing::fake_key_spaces::StateMachineMeta;
 use crate::testing::fake_state_machine_meta::StateMachineMetaKey::Initialized;
 use crate::testing::fake_state_machine_meta::StateMachineMetaKey::LastApplied;
 use crate::testing::fake_state_machine_meta::StateMachineMetaValue;
-use crate::SledTree;
 
 /// 1. Open a temp sled::Db for all tests.
 /// 2. Initialize a global tracing.
@@ -41,8 +41,8 @@ use crate::SledTree;
 macro_rules! init_sled_ut {
     () => {{
         let t = tempfile::tempdir().expect("create temp dir to sled db");
-        $crate::init_temp_sled_db(t);
 
+        common_meta_sled_store::init_temp_sled_db(t);
         common_tracing::init_default_ut_tracing();
 
         let name = common_tracing::func_name!();