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 | |
| parent | a045360251f9b0b42aef32af860f1a3a3e3d3b16 (diff) | |
Include test_master.hpp explicit.
113 files changed, 261 insertions, 179 deletions
diff --git a/document/src/tests/annotation/annotation_test.cpp b/document/src/tests/annotation/annotation_test.cpp index c5635b9f4f9..34bc67d0238 100644 --- a/document/src/tests/annotation/annotation_test.cpp +++ b/document/src/tests/annotation/annotation_test.cpp @@ -1,7 +1,6 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // Unit tests for annotation. -#include <stdlib.h> #include <vespa/document/annotation/alternatespanlist.h> #include <vespa/document/annotation/annotation.h> #include <vespa/document/annotation/span.h> @@ -18,7 +17,7 @@ #include <vespa/document/fieldvalue/doublefieldvalue.h> #include <vespa/document/fieldvalue/structfieldvalue.h> #include <vespa/vespalib/testkit/test_kit.h> -#include <memory> +#include <vespa/vespalib/testkit/test_master.hpp> using std::unique_ptr; using namespace document; diff --git a/document/src/tests/datatype/datatype_test.cpp b/document/src/tests/datatype/datatype_test.cpp index 1362afe8dbc..9ed86378883 100644 --- a/document/src/tests/datatype/datatype_test.cpp +++ b/document/src/tests/datatype/datatype_test.cpp @@ -7,8 +7,9 @@ #include <vespa/document/datatype/tensor_data_type.h> #include <vespa/document/fieldvalue/longfieldvalue.h> #include <vespa/eval/eval/value_type.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/exceptions.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace document; diff --git a/document/src/tests/datatype/referencedatatype_test.cpp b/document/src/tests/datatype/referencedatatype_test.cpp index 54489feb2f2..a2d564364ba 100644 --- a/document/src/tests/datatype/referencedatatype_test.cpp +++ b/document/src/tests/datatype/referencedatatype_test.cpp @@ -3,10 +3,10 @@ #include <vespa/document/base/field.h> #include <vespa/document/datatype/referencedatatype.h> #include <vespa/document/fieldvalue/referencefieldvalue.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/exceptions.h> -#include <ostream> #include <sstream> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace document; diff --git a/document/src/tests/document_type_repo_factory/document_type_repo_factory_test.cpp b/document/src/tests/document_type_repo_factory/document_type_repo_factory_test.cpp index edb7f8e4f45..4db2ea38d7e 100644 --- a/document/src/tests/document_type_repo_factory/document_type_repo_factory_test.cpp +++ b/document/src/tests/document_type_repo_factory/document_type_repo_factory_test.cpp @@ -5,6 +5,7 @@ #include <vespa/document/repo/document_type_repo_factory.h> #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using vespalib::string; using namespace document::config_builder; diff --git a/document/src/tests/fieldvalue/referencefieldvalue_test.cpp b/document/src/tests/fieldvalue/referencefieldvalue_test.cpp index 57b313b2237..98f9a2dbfbb 100644 --- a/document/src/tests/fieldvalue/referencefieldvalue_test.cpp +++ b/document/src/tests/fieldvalue/referencefieldvalue_test.cpp @@ -4,9 +4,10 @@ #include <vespa/document/datatype/referencedatatype.h> #include <vespa/document/fieldvalue/referencefieldvalue.h> #include <vespa/document/fieldvalue/stringfieldvalue.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/exceptions.h> #include <ostream> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace document; diff --git a/document/src/tests/repo/doctype_config_test.cpp b/document/src/tests/repo/doctype_config_test.cpp index 0705b53c2df..c3c0d375a95 100644 --- a/document/src/tests/repo/doctype_config_test.cpp +++ b/document/src/tests/repo/doctype_config_test.cpp @@ -14,9 +14,10 @@ #include <vespa/document/repo/documenttyperepo.h> #include <vespa/vespalib/objects/identifiable.h> #include <vespa/vespalib/stllike/string.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/exceptions.h> #include <set> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("doctype_config_test"); diff --git a/document/src/tests/repo/documenttyperepo_test.cpp b/document/src/tests/repo/documenttyperepo_test.cpp index b2d79209c12..a26b65f73f7 100644 --- a/document/src/tests/repo/documenttyperepo_test.cpp +++ b/document/src/tests/repo/documenttyperepo_test.cpp @@ -14,10 +14,11 @@ #include <vespa/document/repo/documenttyperepo.h> #include <vespa/vespalib/objects/identifiable.h> #include <vespa/vespalib/stllike/string.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/exceptions.h> #include <set> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using config::AsciiConfigWriter; using std::set; diff --git a/document/src/tests/serialization/vespadocumentserializer_test.cpp b/document/src/tests/serialization/vespadocumentserializer_test.cpp index 65a77b1f872..ae711d81bd2 100644 --- a/document/src/tests/serialization/vespadocumentserializer_test.cpp +++ b/document/src/tests/serialization/vespadocumentserializer_test.cpp @@ -43,10 +43,11 @@ #include <vespa/eval/eval/test/value_compare.h> #include <vespa/vespalib/io/fileutil.h> #include <vespa/vespalib/objects/nbostream.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/document/base/exceptions.h> #include <vespa/vespalib/util/compressionconfig.h> #include <filesystem> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using vespalib::File; using vespalib::Slime; diff --git a/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp b/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp index 4cc4e5e6215..a84b3e0f93b 100644 --- a/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp +++ b/document/src/tests/tensor_fieldvalue/tensor_fieldvalue_test.cpp @@ -1,9 +1,6 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // Unit tests for tensor_fieldvalue. -#include <vespa/log/log.h> -LOG_SETUP("fieldvalue_test"); - #include <vespa/document/base/exceptions.h> #include <vespa/document/datatype/tensor_data_type.h> #include <vespa/document/fieldvalue/tensorfieldvalue.h> @@ -12,6 +9,10 @@ LOG_SETUP("fieldvalue_test"); #include <vespa/eval/eval/value.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> + +#include <vespa/log/log.h> +LOG_SETUP("fieldvalue_test"); using namespace document; using vespalib::eval::SimpleValue; diff --git a/documentapi/src/tests/priority/priority.cpp b/documentapi/src/tests/priority/priority.cpp index d0290495035..f8c55864289 100644 --- a/documentapi/src/tests/priority/priority.cpp +++ b/documentapi/src/tests/priority/priority.cpp @@ -1,9 +1,10 @@ // 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/documentapi/messagebus/priority.h> #include <fstream> #include <algorithm> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace documentapi; 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> diff --git a/fnet/src/tests/frt/detach_supervisor/detach_supervisor_test.cpp b/fnet/src/tests/frt/detach_supervisor/detach_supervisor_test.cpp index 6466848f216..809cdce2bdd 100644 --- a/fnet/src/tests/frt/detach_supervisor/detach_supervisor_test.cpp +++ b/fnet/src/tests/frt/detach_supervisor/detach_supervisor_test.cpp @@ -1,6 +1,5 @@ // 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/fnet/transport.h> #include <vespa/fnet/transport_thread.h> #include <vespa/fnet/frt/supervisor.h> @@ -11,6 +10,8 @@ #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/util/time.h> #include <thread> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace vespalib; using vespalib::make_string_short::fmt; diff --git a/fnet/src/tests/frt/rpc/invoke.cpp b/fnet/src/tests/frt/rpc/invoke.cpp index 7fb17468db4..314c1aac3d1 100644 --- a/fnet/src/tests/frt/rpc/invoke.cpp +++ b/fnet/src/tests/frt/rpc/invoke.cpp @@ -1,5 +1,4 @@ // 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/vespalib/net/socket_spec.h> #include <vespa/vespalib/net/tls/capability_env_config.h> #include <vespa/vespalib/net/tls/statistics.h> @@ -14,6 +13,8 @@ #include <mutex> #include <condition_variable> #include <string_view> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using vespalib::SocketSpec; using vespalib::BenchmarkTimer; diff --git a/fnet/src/tests/transport_debugger/transport_debugger_test.cpp b/fnet/src/tests/transport_debugger/transport_debugger_test.cpp index 859c6e5bb3d..e5e53ff3f0c 100644 --- a/fnet/src/tests/transport_debugger/transport_debugger_test.cpp +++ b/fnet/src/tests/transport_debugger/transport_debugger_test.cpp @@ -12,6 +12,7 @@ #include <vespa/fnet/frt/target.h> #include <vespa/vespalib/net/tls/tls_crypto_engine.h> #include <vespa/vespalib/test/make_tls_options_for_testing.h> +#include <vespa/vespalib/testkit/test_master.hpp> vespalib::CryptoEngine::SP tls_crypto = std::make_shared<vespalib::TlsCryptoEngine>(vespalib::test::make_tls_options_for_testing()); diff --git a/persistence/src/tests/dummyimpl/dummypersistence_test.cpp b/persistence/src/tests/dummyimpl/dummypersistence_test.cpp index 835ac26d5c1..f050a993e0a 100644 --- a/persistence/src/tests/dummyimpl/dummypersistence_test.cpp +++ b/persistence/src/tests/dummyimpl/dummypersistence_test.cpp @@ -2,12 +2,13 @@ // Unit tests for dummypersistence. #include <vespa/persistence/dummyimpl/dummypersistence.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/document/base/documentid.h> #include <vespa/document/test/make_bucket_space.h> #include <vespa/vdslib/distribution/distribution.h> #include <vespa/vdslib/state/clusterstate.h> #include <vespa/config-stor-distribution.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace storage::spi; using namespace storage; diff --git a/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp b/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp index df27c4d7cc2..5e270bdae99 100644 --- a/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp +++ b/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp @@ -32,13 +32,14 @@ #include <vespa/searchcommon/attribute/i_attribute_functor.h> #include <vespa/searchcommon/attribute/iattributevector.h> #include <vespa/searchcommon/attribute/config.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/foreground_thread_executor.h> #include <vespa/vespalib/util/foregroundtaskexecutor.h> #include <vespa/vespalib/util/hw_info.h> #include <vespa/vespalib/util/size_literals.h> #include <vespa/vespalib/util/threadstackexecutor.h> #include <vespa/config-attributes.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("attribute_manager_test"); diff --git a/searchcore/src/tests/proton/attribute/attribute_usage_filter/attribute_usage_filter_test.cpp b/searchcore/src/tests/proton/attribute/attribute_usage_filter/attribute_usage_filter_test.cpp index a20e08d5be2..cdb0bcdb66a 100644 --- a/searchcore/src/tests/proton/attribute/attribute_usage_filter/attribute_usage_filter_test.cpp +++ b/searchcore/src/tests/proton/attribute/attribute_usage_filter/attribute_usage_filter_test.cpp @@ -3,8 +3,9 @@ #include <vespa/searchcore/proton/attribute/attribute_usage_filter.h> #include <vespa/searchcore/proton/attribute/i_attribute_usage_listener.h> #include <vespa/searchlib/attribute/address_space_components.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/size_literals.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("attribute_usage_filter_test"); diff --git a/searchcore/src/tests/proton/attribute/document_field_extractor/document_field_extractor_test.cpp b/searchcore/src/tests/proton/attribute/document_field_extractor/document_field_extractor_test.cpp index 6f84b793608..f93853d2d1d 100644 --- a/searchcore/src/tests/proton/attribute/document_field_extractor/document_field_extractor_test.cpp +++ b/searchcore/src/tests/proton/attribute/document_field_extractor/document_field_extractor_test.cpp @@ -15,6 +15,7 @@ #include <vespa/searchcommon/common/undefinedvalues.h> #include <vespa/searchcore/proton/attribute/document_field_extractor.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using document::Field; using document::DataType; diff --git a/searchcore/src/tests/proton/bucketdb/bucketdb/bucketdb_test.cpp b/searchcore/src/tests/proton/bucketdb/bucketdb/bucketdb_test.cpp index 213d9c38290..d2ca19616a5 100644 --- a/searchcore/src/tests/proton/bucketdb/bucketdb/bucketdb_test.cpp +++ b/searchcore/src/tests/proton/bucketdb/bucketdb/bucketdb_test.cpp @@ -7,6 +7,7 @@ #include <vespa/vespalib/stllike/asciistream.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("bucketdb_test"); diff --git a/searchcore/src/tests/proton/common/attribute_updater_test.cpp b/searchcore/src/tests/proton/common/attribute_updater_test.cpp index 432386af0e6..b082e1f9907 100644 --- a/searchcore/src/tests/proton/common/attribute_updater_test.cpp +++ b/searchcore/src/tests/proton/common/attribute_updater_test.cpp @@ -39,6 +39,7 @@ #include <vespa/vespalib/stllike/hash_map.hpp> #include <vespa/vespalib/test/insertion_operators.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace document; using document::config_builder::Array; diff --git a/searchcore/src/tests/proton/common/feedoperation_test.cpp b/searchcore/src/tests/proton/common/feedoperation_test.cpp index 48893aa7da3..cae51211dfe 100644 --- a/searchcore/src/tests/proton/common/feedoperation_test.cpp +++ b/searchcore/src/tests/proton/common/feedoperation_test.cpp @@ -25,6 +25,7 @@ #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/datatype/documenttype.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using document::BucketId; using document::DataType; diff --git a/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp b/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp index ad74039a5ee..88bc22932d2 100644 --- a/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp +++ b/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp @@ -49,7 +49,7 @@ TEST_F("Test that hw_info_sampler uses override info", Fixture) Config samplerCfg(0, 75.0, 100.0, sampleLen, sharedDisk, 0, 0); HwInfoSampler sampler(test_dir, samplerCfg); EXPECT_EQUAL(75.0, sampler.diskWriteSpeed()); - EXPECT_NOT_EQUAL(0, time_point_to_long(sampler.sampleTime())); + EXPECT_NOT_EQUAL(0l, time_point_to_long(sampler.sampleTime())); EXPECT_TRUE(sampler.hwInfo().disk().slow()); } @@ -71,7 +71,7 @@ TEST_F("Test that hw_info_sampler can sample disk write speed", Fixture) Config samplerCfg(0, 0.0, 100.0, sampleLen, sharedDisk, 0, 0); HwInfoSampler sampler(test_dir, samplerCfg); ASSERT_NOT_EQUAL(0.0, sampler.diskWriteSpeed()); - ASSERT_NOT_EQUAL(0, time_point_to_long(sampler.sampleTime())); + ASSERT_NOT_EQUAL(0l, time_point_to_long(sampler.sampleTime())); HwInfoSampler sampler2(test_dir, samplerCfg); EXPECT_APPROX(sampler.diskWriteSpeed(), sampler2.diskWriteSpeed(), 0.1); EXPECT_EQUAL(time_point_to_long(sampler.sampleTime()), diff --git a/searchcore/src/tests/proton/common/pendinglidtracker_test.cpp b/searchcore/src/tests/proton/common/pendinglidtracker_test.cpp index f8d0d218670..45b80d0c32e 100644 --- a/searchcore/src/tests/proton/common/pendinglidtracker_test.cpp +++ b/searchcore/src/tests/proton/common/pendinglidtracker_test.cpp @@ -1,7 +1,8 @@ // 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/searchcore/proton/common/pendinglidtracker.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace proton; diff --git a/searchcore/src/tests/proton/common/statusreport_test.cpp b/searchcore/src/tests/proton/common/statusreport_test.cpp index 052eb795529..8465f0ec56d 100644 --- a/searchcore/src/tests/proton/common/statusreport_test.cpp +++ b/searchcore/src/tests/proton/common/statusreport_test.cpp @@ -1,6 +1,7 @@ // 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/searchcore/proton/common/statusreport.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> namespace proton { diff --git a/searchcore/src/tests/proton/docsummary/docsummary_test.cpp b/searchcore/src/tests/proton/docsummary/docsummary_test.cpp index 361e37278da..28b26428a5e 100644 --- a/searchcore/src/tests/proton/docsummary/docsummary_test.cpp +++ b/searchcore/src/tests/proton/docsummary/docsummary_test.cpp @@ -65,13 +65,14 @@ #include <vespa/vespalib/data/slime/slime.h> #include <vespa/vespalib/encoding/base64.h> #include <vespa/vespalib/net/socket_spec.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/geo/zcurve.h> #include <vespa/vespalib/util/destructor_callbacks.h> #include <vespa/vespalib/util/size_literals.h> #include <vespa/config-summary.h> #include <filesystem> #include <regex> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("docsummary_test"); @@ -590,7 +591,7 @@ TEST("requireThatSummariesTimeout") const auto & root = rep->root(); const auto & field = root["errors"]; EXPECT_TRUE(field.valid()); - EXPECT_EQUAL(field[0]["type"].asString(), "timeout"); + EXPECT_EQUAL(field[0]["type"].asString(), vespalib::Memory("timeout")); auto bufstring = field[0]["message"].asString(); EXPECT_TRUE(std::regex_search(bufstring.data, bufstring.data + bufstring.size, std::regex("Timed out 1 summaries with -[0-9]+us left."))); } diff --git a/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp b/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp index 85883324080..b2920ae5202 100644 --- a/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp +++ b/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp @@ -18,8 +18,9 @@ #include <vespa/persistence/spi/result.h> #include <vespa/persistence/spi/test.h> #include <vespa/vespalib/objects/nbostream.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <unordered_set> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("document_iterator_test"); diff --git a/searchcore/src/tests/proton/documentdb/configurer_test.cpp b/searchcore/src/tests/proton/documentdb/configurer_test.cpp index 9362d26a3b9..d49dbcdec2e 100644 --- a/searchcore/src/tests/proton/documentdb/configurer_test.cpp +++ b/searchcore/src/tests/proton/documentdb/configurer_test.cpp @@ -1,7 +1,5 @@ // 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/config-summary.h> #include <vespa/document/datatype/documenttype.h> #include <vespa/document/repo/documenttyperepo.h> @@ -42,6 +40,8 @@ #include <vespa/vespalib/util/testclock.h> #include <vespa/vespalib/util/threadstackexecutor.h> #include <filesystem> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace config; using namespace document; diff --git a/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp b/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp index e3ab2737fe5..78dac399456 100644 --- a/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp +++ b/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp @@ -3,9 +3,10 @@ #include <vespa/searchcore/proton/server/document_scan_iterator.h> #include <vespa/searchcore/proton/bucketdb/bucket_db_owner.h> #include <vespa/vespalib/test/insertion_operators.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/document/base/documentid.h> #include <vespa/vespalib/util/stringfmt.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace document; using namespace proton; diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp index e824dc647ac..098b2ff9f74 100644 --- a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp +++ b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp @@ -38,8 +38,6 @@ #include <vespa/config-bucketspaces.h> #include <vespa/config/subscription/sourcespec.h> #include <vespa/document/test/make_bucket_space.h> -#include <vespa/vespalib/test/insertion_operators.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/destructor_callbacks.h> #include <vespa/vespalib/util/idestructorcallback.h> #include <vespa/vespalib/util/hw_info.h> @@ -47,6 +45,9 @@ #include <vespa/vespalib/util/size_literals.h> #include <vespa/vespalib/util/testclock.h> #include <vespa/vespalib/util/threadstackexecutor.h> +#include <vespa/vespalib/test/insertion_operators.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace cloud::config::filedistribution; using namespace document; diff --git a/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.cpp b/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.cpp index 5c4cfb393a4..fa366d3cc3e 100644 --- a/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.cpp +++ b/searchcore/src/tests/proton/documentdb/documentbucketmover/bucketmover_common.cpp @@ -3,7 +3,7 @@ #include "bucketmover_common.h" #include <vespa/searchcore/proton/documentmetastore/documentmetastore.h> #include <vespa/searchcore/proton/bucketdb/bucket_db_owner.h> -#include <vespa/vespalib/testkit/test_macros.h> +#include <vespa/vespalib/gtest/gtest.h> using vespalib::IDestructorCallback; @@ -70,7 +70,7 @@ MySubDb::insertDocs(const UserDocuments &docs_) { _metaStore.put(testDoc.getGid(), testDoc.getBucket(), testDoc.getTimestamp(), testDoc.getDocSize(), testDoc.getLid(), 0u); _realRetriever->_docs.push_back(testDoc.getDoc()); - ASSERT_EQUAL(testDoc.getLid() + 1, _realRetriever->_docs.size()); + ASSERT_EQ(testDoc.getLid() + 1, _realRetriever->_docs.size()); } } _docs.merge(docs_); @@ -83,16 +83,22 @@ MySubDb::remove(uint32_t subDbId, uint32_t lid) { return _metaStore.remove(lid, 0u); } +template<typename A, typename B> +bool expect_eq(const A & a, const B & b) { + EXPECT_EQ(a, b); + return (a == b); +} + bool assertEqual(const document::BucketId &bucket, const proton::test::Document &doc, uint32_t sourceSubDbId, uint32_t targetSubDbId, const MoveOperation &op) { - if (!EXPECT_EQUAL(bucket, op.getBucketId())) return false; - if (!EXPECT_EQUAL(doc.getTimestamp(), op.getTimestamp())) return false; - if (!EXPECT_EQUAL(doc.getDocId(), op.getDocument()->getId())) return false; - if (!EXPECT_EQUAL(doc.getLid(), op.getSourceDbdId().getLid())) return false; - if (!EXPECT_EQUAL(sourceSubDbId, op.getSourceDbdId().getSubDbId())) return false; - if (!EXPECT_EQUAL(0u, op.getTargetDbdId().getLid())) return false; - if (!EXPECT_EQUAL(targetSubDbId, op.getTargetDbdId().getSubDbId())) return false; + if (!expect_eq(bucket, op.getBucketId())) return false; + if (!expect_eq(doc.getTimestamp(), op.getTimestamp())) return false; + if (!expect_eq(doc.getDocId(), op.getDocument()->getId())) return false; + if (!expect_eq(doc.getLid(), op.getSourceDbdId().getLid())) return false; + if (!expect_eq(sourceSubDbId, op.getSourceDbdId().getSubDbId())) return false; + if (!expect_eq(0u, op.getTargetDbdId().getLid())) return false; + if (!expect_eq(targetSubDbId, op.getTargetDbdId().getSubDbId())) return false; return true; } diff --git a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp index 97c0331ce0b..82f01c01b7e 100644 --- a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp @@ -36,10 +36,11 @@ #include <vespa/vespalib/data/slime/slime.h> #include <vespa/vespalib/net/socket_spec.h> #include <vespa/vespalib/stllike/asciistream.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/size_literals.h> #include <filesystem> #include <iostream> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace cloud::config::filedistribution; using namespace proton; diff --git a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp index 862792bf274..df7ba9cd7bc 100644 --- a/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp +++ b/searchcore/src/tests/proton/documentdb/documentdbconfigscout/documentdbconfigscout_test.cpp @@ -4,9 +4,10 @@ #include <vespa/searchcore/proton/server/documentdbconfig.h> #include <vespa/searchcore/proton/server/documentdbconfigscout.h> #include <vespa/searchcore/proton/test/documentdb_config_builder.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/config-attributes.h> #include <ostream> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace document; using namespace proton; diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp index cdd275e898d..383f891d5d2 100644 --- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp +++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp @@ -38,11 +38,12 @@ #include <vespa/searchlib/test/doc_builder.h> #include <vespa/searchlib/transactionlog/translogserver.h> #include <vespa/vespalib/net/socket_spec.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/lambdatask.h> #include <vespa/vespalib/util/exceptions.h> #include <vespa/vespalib/util/size_literals.h> #include <filesystem> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("feedhandler_test"); diff --git a/searchcore/src/tests/proton/flushengine/flushengine_test.cpp b/searchcore/src/tests/proton/flushengine/flushengine_test.cpp index dc9dcd3e0b0..d43d1184e2c 100644 --- a/searchcore/src/tests/proton/flushengine/flushengine_test.cpp +++ b/searchcore/src/tests/proton/flushengine/flushengine_test.cpp @@ -13,9 +13,10 @@ #include <vespa/searchlib/common/flush_token.h> #include <vespa/vespalib/data/slime/slime.h> #include <vespa/vespalib/test/insertion_operators.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <mutex> #include <thread> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("flushengine_test"); diff --git a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp b/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp index 7abac088011..fd80a05860b 100644 --- a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp +++ b/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp @@ -189,7 +189,7 @@ TEST_F("require that tls replay cost is correct for zero operations to replay", TEST_F("require that flush cost is correct for zero flush targets", CandidatesFixture) { - EXPECT_EQUAL(0, f.builder.build().getFlushTargetsWriteCost()); + EXPECT_EQUAL(0.0, f.builder.build().getFlushTargetsWriteCost()); } TEST_F("require that flush cost is sum of flush targets", CandidatesFixture) diff --git a/searchcore/src/tests/proton/matching/constant_value_repo/constant_value_repo_test.cpp b/searchcore/src/tests/proton/matching/constant_value_repo/constant_value_repo_test.cpp index 312c5b6eaa1..1db8a2d93b3 100644 --- a/searchcore/src/tests/proton/matching/constant_value_repo/constant_value_repo_test.cpp +++ b/searchcore/src/tests/proton/matching/constant_value_repo/constant_value_repo_test.cpp @@ -63,7 +63,7 @@ struct Fixture { TEST_F("require that constant value can be retrieved from repo", Fixture) { - EXPECT_EQUAL(3, f.repo.getConstant("foo")->value().as_double()); + EXPECT_EQUAL(3.0, f.repo.getConstant("foo")->value().as_double()); } TEST_F("require that non-existing constant value in repo returns nullptr", Fixture) diff --git a/searchcore/src/tests/proton/matching/index_environment/index_environment_test.cpp b/searchcore/src/tests/proton/matching/index_environment/index_environment_test.cpp index b17453c4b6d..1c7e7083ee7 100644 --- a/searchcore/src/tests/proton/matching/index_environment/index_environment_test.cpp +++ b/searchcore/src/tests/proton/matching/index_environment/index_environment_test.cpp @@ -1,10 +1,10 @@ // 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/value_cache/constant_value.h> #include <vespa/searchcore/proton/matching/indexenvironment.h> #include <vespa/searchlib/fef/onnx_models.h> #include <vespa/searchlib/fef/ranking_expressions.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace proton::matching; using search::fef::FieldInfo; diff --git a/searchcore/src/tests/proton/matching/match_phase_limiter/match_phase_limiter_test.cpp b/searchcore/src/tests/proton/matching/match_phase_limiter/match_phase_limiter_test.cpp index 6f398469fd3..9ad495a7955 100644 --- a/searchcore/src/tests/proton/matching/match_phase_limiter/match_phase_limiter_test.cpp +++ b/searchcore/src/tests/proton/matching/match_phase_limiter/match_phase_limiter_test.cpp @@ -1,5 +1,4 @@ // 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/searchcore/proton/matching/match_phase_limiter.h> #include <vespa/searchcore/proton/matching/rangequerylocator.h> #include <vespa/searchlib/queryeval/termasstring.h> @@ -17,6 +16,8 @@ #include <vespa/searchlib/engine/trace.h> #include <vespa/vespalib/data/slime/slime.h> #include <vespa/vespalib/util/stringfmt.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace proton::matching; using namespace search::engine; diff --git a/searchcore/src/tests/proton/matching/query_test.cpp b/searchcore/src/tests/proton/matching/query_test.cpp index 763f5dafb55..5f3db842d72 100644 --- a/searchcore/src/tests/proton/matching/query_test.cpp +++ b/searchcore/src/tests/proton/matching/query_test.cpp @@ -30,8 +30,9 @@ #include <vespa/document/datatype/positiondatatype.h> #include <vespa/vespalib/stllike/asciistream.h> #include <vespa/vespalib/util/thread_bundle.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/searchlib/query/tree/querytreecreator.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("query_test"); diff --git a/searchcore/src/tests/proton/matching/sessionmanager_test.cpp b/searchcore/src/tests/proton/matching/sessionmanager_test.cpp index 3153bcccb42..483034a112d 100644 --- a/searchcore/src/tests/proton/matching/sessionmanager_test.cpp +++ b/searchcore/src/tests/proton/matching/sessionmanager_test.cpp @@ -8,8 +8,10 @@ #include <vespa/searchcore/proton/matching/match_tools.h> #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/test/insertion_operators.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/data/slime/slime.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> + #include <vespa/log/log.h> LOG_SETUP("sessionmanager_test"); diff --git a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp index 0f1e2e9487a..ea8fbcb57dc 100644 --- a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp +++ b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp @@ -17,8 +17,9 @@ #include <vespa/searchcore/proton/test/disk_mem_usage_notifier.h> #include <vespa/vdslib/distribution/distribution.h> #include <vespa/vdslib/state/clusterstate.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <set> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using document::BucketId; using document::BucketSpace; diff --git a/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp b/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp index 1dfc6c481b6..40d5b7e7383 100644 --- a/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp +++ b/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp @@ -24,10 +24,11 @@ #include <vespa/fileacquirer/config-filedistributorrpc.h> #include <vespa/vespalib/util/hw_info.h> #include <vespa/vespalib/util/varholder.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/config.h> #include <map> #include <thread> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace config; using namespace proton; diff --git a/searchcore/src/tests/proton/proton_disk_layout/proton_disk_layout_test.cpp b/searchcore/src/tests/proton/proton_disk_layout/proton_disk_layout_test.cpp index 881c547df1e..592fe434beb 100644 --- a/searchcore/src/tests/proton/proton_disk_layout/proton_disk_layout_test.cpp +++ b/searchcore/src/tests/proton/proton_disk_layout/proton_disk_layout_test.cpp @@ -8,10 +8,11 @@ #include <vespa/searchlib/transactionlog/translogserver.h> #include <vespa/searchlib/transactionlog/translogclient.h> #include <vespa/vespalib/io/fileutil.h> -#include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/test/insertion_operators.h> #include <vespa/vespalib/util/stringfmt.h> #include <filesystem> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> +#include <vespa/vespalib/test/insertion_operators.h> using search::index::DummyFileHeaderContext; using search::transactionlog::client::TransLogClient; diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_mapper/gid_to_lid_mapper_test.cpp b/searchcore/src/tests/proton/reference/gid_to_lid_mapper/gid_to_lid_mapper_test.cpp index 70211909296..bbe4b10851e 100644 --- a/searchcore/src/tests/proton/reference/gid_to_lid_mapper/gid_to_lid_mapper_test.cpp +++ b/searchcore/src/tests/proton/reference/gid_to_lid_mapper/gid_to_lid_mapper_test.cpp @@ -1,5 +1,4 @@ // 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/searchcore/proton/bucketdb/bucket_db_owner.h> #include <vespa/searchcore/proton/documentmetastore/documentmetastore.h> #include <vespa/searchcore/proton/documentmetastore/documentmetastorecontext.h> @@ -9,6 +8,9 @@ #include <vespa/document/bucket/bucketid.h> #include <vespa/searchcore/proton/reference/gid_to_lid_mapper.h> #include <vespa/searchcore/proton/reference/gid_to_lid_mapper_factory.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> + #include <vespa/log/log.h> LOG_SETUP("gid_to_lid_mapper_test"); diff --git a/searchcore/src/tests/proton/server/documentretriever_test.cpp b/searchcore/src/tests/proton/server/documentretriever_test.cpp index b05964fe7e0..d2b1612607f 100644 --- a/searchcore/src/tests/proton/server/documentretriever_test.cpp +++ b/searchcore/src/tests/proton/server/documentretriever_test.cpp @@ -40,7 +40,6 @@ #include <vespa/document/test/fieldvalue_helpers.h> #include <vespa/vespalib/geo/zcurve.h> #include <vespa/vespalib/test/insertion_operators.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/eval/eval/simple_value.h> #include <vespa/eval/eval/tensor_spec.h> @@ -48,6 +47,8 @@ #include <vespa/eval/eval/test/value_compare.h> #include <vespa/persistence/spi/bucket.h> #include <vespa/persistence/spi/test.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> diff --git a/searchcore/src/tests/proton/server/feeddebugger_test.cpp b/searchcore/src/tests/proton/server/feeddebugger_test.cpp index 4d1bbdb2f03..c664b983689 100644 --- a/searchcore/src/tests/proton/server/feeddebugger_test.cpp +++ b/searchcore/src/tests/proton/server/feeddebugger_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. // Unit tests for feeddebugger. -#include <vespa/log/log.h> -LOG_SETUP("feeddebugger_test"); - #include <vespa/document/base/documentid.h> #include <vespa/searchcore/proton/common/feeddebugger.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> + +#include <vespa/log/log.h> +LOG_SETUP("feeddebugger_test"); using document::DocumentId; using std::string; diff --git a/searchcore/src/tests/proton/server/feedstates_test.cpp b/searchcore/src/tests/proton/server/feedstates_test.cpp index c46510c5181..438e2ae500c 100644 --- a/searchcore/src/tests/proton/server/feedstates_test.cpp +++ b/searchcore/src/tests/proton/server/feedstates_test.cpp @@ -16,8 +16,9 @@ #include <vespa/searchlib/common/serialnum.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/util/foreground_thread_executor.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/buffer.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("feedstates_test"); diff --git a/searchcore/src/tests/proton/summaryengine/summaryengine_test.cpp b/searchcore/src/tests/proton/summaryengine/summaryengine_test.cpp index 2ab81058e43..6d1d80b495d 100644 --- a/searchcore/src/tests/proton/summaryengine/summaryengine_test.cpp +++ b/searchcore/src/tests/proton/summaryengine/summaryengine_test.cpp @@ -1,5 +1,4 @@ // 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/vespalib/data/slime/slime.h> #include <vespa/searchcore/proton/summaryengine/summaryengine.h> #include <vespa/searchlib/engine/searchreply.h> @@ -7,6 +6,8 @@ #include <vespa/vespalib/data/simple_buffer.h> #include <vespa/vespalib/util/compressor.h> #include <vespa/fnet/frt/rpcrequest.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> diff --git a/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.cpp b/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.cpp index a4f5fea1750..b9ed2cc10f2 100644 --- a/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.cpp +++ b/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.cpp @@ -1,6 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "mock_gid_to_lid_change_handler.h" +#include <vespa/vespalib/testkit/test_master.hpp> namespace proton::test { @@ -14,4 +15,27 @@ MockGidToLidChangeHandler::MockGidToLidChangeHandler() noexcept MockGidToLidChangeHandler::~MockGidToLidChangeHandler() = default; +void +MockGidToLidChangeHandler::addListener(std::unique_ptr<IGidToLidChangeListener> listener) { + _adds.emplace_back(listener->getDocTypeName(), listener->getName()); + _listeners.push_back(std::move(listener)); +} + +void +MockGidToLidChangeHandler::removeListeners(const vespalib::string &docTypeName, const std::set<vespalib::string> &keepNames) { + _removes.emplace_back(docTypeName, keepNames); +} + +void +MockGidToLidChangeHandler::assertAdds(const std::vector<AddEntry> &expAdds) const +{ + EXPECT_EQUAL(expAdds, _adds); +} + +void +MockGidToLidChangeHandler::assertRemoves(const std::vector<RemoveEntry> &expRemoves) const +{ + EXPECT_EQUAL(expRemoves, _removes); +} + } diff --git a/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.h b/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.h index 288f6ebfebd..1fd27e07f49 100644 --- a/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.h +++ b/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.h @@ -4,9 +4,9 @@ #include <vespa/searchcore/proton/reference/i_gid_to_lid_change_handler.h> #include <vespa/searchcore/proton/reference/i_gid_to_lid_change_listener.h> #include <vespa/searchcore/proton/reference/i_pending_gid_to_lid_changes.h> +#include <vespa/document/base/globalid.h> #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/test/insertion_operators.h> -#include <vespa/document/base/globalid.h> namespace proton::test { @@ -28,28 +28,15 @@ public: MockGidToLidChangeHandler() noexcept; ~MockGidToLidChangeHandler() override; - void addListener(std::unique_ptr<IGidToLidChangeListener> listener) override { - _adds.emplace_back(listener->getDocTypeName(), listener->getName()); - _listeners.push_back(std::move(listener)); - } - - void removeListeners(const vespalib::string &docTypeName, const std::set<vespalib::string> &keepNames) override { - _removes.emplace_back(docTypeName, keepNames); - } + void addListener(std::unique_ptr<IGidToLidChangeListener> listener) override; + void removeListeners(const vespalib::string &docTypeName, const std::set<vespalib::string> &keepNames) override; void notifyPut(IDestructorCallbackSP, document::GlobalId, uint32_t, SerialNum) override { } void notifyRemoves(IDestructorCallbackSP, const std::vector<document::GlobalId> &, SerialNum) override { } std::unique_ptr<IPendingGidToLidChanges> grab_pending_changes() override { return {}; } - void assertAdds(const std::vector<AddEntry> &expAdds) - { - EXPECT_EQUAL(expAdds, _adds); - } - - void assertRemoves(const std::vector<RemoveEntry> &expRemoves) - { - EXPECT_EQUAL(expRemoves, _removes); - } + void assertAdds(const std::vector<AddEntry> &expAdds) const; + void assertRemoves(const std::vector<RemoveEntry> &expRemoves) const; const std::vector<std::unique_ptr<IGidToLidChangeListener>> &getListeners() const { return _listeners; } }; diff --git a/searchlib/src/apps/tests/memoryindexstress_test.cpp b/searchlib/src/apps/tests/memoryindexstress_test.cpp index b9c80a3c04d..5eecb2b79c4 100644 --- a/searchlib/src/apps/tests/memoryindexstress_test.cpp +++ b/searchlib/src/apps/tests/memoryindexstress_test.cpp @@ -21,11 +21,12 @@ #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/repo/fixedtyperepo.h> #include <vespa/vespalib/util/rand48.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/threadstackexecutor.h> #include <vespa/vespalib/util/sequencedtaskexecutor.h> #include <vespa/vespalib/util/size_literals.h> #include <vespa/vespalib/stllike/asciistream.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("memoryindexstress_test"); diff --git a/searchlib/src/tests/aggregator/perdocexpr_test.cpp b/searchlib/src/tests/aggregator/perdocexpr_test.cpp index 61c5a4f8de9..e22b0561b0b 100644 --- a/searchlib/src/tests/aggregator/perdocexpr_test.cpp +++ b/searchlib/src/tests/aggregator/perdocexpr_test.cpp @@ -7,7 +7,6 @@ #include <vespa/searchlib/attribute/singleboolattribute.h> #include <vespa/searchcommon/attribute/config.h> #include <vespa/vespalib/objects/objectdumper.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/document/base/testdocman.h> #include <vespa/document/fieldvalue/bytefieldvalue.h> #include <vespa/document/fieldvalue/weightedsetfieldvalue.h> @@ -17,6 +16,8 @@ #include <cmath> #include <iostream> #include <list> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("per_doc_expr_test"); diff --git a/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp b/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp index 2494b514c56..57b88692e12 100644 --- a/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp +++ b/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp @@ -8,6 +8,7 @@ #include <vespa/searchlib/attribute/multinumericattribute.h> #include <vespa/searchlib/attribute/multinumericattribute.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("attribute_test"); diff --git a/searchlib/src/tests/attribute/bitvector_search_cache/bitvector_search_cache_test.cpp b/searchlib/src/tests/attribute/bitvector_search_cache/bitvector_search_cache_test.cpp index 1d66eefaff7..33d36d03351 100644 --- a/searchlib/src/tests/attribute/bitvector_search_cache/bitvector_search_cache_test.cpp +++ b/searchlib/src/tests/attribute/bitvector_search_cache/bitvector_search_cache_test.cpp @@ -1,9 +1,10 @@ // 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/searchlib/attribute/bitvector_search_cache.h> #include <vespa/searchlib/common/bitvector.h> #include <vespa/vespalib/util/memoryusage.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace search; using namespace search::attribute; diff --git a/searchlib/src/tests/attribute/changevector/changevector_test.cpp b/searchlib/src/tests/attribute/changevector/changevector_test.cpp index 9dd96b1b72c..0d3db6cca74 100644 --- a/searchlib/src/tests/attribute/changevector/changevector_test.cpp +++ b/searchlib/src/tests/attribute/changevector/changevector_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/searchlib/attribute/changevector.hpp> #include <vespa/vespalib/stllike/hash_set.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> + using namespace search; using Change = ChangeTemplate<NumericChangeData<long>>; diff --git a/searchlib/src/tests/attribute/imported_search_context/imported_search_context_test.cpp b/searchlib/src/tests/attribute/imported_search_context/imported_search_context_test.cpp index 7c38c322bc8..7d02949c994 100644 --- a/searchlib/src/tests/attribute/imported_search_context/imported_search_context_test.cpp +++ b/searchlib/src/tests/attribute/imported_search_context/imported_search_context_test.cpp @@ -7,8 +7,9 @@ #include <vespa/searchlib/queryeval/simpleresult.h> #include <vespa/searchlib/test/imported_attribute_fixture.h> #include <vespa/searchlib/test/mock_gid_to_lid_mapping.h> -#include <vespa/vespalib/test/insertion_operators.h> #include <vespa/searchlib/queryeval/executeinfo.h> +#include <vespa/vespalib/test/insertion_operators.h> +#include <vespa/vespalib/testkit/test_master.hpp> namespace search::attribute { diff --git a/searchlib/src/tests/attribute/posting_list_merger/posting_list_merger_test.cpp b/searchlib/src/tests/attribute/posting_list_merger/posting_list_merger_test.cpp index 868c85c7962..22170461f25 100644 --- a/searchlib/src/tests/attribute/posting_list_merger/posting_list_merger_test.cpp +++ b/searchlib/src/tests/attribute/posting_list_merger/posting_list_merger_test.cpp @@ -1,10 +1,11 @@ // 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/searchlib/attribute/posting_list_merger.h> #include <vespa/vespalib/test/insertion_operators.h> #include <vespa/vespalib/util/size_literals.h> #include <algorithm> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using vespalib::btree::BTreeNoLeafData; using search::attribute::PostingListMerger; diff --git a/searchlib/src/tests/attribute/searchable/attribute_weighted_set_blueprint_test.cpp b/searchlib/src/tests/attribute/searchable/attribute_weighted_set_blueprint_test.cpp index 0278c4f32ef..ea18960c8ff 100644 --- a/searchlib/src/tests/attribute/searchable/attribute_weighted_set_blueprint_test.cpp +++ b/searchlib/src/tests/attribute/searchable/attribute_weighted_set_blueprint_test.cpp @@ -1,5 +1,4 @@ // 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/searchlib/attribute/attribute_blueprint_factory.h> #include <vespa/searchlib/attribute/attribute_weighted_set_blueprint.h> #include <vespa/searchlib/attribute/attributecontext.h> @@ -16,6 +15,8 @@ #include <vespa/searchlib/attribute/enumstore.hpp> #include <vespa/searchcommon/attribute/config.h> #include <vespa/vespalib/util/normalize_class_name.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("attribute_weighted_set_blueprint_test"); diff --git a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp index cce72837dad..4e6e01f11da 100644 --- a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp +++ b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp @@ -21,7 +21,6 @@ #include <vespa/vespalib/data/fileheader.h> #include <vespa/vespalib/stllike/asciistream.h> #include <vespa/vespalib/test/insertion_operators.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/mmap_file_allocator_factory.h> #include <vespa/searchlib/util/bufferwriter.h> #include <vespa/vespalib/util/threadstackexecutor.h> @@ -34,6 +33,8 @@ #include <vespa/eval/eval/test/value_compare.h> #include <vespa/fastos/file.h> #include <filesystem> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("tensorattribute_test"); diff --git a/searchlib/src/tests/common/bitvector/bitvector_test.cpp b/searchlib/src/tests/common/bitvector/bitvector_test.cpp index ef9e801cda3..04c0c082a69 100644 --- a/searchlib/src/tests/common/bitvector/bitvector_test.cpp +++ b/searchlib/src/tests/common/bitvector/bitvector_test.cpp @@ -1,6 +1,5 @@ // 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/vespalib/stllike/asciistream.h> #include <vespa/searchlib/common/growablebitvector.h> #include <vespa/searchlib/common/partialbitvector.h> @@ -13,6 +12,8 @@ #include <vespa/vespalib/util/exceptions.h> #include <vespa/vespalib/util/simple_thread_bundle.h> #include <algorithm> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace search; diff --git a/searchlib/src/tests/docstore/document_store/document_store_test.cpp b/searchlib/src/tests/docstore/document_store/document_store_test.cpp index a35aeb5e851..5dcab0b8810 100644 --- a/searchlib/src/tests/docstore/document_store/document_store_test.cpp +++ b/searchlib/src/tests/docstore/document_store/document_store_test.cpp @@ -1,10 +1,11 @@ // 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/searchlib/docstore/logdocumentstore.h> #include <vespa/searchlib/docstore/value.h> #include <vespa/vespalib/stllike/cache_stats.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/fieldvalue/document.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace search; using CompressionConfig = vespalib::compression::CompressionConfig; diff --git a/searchlib/src/tests/docstore/file_chunk/file_chunk_test.cpp b/searchlib/src/tests/docstore/file_chunk/file_chunk_test.cpp index 8f506b7ca2d..8ccd4e57eed 100644 --- a/searchlib/src/tests/docstore/file_chunk/file_chunk_test.cpp +++ b/searchlib/src/tests/docstore/file_chunk/file_chunk_test.cpp @@ -5,12 +5,12 @@ #include <vespa/searchlib/docstore/writeablefilechunk.h> #include <vespa/searchlib/test/directory_handler.h> #include <vespa/vespalib/test/insertion_operators.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/cpu_usage.h> #include <vespa/vespalib/util/compressionconfig.h> #include <vespa/vespalib/util/threadstackexecutor.h> #include <iomanip> -#include <iostream> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> diff --git a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp index 72bdd533719..79fbefa03a3 100644 --- a/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp +++ b/searchlib/src/tests/docstore/logdatastore/logdatastore_test.cpp @@ -1,6 +1,5 @@ // 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/document/repo/configbuilder.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/datatype/documenttype.h> @@ -22,6 +21,8 @@ #include <filesystem> #include <iomanip> #include <random> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using document::BucketId; using document::StringFieldValue; diff --git a/searchlib/src/tests/expression/attributenode/attribute_node_test.cpp b/searchlib/src/tests/expression/attributenode/attribute_node_test.cpp index d2b07c6c552..3941cc606fb 100644 --- a/searchlib/src/tests/expression/attributenode/attribute_node_test.cpp +++ b/searchlib/src/tests/expression/attributenode/attribute_node_test.cpp @@ -15,6 +15,7 @@ #include <vespa/searchlib/test/make_attribute_map_lookup_node.h> #include <vespa/vespalib/test/insertion_operators.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("attribute_node_test"); diff --git a/searchlib/src/tests/features/constant/constant_test.cpp b/searchlib/src/tests/features/constant/constant_test.cpp index 3377965536b..ae9c698372b 100644 --- a/searchlib/src/tests/features/constant/constant_test.cpp +++ b/searchlib/src/tests/features/constant/constant_test.cpp @@ -1,7 +1,5 @@ // 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 <iostream> #include <vespa/searchlib/features/setup.h> #include <vespa/searchlib/fef/fef.h> #include <vespa/searchlib/fef/test/ftlib.h> @@ -13,6 +11,8 @@ #include <vespa/eval/eval/value.h> #include <vespa/eval/eval/test/value_compare.h> #include <vespa/vespalib/util/stringfmt.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using search::feature_t; using namespace search::fef; @@ -28,8 +28,7 @@ using vespalib::eval::Value; using vespalib::eval::ValueType; using vespalib::make_string_short::fmt; -namespace -{ +namespace { Value::UP make_tensor(const TensorSpec &spec) { return SimpleValue::from_spec(spec); diff --git a/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp b/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp index 735ec5d67b7..45b7f089445 100644 --- a/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp +++ b/searchlib/src/tests/features/native_dot_product/native_dot_product_test.cpp @@ -1,5 +1,4 @@ // 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/searchlib/features/setup.h> #include <vespa/searchlib/fef/test/indexenvironment.h> #include <vespa/searchlib/fef/test/indexenvironmentbuilder.h> @@ -9,6 +8,8 @@ #include <vespa/searchlib/query/weight.h> #include <vespa/searchlib/fef/test/dummy_dependency_handler.h> #include <vespa/vespalib/util/stringfmt.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using search::feature_t; using namespace search::fef; diff --git a/searchlib/src/tests/grouping/hyperloglog_test.cpp b/searchlib/src/tests/grouping/hyperloglog_test.cpp index 281bad55735..9df9d4322a1 100644 --- a/searchlib/src/tests/grouping/hyperloglog_test.cpp +++ b/searchlib/src/tests/grouping/hyperloglog_test.cpp @@ -1,13 +1,14 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. // Unit tests for hyperloglog. -#include <vespa/log/log.h> -LOG_SETUP("hyperloglog_test"); - #include <vespa/searchlib/grouping/hyperloglog.h> #include <vespa/vespalib/objects/nboserializer.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> + +#include <vespa/log/log.h> +LOG_SETUP("hyperloglog_test"); using vespalib::NBOSerializer; using vespalib::nbostream; diff --git a/searchlib/src/tests/grouping/sketch_test.cpp b/searchlib/src/tests/grouping/sketch_test.cpp index ae1052e9f59..38ca80b2171 100644 --- a/searchlib/src/tests/grouping/sketch_test.cpp +++ b/searchlib/src/tests/grouping/sketch_test.cpp @@ -4,8 +4,9 @@ #include <vespa/searchlib/grouping/sketch.h> #include <vespa/vespalib/objects/nboserializer.h> #include <vespa/vespalib/objects/nbostream.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/stringfmt.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("sketch_test"); diff --git a/searchlib/src/tests/predicate/predicate_index_test.cpp b/searchlib/src/tests/predicate/predicate_index_test.cpp index d0af12f93c7..5a48e696af8 100644 --- a/searchlib/src/tests/predicate/predicate_index_test.cpp +++ b/searchlib/src/tests/predicate/predicate_index_test.cpp @@ -5,12 +5,13 @@ #include <vespa/searchlib/predicate/simple_index.hpp> #include <vespa/searchlib/predicate/predicate_tree_annotator.h> #include <vespa/searchlib/util/data_buffer_writer.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/searchlib/attribute/predicate_attribute.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/btree/btreeroot.hpp> #include <vespa/vespalib/btree/btreeiterator.hpp> #include <vespa/vespalib/btree/btreestore.hpp> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace search; using namespace search::predicate; diff --git a/searchlib/src/tests/predicate/predicate_interval_store_test.cpp b/searchlib/src/tests/predicate/predicate_interval_store_test.cpp index d8c9691d421..9dd9a0cefe9 100644 --- a/searchlib/src/tests/predicate/predicate_interval_store_test.cpp +++ b/searchlib/src/tests/predicate/predicate_interval_store_test.cpp @@ -2,10 +2,10 @@ // Unit tests for predicate_interval_store. #include <vespa/searchlib/predicate/predicate_interval_store.h> - #include <vespa/searchlib/predicate/predicate_index.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vector> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace search; using namespace search::predicate; diff --git a/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp b/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp index 77d0099afdb..e88dfa3f386 100644 --- a/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp +++ b/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp @@ -1,6 +1,5 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "mysearch.h" -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/searchlib/queryeval/flow.h> #include <vespa/searchlib/queryeval/blueprint.h> #include <vespa/searchlib/queryeval/intermediate_blueprints.h> @@ -8,6 +7,8 @@ #include <vespa/vespalib/objects/visit.h> #include <vespa/vespalib/data/slime/slime.h> #include <algorithm> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("blueprint_test"); diff --git a/searchlib/src/tests/queryeval/same_element/same_element_test.cpp b/searchlib/src/tests/queryeval/same_element/same_element_test.cpp index 9d93ade71d9..2bb255e2a1d 100644 --- a/searchlib/src/tests/queryeval/same_element/same_element_test.cpp +++ b/searchlib/src/tests/queryeval/same_element/same_element_test.cpp @@ -1,6 +1,5 @@ // 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/vespalib/util/stringfmt.h> #include <vespa/searchlib/queryeval/leaf_blueprints.h> #include <vespa/searchlib/queryeval/simpleresult.h> @@ -9,6 +8,8 @@ #include <vespa/searchcommon/attribute/i_search_context.h> #include <vespa/searchlib/attribute/searchcontextelementiterator.h> #include <vespa/vespalib/test/insertion_operators.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace search::fef; using namespace search::queryeval; diff --git a/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp b/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp index f4de5bb0086..460de0b3cc7 100644 --- a/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp +++ b/searchlib/src/tests/queryeval/weak_and/wand_bench_setup.hpp @@ -1,5 +1,6 @@ // 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 "rise_wand.h" +#include "rise_wand.hpp" #include <vespa/searchlib/queryeval/andsearch.h> #include <vespa/searchlib/queryeval/andnotsearch.h> #include <vespa/searchlib/queryeval/fake_search.h> @@ -11,8 +12,8 @@ #include <vespa/searchlib/fef/termfieldmatchdata.h> #include <vespa/searchlib/fef/termfieldmatchdataarray.h> #include <vespa/vespalib/util/stringfmt.h> -#include "rise_wand.h" -#include "rise_wand.hpp" +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace search::fef; using namespace search::queryeval; diff --git a/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp b/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp index 4fdcc7f1d8a..6c6ca7ce543 100644 --- a/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp +++ b/searchlib/src/tests/ranksetup/verify_feature/verify_feature_test.cpp @@ -1,5 +1,4 @@ // 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/searchlib/fef/fef.h> #include <vespa/searchlib/fef/test/indexenvironment.h> #include <vespa/searchlib/fef/test/plugin/setup.h> @@ -7,6 +6,8 @@ #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/stllike/asciistream.h> #include <regex> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace search::features; using namespace search::fef::test; diff --git a/searchlib/src/tests/searchcommon/attribute/config/attribute_config_test.cpp b/searchlib/src/tests/searchcommon/attribute/config/attribute_config_test.cpp index 085fe8d3149..5a24f55c953 100644 --- a/searchlib/src/tests/searchcommon/attribute/config/attribute_config_test.cpp +++ b/searchlib/src/tests/searchcommon/attribute/config/attribute_config_test.cpp @@ -1,7 +1,8 @@ // 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/searchcommon/attribute/config.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using search::attribute::Config; using search::attribute::BasicType; diff --git a/searchlib/src/tests/tensor/dense_tensor_store/dense_tensor_store_test.cpp b/searchlib/src/tests/tensor/dense_tensor_store/dense_tensor_store_test.cpp index 0e173691f99..498d1f673b0 100644 --- a/searchlib/src/tests/tensor/dense_tensor_store/dense_tensor_store_test.cpp +++ b/searchlib/src/tests/tensor/dense_tensor_store/dense_tensor_store_test.cpp @@ -1,6 +1,5 @@ // 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/searchlib/tensor/dense_tensor_store.h> #include <vespa/eval/eval/simple_value.h> #include <vespa/eval/eval/tensor_spec.h> @@ -9,6 +8,9 @@ #include <vespa/eval/eval/test/value_compare.h> #include <vespa/vespalib/util/size_literals.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> + #include <vespa/log/log.h> LOG_SETUP("dense_tensor_store_test"); diff --git a/searchlib/src/tests/transactionlog/chunks_test.cpp b/searchlib/src/tests/transactionlog/chunks_test.cpp index e057e853d0d..144dffc82fe 100644 --- a/searchlib/src/tests/transactionlog/chunks_test.cpp +++ b/searchlib/src/tests/transactionlog/chunks_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/searchlib/transactionlog/chunks.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <atomic> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("translog_chunks_test"); diff --git a/searchlib/src/tests/util/slime_output_raw_buf_adapter/slime_output_raw_buf_adapter_test.cpp b/searchlib/src/tests/util/slime_output_raw_buf_adapter/slime_output_raw_buf_adapter_test.cpp index 9c9c28f6b8b..c9e52d9e845 100644 --- a/searchlib/src/tests/util/slime_output_raw_buf_adapter/slime_output_raw_buf_adapter_test.cpp +++ b/searchlib/src/tests/util/slime_output_raw_buf_adapter/slime_output_raw_buf_adapter_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/searchlib/util/slime_output_raw_buf_adapter.h> #include <vespa/vespalib/data/slime/slime.h> #include <vespa/vespalib/util/size_literals.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace search; using namespace vespalib::slime::convenience; diff --git a/searchlib/src/vespa/searchlib/test/ft_test_app_base.cpp b/searchlib/src/vespa/searchlib/test/ft_test_app_base.cpp index 1b60ca2cd33..6e7ba5366be 100644 --- a/searchlib/src/vespa/searchlib/test/ft_test_app_base.cpp +++ b/searchlib/src/vespa/searchlib/test/ft_test_app_base.cpp @@ -3,6 +3,7 @@ #include "ft_test_app_base.h" #include <vespa/searchlib/fef/test/dummy_dependency_handler.h> #include <vespa/vespalib/util/stringfmt.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP(".ft_test_app_base"); diff --git a/vbench/src/tests/app_vbench/app_vbench_test.cpp b/vbench/src/tests/app_vbench/app_vbench_test.cpp index 97ab828fc66..7353784fb96 100644 --- a/vbench/src/tests/app_vbench/app_vbench_test.cpp +++ b/vbench/src/tests/app_vbench/app_vbench_test.cpp @@ -1,5 +1,6 @@ // 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/vespalib/testkit/test_master.hpp> #include <vbench/test/all.h> #include <vespa/vespalib/process/process.h> #include <vespa/vespalib/net/crypto_engine.h> diff --git a/vbench/src/tests/dropped_tagger/dropped_tagger_test.cpp b/vbench/src/tests/dropped_tagger/dropped_tagger_test.cpp index 09c2d475224..d35d4ea33da 100644 --- a/vbench/src/tests/dropped_tagger/dropped_tagger_test.cpp +++ b/vbench/src/tests/dropped_tagger/dropped_tagger_test.cpp @@ -1,11 +1,12 @@ // 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/vespalib/testkit/test_master.hpp> #include <vbench/test/all.h> using namespace vbench; TEST_FF("dropped tagger", RequestReceptor(), DroppedTagger(f1)) { - Request::UP req(new Request()); + auto req = std::make_unique<Request>(); EXPECT_EQUAL(Request::STATUS_OK, req->status()); f2.handle(std::move(req)); ASSERT_TRUE(f1.request.get() != 0); diff --git a/vespalib/src/tests/array/array_test.cpp b/vespalib/src/tests/array/array_test.cpp index 5446130d5d9..75050612357 100644 --- a/vespalib/src/tests/array/array_test.cpp +++ b/vespalib/src/tests/array/array_test.cpp @@ -3,6 +3,7 @@ #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/test/memory_allocator_observer.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/vespalib/util/array.hpp> #include <vespa/vespalib/util/round_up_to_page_size.h> #include <vespa/vespalib/util/size_literals.h> @@ -37,7 +38,7 @@ using AllocStats = MyMemoryAllocator::Stats; class Clever { public: Clever() : _counter(&_global) { (*_counter)++; } - Clever(std::atomic<size_t> * counter) : + explicit Clever(std::atomic<size_t> * counter) : _counter(counter) { (*_counter)++; @@ -224,7 +225,7 @@ testBeginEnd(T & v) EXPECT_EQUAL(1u, *(v.begin())); EXPECT_EQUAL(3u, *(v.end() - 1)); - typename T::iterator i(v.begin()); + auto i(v.begin()); EXPECT_EQUAL(1u, *i); EXPECT_EQUAL(2u, *(i+1)); EXPECT_EQUAL(1u, *i++); @@ -249,7 +250,7 @@ testBeginEnd(T & v) EXPECT_EQUAL(3u, *(v.rbegin())); EXPECT_EQUAL(1u, *(v.rend() - 1)); - typename T::reverse_iterator r(v.rbegin()); + auto r(v.rbegin()); EXPECT_EQUAL(3u, *r); EXPECT_EQUAL(2u, *(r+1)); EXPECT_EQUAL(3u, *r++); diff --git a/vespalib/src/tests/arrayqueue/arrayqueue.cpp b/vespalib/src/tests/arrayqueue/arrayqueue.cpp index c00cca17c78..657d379167f 100644 --- a/vespalib/src/tests/arrayqueue/arrayqueue.cpp +++ b/vespalib/src/tests/arrayqueue/arrayqueue.cpp @@ -1,5 +1,6 @@ // 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/vespalib/testkit/test_master.hpp> #include <vespa/vespalib/util/arrayqueue.hpp> using namespace vespalib; diff --git a/vespalib/src/tests/compression/compression_test.cpp b/vespalib/src/tests/compression/compression_test.cpp index 2257b57dc7e..3d8aeb02a81 100644 --- a/vespalib/src/tests/compression/compression_test.cpp +++ b/vespalib/src/tests/compression/compression_test.cpp @@ -1,6 +1,7 @@ // 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/vespalib/testkit/test_master.hpp> #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/util/compressor.h> #include <vespa/vespalib/data/databuffer.h> diff --git a/vespalib/src/tests/directio/directio.cpp b/vespalib/src/tests/directio/directio.cpp index 01d6be84516..7362c33c7b6 100644 --- a/vespalib/src/tests/directio/directio.cpp +++ b/vespalib/src/tests/directio/directio.cpp @@ -15,7 +15,7 @@ TEST("that DirectIOException propagates the correct information.") { EXPECT_EQUAL(3u, e.getOffset()); EXPECT_EQUAL(msg, e.getBuffer()); EXPECT_EQUAL(0u, string(e.what()).find("DirectIO failed for file 'file.a' buffer=")); - EXPECT_EQUAL(string("file.a"), e.getFileName()); + EXPECT_EQUAL("file.a", e.getFileName()); } TEST("that DirectIOException is thrown on unaligned buf.") { @@ -30,7 +30,7 @@ TEST("that DirectIOException is thrown on unaligned buf.") { EXPECT_EQUAL(4_Ki, e.getLength()); EXPECT_EQUAL(0u, e.getOffset()); EXPECT_EQUAL(buf.getFree()+1, e.getBuffer()); - EXPECT_EQUAL(string(f.GetFileName()), e.getFileName()); + EXPECT_EQUAL(f.GetFileName(), e.getFileName()); caught = true; } EXPECT_TRUE(caught); @@ -48,7 +48,7 @@ TEST("that DirectIOException is thrown on unaligned offset.") { EXPECT_EQUAL(4_Ki, e.getLength()); EXPECT_EQUAL(1u, e.getOffset()); EXPECT_EQUAL(buf.getFree(), e.getBuffer()); - EXPECT_EQUAL(string(f.GetFileName()), e.getFileName()); + EXPECT_EQUAL(f.GetFileName(), e.getFileName()); caught = true; } EXPECT_TRUE(caught); diff --git a/vespalib/src/tests/fastlib/text/unicodeutiltest.cpp b/vespalib/src/tests/fastlib/text/unicodeutiltest.cpp index 7e8b52e6b30..6e86197bd3a 100644 --- a/vespalib/src/tests/fastlib/text/unicodeutiltest.cpp +++ b/vespalib/src/tests/fastlib/text/unicodeutiltest.cpp @@ -2,6 +2,7 @@ #include <vespa/fastlib/text/unicodeutil.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> TEST("GetUTF8Char_WrongInput") { const char *testdata = "ab\xF8"; @@ -15,17 +16,4 @@ TEST("GetUTF8Char_WrongInput") { EXPECT_EQUAL(Fast_UnicodeUtil::_BadUTF8Char, the_char); } -TEST("IsTerminalPunctuationChar") { - // test a small selection - - EXPECT_TRUE(Fast_UnicodeUtil::IsTerminalPunctuationChar('!')); - EXPECT_TRUE(Fast_UnicodeUtil::IsTerminalPunctuationChar(',')); - EXPECT_TRUE(Fast_UnicodeUtil::IsTerminalPunctuationChar('.')); - EXPECT_TRUE(Fast_UnicodeUtil::IsTerminalPunctuationChar(':')); - EXPECT_TRUE(Fast_UnicodeUtil::IsTerminalPunctuationChar(';')); - EXPECT_FALSE(Fast_UnicodeUtil::IsTerminalPunctuationChar(' ')); - EXPECT_FALSE(Fast_UnicodeUtil::IsTerminalPunctuationChar('a')); - EXPECT_FALSE(Fast_UnicodeUtil::IsTerminalPunctuationChar('A')); -} - TEST_MAIN() { TEST_RUN_ALL(); } diff --git a/vespalib/src/tests/io/fileutil/fileutiltest.cpp b/vespalib/src/tests/io/fileutil/fileutiltest.cpp index 8e08c8c88bb..51b755e1668 100644 --- a/vespalib/src/tests/io/fileutil/fileutiltest.cpp +++ b/vespalib/src/tests/io/fileutil/fileutiltest.cpp @@ -1,6 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/io/fileutil.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <filesystem> #include <iostream> #include <vector> diff --git a/vespalib/src/tests/memory/memory_test.cpp b/vespalib/src/tests/memory/memory_test.cpp index be413fd1a95..59d1cbe059d 100644 --- a/vespalib/src/tests/memory/memory_test.cpp +++ b/vespalib/src/tests/memory/memory_test.cpp @@ -1,6 +1,7 @@ // 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/vespalib/testkit/test_master.hpp> #include <vespa/vespalib/util/memory.h> using namespace vespalib; diff --git a/vespalib/src/tests/net/tls/capabilities/capabilities_test.cpp b/vespalib/src/tests/net/tls/capabilities/capabilities_test.cpp index 4a20f907fe6..aeaff93ffe9 100644 --- a/vespalib/src/tests/net/tls/capabilities/capabilities_test.cpp +++ b/vespalib/src/tests/net/tls/capabilities/capabilities_test.cpp @@ -2,6 +2,7 @@ #include <vespa/vespalib/net/tls/capability_set.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace vespalib; using namespace vespalib::net::tls; diff --git a/vespalib/src/tests/net/tls/openssl_impl/openssl_impl_test.cpp b/vespalib/src/tests/net/tls/openssl_impl/openssl_impl_test.cpp index 6d5c5fa6308..0912afde250 100644 --- a/vespalib/src/tests/net/tls/openssl_impl/openssl_impl_test.cpp +++ b/vespalib/src/tests/net/tls/openssl_impl/openssl_impl_test.cpp @@ -1,7 +1,6 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/crypto/private_key.h> #include <vespa/vespalib/crypto/x509_certificate.h> -#include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/data/smart_buffer.h> #include <vespa/vespalib/net/tls/authorization_mode.h> #include <vespa/vespalib/net/tls/crypto_codec.h> @@ -14,7 +13,8 @@ #include <vespa/vespalib/test/peer_policy_utils.h> #include <vespa/vespalib/util/size_literals.h> #include <stdexcept> -#include <stdlib.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace vespalib; using namespace vespalib::crypto; diff --git a/vespalib/src/tests/net/tls/policy_checking_certificate_verifier/policy_checking_certificate_verifier_test.cpp b/vespalib/src/tests/net/tls/policy_checking_certificate_verifier/policy_checking_certificate_verifier_test.cpp index 26db06e35f1..b80151e9ccf 100644 --- a/vespalib/src/tests/net/tls/policy_checking_certificate_verifier/policy_checking_certificate_verifier_test.cpp +++ b/vespalib/src/tests/net/tls/policy_checking_certificate_verifier/policy_checking_certificate_verifier_test.cpp @@ -3,6 +3,7 @@ #include <vespa/vespalib/net/tls/policy_checking_certificate_verifier.h> #include <vespa/vespalib/test/peer_policy_utils.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace vespalib; using namespace vespalib::net::tls; diff --git a/vespalib/src/tests/net/tls/protocol_snooping/protocol_snooping_test.cpp b/vespalib/src/tests/net/tls/protocol_snooping/protocol_snooping_test.cpp index 01e6113064a..a5fe850d85d 100644 --- a/vespalib/src/tests/net/tls/protocol_snooping/protocol_snooping_test.cpp +++ b/vespalib/src/tests/net/tls/protocol_snooping/protocol_snooping_test.cpp @@ -1,5 +1,6 @@ // 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/vespalib/testkit/test_master.hpp> #include <vespa/vespalib/net/tls/protocol_snooping.h> using namespace vespalib; diff --git a/vespalib/src/tests/objects/nbostream/nbostream_test.cpp b/vespalib/src/tests/objects/nbostream/nbostream_test.cpp index a2501b836ce..91c83656353 100644 --- a/vespalib/src/tests/objects/nbostream/nbostream_test.cpp +++ b/vespalib/src/tests/objects/nbostream/nbostream_test.cpp @@ -1,6 +1,7 @@ // 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/vespalib/testkit/test_master.hpp> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/objects/hexdump.h> #include <vespa/vespalib/test/insertion_operators.h> diff --git a/vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp b/vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp index 62b7dc5f179..58027e35601 100644 --- a/vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp +++ b/vespalib/src/tests/polymorphicarray/polymorphicarray_test.cpp @@ -1,6 +1,7 @@ // 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/vespalib/testkit/test_master.hpp> #include <vespa/vespalib/util/polymorphicarrays.h> #include <cassert> diff --git a/vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp b/vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp index bcd8ddb24f5..ef13421a6ec 100644 --- a/vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp +++ b/vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp @@ -3,6 +3,7 @@ #include <vespa/vespalib/util/adaptive_sequenced_executor.h> #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/test/insertion_operators.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <condition_variable> #include <unistd.h> diff --git a/vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp b/vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp index 474df9bdf3b..beed490c214 100644 --- a/vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp +++ b/vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp @@ -6,6 +6,7 @@ #include <vespa/vespalib/util/singleexecutor.h> #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/test/insertion_operators.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <condition_variable> #include <unistd.h> diff --git a/vespalib/src/tests/sha1/sha1_test.cpp b/vespalib/src/tests/sha1/sha1_test.cpp index d7777189074..df7dc423b00 100644 --- a/vespalib/src/tests/sha1/sha1_test.cpp +++ b/vespalib/src/tests/sha1/sha1_test.cpp @@ -1,7 +1,8 @@ // 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 "rfc_sha1.h" +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/vespalib/util/sha1.h> #include <vespa/vespalib/stllike/string.h> diff --git a/vespalib/src/tests/singleexecutor/singleexecutor_test.cpp b/vespalib/src/tests/singleexecutor/singleexecutor_test.cpp index 224a4a95afe..e20b42601c5 100644 --- a/vespalib/src/tests/singleexecutor/singleexecutor_test.cpp +++ b/vespalib/src/tests/singleexecutor/singleexecutor_test.cpp @@ -82,7 +82,7 @@ void verifyResizeTaskLimit(bool up) { EXPECT_EQUAL(1u, started); executor.setTaskLimit(targetTaskLimit); EXPECT_EQUAL(INITIAL_2inN, executor.getTaskLimit()); - EXPECT_EQUAL(INITIAL_2inN*waterMarkRatio, executor.get_watermark()); + EXPECT_EQUAL(INITIAL_2inN*waterMarkRatio, static_cast<double>(executor.get_watermark())); allowed = 5; while (started < 6); EXPECT_EQUAL(6u, started); @@ -101,7 +101,7 @@ void verifyResizeTaskLimit(bool up) { while (started < INITIAL + 1); EXPECT_EQUAL(INITIAL + 1, started); EXPECT_EQUAL(roundedTaskLimit, executor.getTaskLimit()); - EXPECT_EQUAL(roundedTaskLimit*waterMarkRatio, executor.get_watermark()); + EXPECT_EQUAL(roundedTaskLimit*waterMarkRatio, static_cast<double>(executor.get_watermark())); allowed = INITIAL + 1; } diff --git a/vespalib/src/tests/slime/slime_binary_format_test.cpp b/vespalib/src/tests/slime/slime_binary_format_test.cpp index 888016caf5f..31fa6037877 100644 --- a/vespalib/src/tests/slime/slime_binary_format_test.cpp +++ b/vespalib/src/tests/slime/slime_binary_format_test.cpp @@ -1,9 +1,10 @@ // 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 "type_traits.h" #include <vespa/vespalib/data/slime/slime.h> #include <vespa/vespalib/data/simple_buffer.h> -#include "type_traits.h" #include <vespa/vespalib/util/stringfmt.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace vespalib::slime::convenience; using namespace vespalib::slime::binary_format; diff --git a/vespalib/src/tests/slime/slime_inject_test.cpp b/vespalib/src/tests/slime/slime_inject_test.cpp index a9274e3073d..be9303879bd 100644 --- a/vespalib/src/tests/slime/slime_inject_test.cpp +++ b/vespalib/src/tests/slime/slime_inject_test.cpp @@ -1,7 +1,8 @@ // 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/vespalib/data/slime/slime.h> #include <vespa/vespalib/data/slime/strfmt.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace vespalib::slime::convenience; diff --git a/vespalib/src/tests/slime/slime_test.cpp b/vespalib/src/tests/slime/slime_test.cpp index d2d1e368715..68c91fc900b 100644 --- a/vespalib/src/tests/slime/slime_test.cpp +++ b/vespalib/src/tests/slime/slime_test.cpp @@ -1,6 +1,5 @@ // 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/vespalib/data/slime/slime.h> #include <vespa/vespalib/data/slime/object_value.h> #include <vespa/vespalib/data/slime/array_value.h> @@ -9,6 +8,8 @@ #include <vespa/vespalib/data/slime/symbol_table.h> #include <vespa/vespalib/data/slime/basic_value.h> #include <type_traits> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> #include <vespa/log/log.h> LOG_SETUP("slime_test"); diff --git a/vespalib/src/tests/state_server/state_server_test.cpp b/vespalib/src/tests/state_server/state_server_test.cpp index 6c248b54cc8..18dc54188ef 100644 --- a/vespalib/src/tests/state_server/state_server_test.cpp +++ b/vespalib/src/tests/state_server/state_server_test.cpp @@ -1,6 +1,5 @@ // 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/vespalib/net/connection_auth_context.h> #include <vespa/vespalib/net/http/state_server.h> #include <vespa/vespalib/net/http/simple_health_producer.h> @@ -13,6 +12,8 @@ #include <vespa/vespalib/util/host_name.h> #include <vespa/vespalib/process/process.h> #include <sys/stat.h> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace vespalib; diff --git a/vespalib/src/tests/stllike/hash_test.cpp b/vespalib/src/tests/stllike/hash_test.cpp index 592fc72edeb..0f5bbf29042 100644 --- a/vespalib/src/tests/stllike/hash_test.cpp +++ b/vespalib/src/tests/stllike/hash_test.cpp @@ -1,6 +1,5 @@ // 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/vespalib/stllike/hash_set.hpp> #include <vespa/vespalib/stllike/hash_map.hpp> #include <vespa/vespalib/stllike/hash_map_equal.hpp> @@ -8,6 +7,8 @@ #include <cstddef> #include <algorithm> #include <atomic> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace vespalib; using std::make_pair; diff --git a/vespalib/src/tests/testapp-generic/testapp-generic.cpp b/vespalib/src/tests/testapp-generic/testapp-generic.cpp index e63e78040fe..9b5a5c0426a 100644 --- a/vespalib/src/tests/testapp-generic/testapp-generic.cpp +++ b/vespalib/src/tests/testapp-generic/testapp-generic.cpp @@ -1,7 +1,8 @@ // 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/vespalib/util/stringfmt.h> #include <stdexcept> +#include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/test_master.hpp> using namespace vespalib; diff --git a/vespalib/src/vespa/fastlib/text/unicodeutil.h b/vespalib/src/vespa/fastlib/text/unicodeutil.h index 740cc9381b7..dd0c13738c6 100644 --- a/vespalib/src/vespa/fastlib/text/unicodeutil.h +++ b/vespalib/src/vespa/fastlib/text/unicodeutil.h @@ -41,8 +41,7 @@ private: _wordcharProp = 2, _ideographicProp = 4, _decimalDigitCharProp = 8, - _ignorableControlCharProp = 16, - _terminalPunctuationCharProp = 32 + _ignorableControlCharProp = 16 }; public: @@ -212,18 +211,6 @@ public: static int utf8cmp(const char *s1, const ucs4_t *s2) noexcept; /** - * Test for terminal punctuation. - * @param testchar the UCS4 character to test. - * @return true if testchar is a terminal punctuation character, - * i.e. if it has the terminal punctuation char property. - */ - static bool IsTerminalPunctuationChar(ucs4_t testchar) noexcept { - return (testchar < 65536 && - (_compCharProps[testchar >> 8][testchar & 255] & - _terminalPunctuationCharProp) != 0); - } - - /** * Get the next UCS4 character from an UTF-8 string buffer. * We assume that the first character in the UTF-8 string is >= 0x80 (non-ascii). * Modify the src pointer to allow future calls. diff --git a/vespalib/src/vespa/vespalib/testkit/test_kit.h b/vespalib/src/vespa/vespalib/testkit/test_kit.h index 5c86b88105d..bddc2e2622c 100644 --- a/vespalib/src/vespa/vespalib/testkit/test_kit.h +++ b/vespalib/src/vespa/vespalib/testkit/test_kit.h @@ -10,3 +10,4 @@ #include "test_hook.h" #include "test_state_guard.h" #include <vespa/vespalib/util/time.h> +#include "test_master.hpp" diff --git a/vespalib/src/vespa/vespalib/testkit/test_master.cpp b/vespalib/src/vespa/vespalib/testkit/test_master.cpp index 89a968cf990..c0587ae841b 100644 --- a/vespalib/src/vespa/vespalib/testkit/test_master.cpp +++ b/vespalib/src/vespa/vespalib/testkit/test_master.cpp @@ -1,6 +1,6 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include "test_master.h" +#include "test_master.hpp" #include <vespa/vespalib/util/barrier.h> #include <vespa/vespalib/util/signalhandler.h> #include <cstring> diff --git a/vespalib/src/vespa/vespalib/testkit/test_master.h b/vespalib/src/vespa/vespalib/testkit/test_master.h index 70d2b441b51..85684f9458f 100644 --- a/vespalib/src/vespa/vespalib/testkit/test_master.h +++ b/vespalib/src/vespa/vespalib/testkit/test_master.h @@ -12,7 +12,6 @@ namespace vespalib { class Barrier; -#ifndef IAM_DOXYGEN /** * The master of testing. **/ @@ -123,9 +122,5 @@ public: bool discardFailedChecks(size_t failCnt); bool fini(); }; -#endif } // namespace vespalib - -#include "test_master.hpp" - diff --git a/vespalib/src/vespa/vespalib/testkit/test_master.hpp b/vespalib/src/vespa/vespalib/testkit/test_master.hpp index ba5dc54e965..a5e25b7336b 100644 --- a/vespalib/src/vespa/vespalib/testkit/test_master.hpp +++ b/vespalib/src/vespa/vespalib/testkit/test_master.hpp @@ -1,5 +1,8 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#pragma once +#include "test_master.h" + #include <sstream> namespace vespalib { |