[test] apply the new test style to common-dal

Signed-off-by: Chojan Shang <[email protected]>

Author: PsiACE

common/dal/Cargo.toml

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

common/dal/src/README.md renamed to common/dal/README.md

@@ -14,4 +14,3 @@ async fn get(&self, path: &str) -> Result<Bytes>;
 
 async fn put(&self, path: &str, content: Vec<u8>) -> common_exception::Result<()>;
 ```
-

common/dal/src/impls/aws_s3/mod.rs

@@ -11,10 +11,6 @@
 //  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.
-//
-
-#[cfg(test)]
-mod s3_input_stream_test;
 
 mod metrics;
 mod s3;

common/dal/src/impls/azure_blob/mod.rs

@@ -11,10 +11,6 @@
 //  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.
-//
-
-#[cfg(test)]
-mod azure_blob_accessor_test;
 
 mod azure_blob_accessor;
 mod azure_blob_input_stream;

common/dal/src/lib.rs

@@ -31,6 +31,3 @@ mod data_accessor;
 mod impls;
 mod in_memory_data;
 mod schemes;
-
-#[cfg(test)]
-mod schemes_test;

common/dal/src/impls/aws_s3/s3_input_stream_test.rs renamed to common/dal/tests/it/impls/aws_s3.rs

@@ -11,11 +11,12 @@
 //  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.
-//
 
 use std::io::SeekFrom;
 
 use common_base::tokio;
+use common_dal::DataAccessor;
+use common_dal::S3;
 use common_exception::ErrorCode;
 use futures::AsyncReadExt;
 use futures::AsyncSeekExt;
@@ -25,9 +26,6 @@ use rusoto_s3::PutObjectRequest;
 use rusoto_s3::S3Client;
 use rusoto_s3::S3 as RusotoS3;
 
-use crate::DataAccessor;
-use crate::S3;
-
 struct TestFixture {
     region_name: String,
     endpoint_url: String,

common/dal/src/impls/azure_blob/azure_blob_accessor_test.rs renamed to common/dal/tests/it/impls/azure_blob.rs

@@ -11,19 +11,17 @@
 //  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.
-//
 
 use std::io::SeekFrom;
 use std::str;
 
 use common_base::tokio;
+use common_dal::AzureBlobAccessor;
+use common_dal::DataAccessor;
 use common_exception::Result;
 use futures::AsyncReadExt;
 use futures::AsyncSeekExt;
 
-use crate::AzureBlobAccessor;
-use crate::DataAccessor;
-
 fn generate_test_data() -> String {
     let mut s = "0123456789".to_string();
     s.push_str("abcdefghijklmnopqrstuvwxyz");

common/dal/tests/it/impls/mod.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 aws_s3;
+mod azure_blob;

common/dal/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 impls;
+mod schemes;

common/dal/src/schemes_test.rs renamed to common/dal/tests/it/schemes.rs

@@ -11,17 +11,15 @@
 //  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.
-//
 
 use std::str::FromStr;
 
+use common_dal::StorageScheme;
+use common_dal::StorageScheme::AzureStorageBlob;
+use common_dal::StorageScheme::LocalFs;
+use common_dal::StorageScheme::S3;
 use common_exception::ErrorCode;
 
-use crate::schemes::StorageScheme::AzureStorageBlob;
-use crate::schemes::StorageScheme::LocalFs;
-use crate::schemes::StorageScheme::S3;
-use crate::StorageScheme;
-
 #[test]
 fn test_scheme_from_str() {
     let valid_schemes = vec![