diff options
Diffstat (limited to 'searchcore/src/tests/proton/server')
3 files changed, 9 insertions, 12 deletions
diff --git a/searchcore/src/tests/proton/server/documentretriever_test.cpp b/searchcore/src/tests/proton/server/documentretriever_test.cpp index d3fbaebcffb..d5e40592b12 100644 --- a/searchcore/src/tests/proton/server/documentretriever_test.cpp +++ b/searchcore/src/tests/proton/server/documentretriever_test.cpp @@ -22,7 +22,6 @@ #include <vespa/eval/tensor/tensor.h> #include <vespa/eval/tensor/test/test_utils.h> #include <vespa/persistence/spi/bucket.h> -#include <vespa/persistence/spi/result.h> #include <vespa/persistence/spi/test.h> #include <vespa/searchcommon/common/schema.h> #include <vespa/searchcore/proton/documentmetastore/documentmetastorecontext.h> @@ -121,7 +120,7 @@ const char dyn_wset_field_i[] = "dynamic int wset field"; const char dyn_wset_field_d[] = "dynamic double wset field"; const char dyn_wset_field_s[] = "dynamic string wset field"; const char dyn_wset_field_n[] = "dynamic null wset field"; -const DocumentId doc_id("doc:test:1"); +const DocumentId doc_id("id:ns:type_name::1"); const int32_t static_value = 4; const int32_t dyn_value_i = 17; const double dyn_value_d = 42.42; @@ -144,8 +143,7 @@ struct MyDocumentStore : proton::test::DummyDocumentStore { ~MyDocumentStore() override; - virtual Document::UP read(DocumentIdT lid, - const DocumentTypeRepo &r) const override { + Document::UP read(DocumentIdT lid, const DocumentTypeRepo &r) const override { if (lid == 0) { return Document::UP(); } @@ -489,8 +487,7 @@ TEST_F("require that position fields are regenerated from zcurves", Fixture) { EXPECT_EQUAL(-123096000, static_cast<IntFieldValue&>(*x).getValue()); EXPECT_EQUAL(49401000, static_cast<IntFieldValue&>(*y).getValue()); - checkFieldValue<LongFieldValue>(doc->getValue(zcurve_field), - dynamic_zcurve_value); + checkFieldValue<LongFieldValue>(doc->getValue(zcurve_field), dynamic_zcurve_value); } TEST_F("require that non-existing lid returns null pointer", Fixture) { diff --git a/searchcore/src/tests/proton/server/feeddebugger_test.cpp b/searchcore/src/tests/proton/server/feeddebugger_test.cpp index c54e13f4840..b5bd1cfafa8 100644 --- a/searchcore/src/tests/proton/server/feeddebugger_test.cpp +++ b/searchcore/src/tests/proton/server/feeddebugger_test.cpp @@ -65,18 +65,18 @@ TEST("require that setting an environment variable turns on docid-specific" " debugging.") { EnvSaver save_lid_env(lid_env_name); EnvSaver save_docid_env(docid_env_name); - setenv(docid_env_name, "doc:test:foo,doc:test:bar,doc:test:baz", true); + setenv(docid_env_name, "id:ns:type::test:foo,id:ns:type::test:bar,id:ns:type::test:baz", true); FeedDebugger debugger; EXPECT_TRUE(debugger.isDebugging()); EXPECT_EQUAL(ns_log::Logger::info, - debugger.getDebugLevel(1, DocumentId("doc:test:foo"))); + debugger.getDebugLevel(1, DocumentId("id:ns:type::test:foo"))); EXPECT_EQUAL(ns_log::Logger::info, - debugger.getDebugLevel(1, DocumentId("doc:test:bar"))); + debugger.getDebugLevel(1, DocumentId("id:ns:type::test:bar"))); EXPECT_EQUAL(ns_log::Logger::info, - debugger.getDebugLevel(1, DocumentId("doc:test:baz"))); + debugger.getDebugLevel(1, DocumentId("id:ns:type::test:baz"))); EXPECT_EQUAL(ns_log::Logger::spam, - debugger.getDebugLevel(1, DocumentId("doc:test:qux"))); + debugger.getDebugLevel(1, DocumentId("id:ns:type::test:qux"))); } } // namespace diff --git a/searchcore/src/tests/proton/server/feedstates_test.cpp b/searchcore/src/tests/proton/server/feedstates_test.cpp index f206ffc9b17..96096c0401f 100644 --- a/searchcore/src/tests/proton/server/feedstates_test.cpp +++ b/searchcore/src/tests/proton/server/feedstates_test.cpp @@ -100,7 +100,7 @@ struct RemoveOperationContext }; RemoveOperationContext::RemoveOperationContext(search::SerialNum serial) - : doc_id("doc:foo:bar"), + : doc_id("id:ns:doctypename::bar"), op(BucketFactory::getBucketId(doc_id), Timestamp(10), doc_id), str(), packet() { |