diff options
Diffstat (limited to 'searchsummary/src/tests')
5 files changed, 14 insertions, 12 deletions
diff --git a/searchsummary/src/tests/docsumformat/docsum-pack.cpp b/searchsummary/src/tests/docsumformat/docsum-pack.cpp index ed1ba23017c..07aceea83e0 100644 --- a/searchsummary/src/tests/docsumformat/docsum-pack.cpp +++ b/searchsummary/src/tests/docsumformat/docsum-pack.cpp @@ -113,7 +113,7 @@ MyApp::Equal(GeneralResult *a, GeneralResult *b) void MyApp::TestIntValue(uint32_t line, GeneralResult *gres, const char *field, uint32_t value) { - ResEntry *entry = (gres != nullptr) ? gres->GetEntry(field) : nullptr; + ResEntry *entry = (gres != nullptr) ? gres->GetPresentEntry(field) : nullptr; bool rc = (entry != nullptr && entry->_type == RES_INT && @@ -125,7 +125,7 @@ MyApp::TestIntValue(uint32_t line, GeneralResult *gres, const char *field, uint3 void MyApp::TestDoubleValue(uint32_t line, GeneralResult *gres, const char *field, double value) { - ResEntry *entry = (gres != nullptr) ? gres->GetEntry(field) : nullptr; + ResEntry *entry = (gres != nullptr) ? gres->GetPresentEntry(field) : nullptr; bool rc = (entry != nullptr && entry->_type == RES_DOUBLE && @@ -137,7 +137,7 @@ MyApp::TestDoubleValue(uint32_t line, GeneralResult *gres, const char *field, do void MyApp::TestInt64Value(uint32_t line, GeneralResult *gres, const char *field, uint64_t value) { - ResEntry *entry = (gres != nullptr) ? gres->GetEntry(field) : nullptr; + ResEntry *entry = (gres != nullptr) ? gres->GetPresentEntry(field) : nullptr; bool rc = (entry != nullptr && entry->_type == RES_INT64 && @@ -150,7 +150,7 @@ MyApp::TestInt64Value(uint32_t line, GeneralResult *gres, const char *field, uin void MyApp::TestStringValue(uint32_t line, GeneralResult *gres, const char *field, const char *value) { - ResEntry *entry = (gres != nullptr) ? gres->GetEntry(field) : nullptr; + ResEntry *entry = (gres != nullptr) ? gres->GetPresentEntry(field) : nullptr; bool rc = (entry != nullptr && entry->_type == RES_STRING && @@ -168,7 +168,7 @@ MyApp::TestStringValue(uint32_t line, GeneralResult *gres, const char *field, co void MyApp::TestDataValue(uint32_t line, GeneralResult *gres, const char *field, const char *value) { - ResEntry *entry = (gres != nullptr) ? gres->GetEntry(field) : nullptr; + ResEntry *entry = (gres != nullptr) ? gres->GetPresentEntry(field) : nullptr; bool rc = (entry != nullptr && entry->_type == RES_DATA && diff --git a/searchsummary/src/tests/docsummary/attribute_combiner/attribute_combiner_test.cpp b/searchsummary/src/tests/docsummary/attribute_combiner/attribute_combiner_test.cpp index d5a908fc8bd..7265dd89be4 100644 --- a/searchsummary/src/tests/docsummary/attribute_combiner/attribute_combiner_test.cpp +++ b/searchsummary/src/tests/docsummary/attribute_combiner/attribute_combiner_test.cpp @@ -5,7 +5,7 @@ #include <vespa/searchlib/common/matching_elements.h> #include <vespa/searchlib/common/matching_elements_fields.h> #include <vespa/searchlib/util/slime_output_raw_buf_adapter.h> -#include <vespa/searchsummary/docsummary/docsumfieldwriter.h> +#include <vespa/searchsummary/docsummary/docsum_field_writer.h> #include <vespa/searchsummary/docsummary/docsumstate.h> #include <vespa/searchsummary/docsummary/docsum_field_writer_state.h> #include <vespa/searchsummary/docsummary/attribute_combiner_dfw.h> @@ -24,7 +24,7 @@ using search::docsummary::AttributeCombinerDFW; using search::docsummary::GetDocsumsState; using search::docsummary::GetDocsumsStateCallback; using search::docsummary::IDocsumEnvironment; -using search::docsummary::IDocsumFieldWriter; +using search::docsummary::DocsumFieldWriter; using search::docsummary::test::MockAttributeManager; using search::docsummary::test::MockStateCallback; using search::docsummary::test::SlimeValue; @@ -34,7 +34,7 @@ namespace { struct AttributeCombinerTest : public ::testing::Test { MockAttributeManager attrs; - std::unique_ptr<IDocsumFieldWriter> writer; + std::unique_ptr<DocsumFieldWriter> writer; MockStateCallback callback; GetDocsumsState state; std::shared_ptr<search::MatchingElementsFields> _matching_elems_fields; diff --git a/searchsummary/src/tests/docsummary/attributedfw/attributedfw_test.cpp b/searchsummary/src/tests/docsummary/attributedfw/attributedfw_test.cpp index 67d505582d8..42443cf1058 100644 --- a/searchsummary/src/tests/docsummary/attributedfw/attributedfw_test.cpp +++ b/searchsummary/src/tests/docsummary/attributedfw/attributedfw_test.cpp @@ -16,7 +16,7 @@ using search::attribute::BasicType; using search::attribute::CollectionType; using search::docsummary::AttributeDFWFactory; using search::docsummary::GetDocsumsState; -using search::docsummary::IDocsumFieldWriter; +using search::docsummary::DocsumFieldWriter; using search::docsummary::test::MockAttributeManager; using search::docsummary::test::MockStateCallback; using search::docsummary::test::SlimeValue; @@ -26,7 +26,7 @@ using ElementVector = std::vector<uint32_t>; class AttributeDFWTest : public ::testing::Test { protected: MockAttributeManager _attrs; - std::unique_ptr<IDocsumFieldWriter> _writer; + std::unique_ptr<DocsumFieldWriter> _writer; MockStateCallback _callback; GetDocsumsState _state; std::shared_ptr<search::MatchingElementsFields> _matching_elems_fields; diff --git a/searchsummary/src/tests/docsummary/matched_elements_filter/matched_elements_filter_test.cpp b/searchsummary/src/tests/docsummary/matched_elements_filter/matched_elements_filter_test.cpp index 675af283ee8..82aa9ceba92 100644 --- a/searchsummary/src/tests/docsummary/matched_elements_filter/matched_elements_filter_test.cpp +++ b/searchsummary/src/tests/docsummary/matched_elements_filter/matched_elements_filter_test.cpp @@ -16,8 +16,10 @@ #include <vespa/searchlib/common/matching_elements_fields.h> #include <vespa/searchlib/util/slime_output_raw_buf_adapter.h> #include <vespa/searchsummary/docsummary/docsum_store_document.h> +#include <vespa/searchsummary/docsummary/docsumstorevalue.h> #include <vespa/searchsummary/docsummary/docsumstate.h> #include <vespa/searchsummary/docsummary/idocsumenvironment.h> +#include <vespa/searchsummary/docsummary/general_result.h> #include <vespa/searchsummary/docsummary/matched_elements_filter_dfw.h> #include <vespa/searchsummary/docsummary/resultconfig.h> #include <vespa/searchsummary/docsummary/resultpacker.h> @@ -215,7 +217,7 @@ public: { } ~MatchedElementsFilterTest(); - std::unique_ptr<IDocsumFieldWriter> make_field_writer(const std::string& input_field_name) { + std::unique_ptr<DocsumFieldWriter> make_field_writer(const std::string& input_field_name) { int input_field_enum = _doc_store.get_config().GetFieldNameEnum().Lookup(input_field_name.c_str()); return MatchedElementsFilterDFW::create(input_field_name, input_field_enum, _attr_ctx, _fields); diff --git a/searchsummary/src/tests/docsummary/positionsdfw_test.cpp b/searchsummary/src/tests/docsummary/positionsdfw_test.cpp index 11f0d0eb6d6..60584b26e31 100644 --- a/searchsummary/src/tests/docsummary/positionsdfw_test.cpp +++ b/searchsummary/src/tests/docsummary/positionsdfw_test.cpp @@ -4,7 +4,7 @@ #include <vespa/searchlib/attribute/extendableattributes.h> #include <vespa/searchlib/attribute/iattributemanager.h> #include <vespa/searchlib/common/matching_elements.h> -#include <vespa/searchsummary/docsummary/docsumfieldwriter.h> +#include <vespa/searchsummary/docsummary/docsum_field_writer.h> #include <vespa/searchsummary/docsummary/positionsdfw.h> #include <vespa/searchsummary/docsummary/idocsumenvironment.h> #include <vespa/searchsummary/docsummary/docsumstate.h> |