diff options
author | Henning Baldersheim <balder@vespa.ai> | 2024-06-28 15:06:55 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@vespa.ai> | 2024-06-28 15:46:04 +0000 |
commit | f978040e1a234b2e3769c362873a43ee6163e224 (patch) | |
tree | 1eed451a4face19bbefb13f08e978062fbe0ab4b /eval/src | |
parent | a045360251f9b0b42aef32af860f1a3a3e3d3b16 (diff) |
Include test_master.hpp explicit.
Diffstat (limited to 'eval/src')
5 files changed, 16 insertions, 12 deletions
diff --git a/eval/src/tests/eval/aggr/aggr_test.cpp b/eval/src/tests/eval/aggr/aggr_test.cpp index f4eb6dc6ddc..0a849dc43ec 100644 --- a/eval/src/tests/eval/aggr/aggr_test.cpp +++ b/eval/src/tests/eval/aggr/aggr_test.cpp @@ -197,17 +197,17 @@ float aggr_merge(const std::vector<float> &a, const std::vector<float> &b) { TEST("require that aggregator merge works") { float my_nan = std::numeric_limits<float>::quiet_NaN(); - EXPECT_EQUAL(aggr_merge<Avg>({1,2},{3,4}), 2.5); - EXPECT_EQUAL(aggr_merge<Count>({1,2},{3,4}), 4.0); - EXPECT_EQUAL(aggr_merge<Prod>({1,2},{3,4}), 24.0); - EXPECT_EQUAL(aggr_merge<Sum>({1,2},{3,4}), 10.0); - EXPECT_EQUAL(aggr_merge<Max>({1,2},{3,4}), 4.0); - EXPECT_EQUAL(aggr_merge<Median>({1,2},{3,4}), 2.5); - EXPECT_EQUAL(aggr_merge<Median>({1,2},{3,4,5}), 3); - EXPECT_EQUAL(aggr_merge<Median>({0,1,2},{3,4}), 2); + EXPECT_EQUAL(aggr_merge<Avg>({1,2},{3,4}), 2.5f); + EXPECT_EQUAL(aggr_merge<Count>({1,2},{3,4}), 4.0f); + EXPECT_EQUAL(aggr_merge<Prod>({1,2},{3,4}), 24.0f); + EXPECT_EQUAL(aggr_merge<Sum>({1,2},{3,4}), 10.0f); + EXPECT_EQUAL(aggr_merge<Max>({1,2},{3,4}), 4.0f); + EXPECT_EQUAL(aggr_merge<Median>({1,2},{3,4}), 2.5f); + EXPECT_EQUAL(aggr_merge<Median>({1,2},{3,4,5}), 3.0f); + EXPECT_EQUAL(aggr_merge<Median>({0,1,2},{3,4}), 2.0f); EXPECT_TRUE(std::isnan(aggr_merge<Median>({1,2,my_nan,3},{4,5}))); EXPECT_TRUE(std::isnan(aggr_merge<Median>({1,2,3},{4,my_nan,5}))); - EXPECT_EQUAL(aggr_merge<Min>({1,2},{3,4}), 1.0); + EXPECT_EQUAL(aggr_merge<Min>({1,2},{3,4}), 1.0f); } TEST_MAIN() { TEST_RUN_ALL(); } diff --git a/eval/src/tests/eval/param_usage/param_usage_test.cpp b/eval/src/tests/eval/param_usage/param_usage_test.cpp index 3ba76c726b5..a2f4cfc30e4 100644 --- a/eval/src/tests/eval/param_usage/param_usage_test.cpp +++ b/eval/src/tests/eval/param_usage/param_usage_test.cpp @@ -1,8 +1,9 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/function.h> #include <vespa/eval/eval/param_usage.h> #include <vespa/eval/eval/llvm/compiled_function.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/vespalib/test/insertion_operators.h> using vespalib::approx_equal; diff --git a/eval/src/tests/eval/value_type/value_type_test.cpp b/eval/src/tests/eval/value_type/value_type_test.cpp index f472a5fb6a6..9663969ae80 100644 --- a/eval/src/tests/eval/value_type/value_type_test.cpp +++ b/eval/src/tests/eval/value_type/value_type_test.cpp @@ -6,6 +6,7 @@ #include <vespa/vespalib/util/bfloat16.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/test/insertion_operators.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <ostream> using vespalib::BFloat16; diff --git a/eval/src/tests/instruction/join_with_number/join_with_number_function_test.cpp b/eval/src/tests/instruction/join_with_number/join_with_number_function_test.cpp index 1a81c35ba5f..06c59fbb321 100644 --- a/eval/src/tests/instruction/join_with_number/join_with_number_function_test.cpp +++ b/eval/src/tests/instruction/join_with_number/join_with_number_function_test.cpp @@ -1,12 +1,13 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/tensor_function.h> #include <vespa/eval/eval/test/eval_fixture.h> #include <vespa/eval/eval/test/gen_spec.h> #include <vespa/eval/instruction/join_with_number_function.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/util/unwind_message.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace vespalib; using namespace vespalib::eval; diff --git a/eval/src/tests/instruction/mixed_simple_join_function/mixed_simple_join_function_test.cpp b/eval/src/tests/instruction/mixed_simple_join_function/mixed_simple_join_function_test.cpp index cf99dd4e437..ab7854b0e27 100644 --- a/eval/src/tests/instruction/mixed_simple_join_function/mixed_simple_join_function_test.cpp +++ b/eval/src/tests/instruction/mixed_simple_join_function/mixed_simple_join_function_test.cpp @@ -1,12 +1,13 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/fast_value.h> #include <vespa/eval/eval/simple_value.h> #include <vespa/eval/eval/tensor_function.h> #include <vespa/eval/instruction/mixed_simple_join_function.h> #include <vespa/eval/eval/test/eval_fixture.h> #include <vespa/eval/eval/test/gen_spec.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/vespalib/util/stringfmt.h> |