diff options
Diffstat (limited to 'searchlib/src/tests/attribute/searchable')
4 files changed, 31 insertions, 8 deletions
diff --git a/searchlib/src/tests/attribute/searchable/CMakeLists.txt b/searchlib/src/tests/attribute/searchable/CMakeLists.txt index c3af20cc673..7932450e2db 100644 --- a/searchlib/src/tests/attribute/searchable/CMakeLists.txt +++ b/searchlib/src/tests/attribute/searchable/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_executable(searchlib_attribute_searchable_adapter_test_app TEST SOURCES attribute_searchable_adapter_test.cpp diff --git a/searchlib/src/tests/attribute/searchable/attribute_searchable_adapter_test.cpp b/searchlib/src/tests/attribute/searchable/attribute_searchable_adapter_test.cpp index 2f3684874ee..03e338ee284 100644 --- a/searchlib/src/tests/attribute/searchable/attribute_searchable_adapter_test.cpp +++ b/searchlib/src/tests/attribute/searchable/attribute_searchable_adapter_test.cpp @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// 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> 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 6c6f05fd5e2..4ec73a1d313 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,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchlib/attribute/attribute_blueprint_factory.h> #include <vespa/searchlib/attribute/attribute_weighted_set_blueprint.h> @@ -182,6 +182,29 @@ TEST("attribute_weighted_set_test") { test_tokens(false, {3}); } +namespace { + +void +normalize_class_name_helper(vespalib::string& class_name, const vespalib::string& old, const vespalib::string& replacement) +{ + for (;;) { + auto pos = class_name.find(old); + if (pos == vespalib::string::npos) { + break; + } + class_name.replace(pos, old.size(), replacement); + } +} + +vespalib::string normalize_class_name(vespalib::string class_name) +{ + normalize_class_name_helper(class_name, "long long", "long"); + normalize_class_name_helper(class_name, ">>", "> >"); + return class_name; +} + +} + TEST("attribute_weighted_set_single_token_filter_lifted_out") { MockAttributeManager manager; setupAttributeManager(manager, true); @@ -191,13 +214,13 @@ TEST("attribute_weighted_set_single_token_filter_lifted_out") { WS ws = WS(manager).add("3", 30); EXPECT_EQUAL("search::FilterAttributeIteratorStrict<search::attribute::SingleNumericSearchContext<long, search::attribute::NumericMatcher<long> > >", - ws.createSearch(adapter, "integer", true)->getClassName()); + normalize_class_name(ws.createSearch(adapter, "integer", true)->getClassName())); EXPECT_EQUAL("search::FilterAttributeIteratorT<search::attribute::SingleNumericSearchContext<long, search::attribute::NumericMatcher<long> > >", - ws.createSearch(adapter, "integer", false)->getClassName()); + normalize_class_name(ws.createSearch(adapter, "integer", false)->getClassName())); EXPECT_EQUAL("search::FilterAttributeIteratorStrict<search::attribute::SingleEnumSearchContext<char const*, search::attribute::StringSearchContext> >", - ws.createSearch(adapter, "string", true)->getClassName()); + normalize_class_name(ws.createSearch(adapter, "string", true)->getClassName())); EXPECT_EQUAL("search::FilterAttributeIteratorT<search::attribute::SingleEnumSearchContext<char const*, search::attribute::StringSearchContext> >", - ws.createSearch(adapter, "string", false)->getClassName()); + normalize_class_name(ws.createSearch(adapter, "string", false)->getClassName())); EXPECT_TRUE(ws.isWeightedSetTermSearch(adapter, "multi", true)); EXPECT_TRUE(ws.isWeightedSetTermSearch(adapter, "multi", false)); diff --git a/searchlib/src/tests/attribute/searchable/attributeblueprint_test.cpp b/searchlib/src/tests/attribute/searchable/attributeblueprint_test.cpp index ed1e15e17e7..e618b091a7e 100644 --- a/searchlib/src/tests/attribute/searchable/attributeblueprint_test.cpp +++ b/searchlib/src/tests/attribute/searchable/attributeblueprint_test.cpp @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/eval/eval/tensor_spec.h> #include <vespa/eval/eval/value.h> |