[test] apply the new test style to common_functions

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

Author: PsiACE

common/functions/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/functions/src/aggregates/mod.rs

@@ -12,11 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(test)]
-mod aggregate_combinator_test;
-#[cfg(test)]
-mod aggregate_function_test;
-
 mod aggregate_arg_min_max;
 mod aggregate_avg;
 mod aggregate_combinator_distinct;

common/functions/src/scalars/arithmetics/mod.rs

@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(test)]
-mod arithmetic_test;
-
 mod arithmetic;
 mod arithmetic_div;
 mod arithmetic_minus;

common/functions/src/scalars/comparisons/mod.rs

@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(test)]
-mod comparison_test;
-
 mod comparison;
 mod comparison_eq;
 mod comparison_gt;

common/functions/src/scalars/conditionals/mod.rs

@@ -14,8 +14,6 @@
 
 mod conditional;
 mod r#if;
-#[cfg(test)]
-mod if_test;
 
 pub use conditional::ConditionalFunction;
 pub use r#if::IfFunction;

common/functions/src/scalars/dates/mod.rs

@@ -13,14 +13,6 @@
 // limitations under the License.
 
 mod date;
-#[cfg(test)]
-mod date_function_test;
-#[cfg(test)]
-mod date_test;
-
-#[cfg(test)]
-mod interval_function_test;
-
 mod interval_function;
 mod now;
 mod number_function;
@@ -38,6 +30,7 @@ pub use number_function::ToDayOfWeekFunction;
 pub use number_function::ToDayOfYearFunction;
 pub use number_function::ToHourFunction;
 pub use number_function::ToMinuteFunction;
+pub use number_function::ToMondayFunction;
 pub use number_function::ToMonthFunction;
 pub use number_function::ToSecondFunction;
 pub use number_function::ToStartOfISOYearFunction;

common/functions/src/scalars/expressions/mod.rs

@@ -12,11 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(test)]
-mod cast_test;
-mod expression;
-
 mod cast;
+mod expression;
 
 pub use cast::CastFunction;
 pub use expression::ToCastFunction;

common/functions/src/scalars/hashes/mod.rs

@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(test)]
-mod siphash_test;
-
 mod hash;
 mod siphash;
 

common/functions/src/scalars/logics/mod.rs

@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(test)]
-mod logic_test;
-
 mod logic;
 mod logic_and;
 mod logic_not;

common/functions/src/scalars/maths/mod.rs

@@ -12,15 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(test)]
-mod abs_test;
-#[cfg(test)]
-mod crc32_test;
-#[cfg(test)]
-mod pi_test;
-#[cfg(test)]
-mod trigonometric_test;
-
 mod abs;
 mod crc32;
 mod math;

common/functions/src/scalars/mod.rs

@@ -20,8 +20,6 @@ mod expressions;
 mod function;
 mod function_alias;
 mod function_column;
-#[cfg(test)]
-mod function_column_test;
 mod function_factory;
 mod function_literal;
 mod hashes;

common/functions/src/scalars/nullables/mod.rs

@@ -15,8 +15,6 @@
 mod is_not_null;
 mod is_null;
 mod nullable;
-#[cfg(test)]
-mod nullable_test;
 
 pub use is_not_null::IsNotNullFunction;
 pub use is_null::IsNullFunction;

common/functions/src/scalars/others/mod.rs

@@ -11,10 +11,9 @@
 // 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 running_difference_function_test;
 
 mod other;
 mod running_difference_function;
+
 pub use other::OtherFunction;
 pub use running_difference_function::RunningDifferenceFunction;

common/functions/src/scalars/strings/mod.rs

@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(test)]
-mod substring_test;
-
 mod string;
 mod substring;
 

common/functions/src/scalars/udfs/mod.rs

@@ -12,15 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(test)]
-mod database_test;
-#[cfg(test)]
-mod to_type_name_test;
-#[cfg(test)]
-mod udf_example_test;
-#[cfg(test)]
-mod version_test;
-
 mod crash_me;
 mod database;
 mod exists;

common/functions/src/aggregates/aggregate_combinator_test.rs renamed to common/functions/tests/it/aggregates/aggregate_combinator.rs

@@ -15,10 +15,9 @@
 use bumpalo::Bump;
 use common_datavalues::prelude::*;
 use common_exception::Result;
+use common_functions::aggregates::AggregateFunctionFactory;
 use pretty_assertions::assert_eq;
 
-use crate::aggregates::aggregate_function_factory::AggregateFunctionFactory;
-
 #[test]
 fn test_aggregate_combinator_function() -> Result<()> {
     struct Test {

common/functions/src/aggregates/aggregate_function_test.rs renamed to common/functions/tests/it/aggregates/aggregate_function.rs

@@ -15,11 +15,10 @@
 use bumpalo::Bump;
 use common_datavalues::prelude::*;
 use common_exception::Result;
+use common_functions::aggregates::*;
 use float_cmp::approx_eq;
 use pretty_assertions::assert_eq;
 
-use crate::aggregates::*;
-
 #[test]
 fn test_aggregate_function() -> Result<()> {
     struct Test {

common/functions/tests/it/aggregates/mod.rs

@@ -0,0 +1,16 @@
+// Copyright 2020 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 aggregate_combinator;
+mod aggregate_function;

common/functions/tests/it/main.rs

@@ -0,0 +1,16 @@
+// Copyright 2020 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 aggregates;
+mod scalars;

common/functions/src/scalars/arithmetics/arithmetic_test.rs renamed to common/functions/tests/it/scalars/arithmetic.rs

@@ -15,10 +15,9 @@
 use common_datavalues::chrono;
 use common_datavalues::prelude::*;
 use common_exception::Result;
+use common_functions::scalars::*;
 use pretty_assertions::assert_eq;
 
-use crate::scalars::*;
-
 #[test]
 fn test_arithmetic_function() -> Result<()> {
     #[allow(dead_code)]

common/functions/src/scalars/comparisons/comparison_test.rs renamed to common/functions/tests/it/scalars/comparison.rs

@@ -14,10 +14,9 @@
 
 use common_datavalues::prelude::*;
 use common_exception::Result;
+use common_functions::scalars::*;
 use pretty_assertions::assert_eq;
 
-use crate::scalars::*;
-
 #[test]
 fn test_comparison_function() -> Result<()> {
     #[allow(dead_code)]

common/functions/src/scalars/conditionals/if_test.rs renamed to common/functions/tests/it/scalars/conditional.rs

@@ -15,10 +15,9 @@
 use common_datavalues::prelude::*;
 use common_datavalues::DataType;
 use common_exception::Result;
+use common_functions::scalars::*;
 use pretty_assertions::assert_eq;
 
-use crate::scalars::*;
-
 #[test]
 fn test_if_function() -> Result<()> {
     #[allow(dead_code)]

common/functions/src/scalars/dates/date_test.rs renamed to common/functions/tests/it/scalars/dates/date.rs

@@ -11,13 +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 common_datavalues::prelude::*;
 use common_exception::Result;
+use common_functions::scalars::*;
 use pretty_assertions::assert_eq;
 
-use super::RoundFunction;
-use crate::scalars::*;
-
 #[allow(dead_code)]
 struct Test {
     name: &'static str,

common/functions/src/scalars/dates/date_function_test.rs renamed to common/functions/tests/it/scalars/dates/date_function.rs

@@ -14,19 +14,7 @@
 
 use common_datavalues::prelude::*;
 use common_exception::Result;
-
-use crate::scalars::dates::number_function::ToDayOfMonthFunction;
-use crate::scalars::dates::number_function::ToDayOfWeekFunction;
-use crate::scalars::dates::number_function::ToDayOfYearFunction;
-use crate::scalars::dates::number_function::ToMinuteFunction;
-use crate::scalars::dates::number_function::ToMondayFunction;
-use crate::scalars::dates::number_function::ToMonthFunction;
-use crate::scalars::Function;
-use crate::scalars::ToHourFunction;
-use crate::scalars::ToSecondFunction;
-use crate::scalars::ToYYYYMMDDFunction;
-use crate::scalars::ToYYYYMMDDhhmmssFunction;
-use crate::scalars::ToYYYYMMFunction;
+use common_functions::scalars::*;
 
 #[allow(dead_code)]
 struct Test {

common/functions/src/scalars/dates/interval_function_test.rs renamed to common/functions/tests/it/scalars/dates/interval_function.rs

@@ -16,9 +16,8 @@ use common_datablocks::DataBlock;
 use common_datavalues::chrono::DateTime;
 use common_datavalues::prelude::*;
 use common_exception::Result;
-
-use crate::scalars::MonthsArithmeticFunction;
-use crate::scalars::SecondsArithmeticFunction;
+use common_functions::scalars::MonthsArithmeticFunction;
+use common_functions::scalars::SecondsArithmeticFunction;
 
 #[test]
 fn test_add_months() -> Result<()> {

common/functions/tests/it/scalars/dates/mod.rs

@@ -0,0 +1,17 @@
+// Copyright 2020 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 date;
+mod date_function;
+mod interval_function;

common/functions/src/scalars/expressions/cast_test.rs renamed to common/functions/tests/it/scalars/expression.rs

@@ -14,10 +14,9 @@
 
 use common_datavalues::prelude::*;
 use common_exception::Result;
+use common_functions::scalars::*;
 use pretty_assertions::assert_eq;
 
-use crate::scalars::*;
-
 #[test]
 fn test_cast_function() -> Result<()> {
     #[allow(dead_code)]

common/functions/src/scalars/function_column_test.rs renamed to common/functions/tests/it/scalars/function_column.rs

@@ -15,8 +15,7 @@
 use common_datablocks::*;
 use common_datavalues::prelude::*;
 use common_exception::Result;
-
-use crate::scalars::*;
+use common_functions::scalars::*;
 
 #[test]
 fn test_column_function() -> Result<()> {

common/functions/src/scalars/hashes/siphash_test.rs renamed to common/functions/tests/it/scalars/hash.rs

@@ -15,8 +15,7 @@
 use common_datavalues::columns::DataColumn;
 use common_datavalues::prelude::*;
 use common_exception::Result;
-
-use crate::scalars::SipHashFunction;
+use common_functions::scalars::SipHashFunction;
 
 #[test]
 fn test_siphash_function() -> Result<()> {

common/functions/src/scalars/logics/logic_test.rs renamed to common/functions/tests/it/scalars/logic.rs

@@ -14,10 +14,9 @@
 
 use common_datavalues::prelude::*;
 use common_exception::Result;
+use common_functions::scalars::*;
 use pretty_assertions::assert_eq;
 
-use crate::scalars::*;
-
 #[test]
 fn test_logic_function() -> Result<()> {
     #[allow(dead_code)]

common/functions/src/scalars/maths/abs_test.rs renamed to common/functions/tests/it/scalars/maths/abs.rs

@@ -15,8 +15,7 @@
 use common_datavalues::prelude::*;
 use common_exception::ErrorCode;
 use common_exception::Result;
-
-use crate::scalars::*;
+use common_functions::scalars::*;
 
 #[test]
 fn test_abs_function() -> Result<()> {