diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-20 20:19:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-20 20:19:17 +0200 |
commit | be5759f30affe0e38ea4c442586a457f9cb698f8 (patch) | |
tree | b421dfbf3820cce86f061c5cadcc18ac77928f06 /document/src/tests/fieldsettest.cpp | |
parent | a778b3d1df63047183bb7f8659f4a612d2f2432d (diff) | |
parent | b475c8edb10376328ae8212f0f13b249ecfcff39 (diff) |
Merge pull request #10329 from vespa-engine/balder/remove-doc-ids-part-5
doc: -> id:
Diffstat (limited to 'document/src/tests/fieldsettest.cpp')
-rw-r--r-- | document/src/tests/fieldsettest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/document/src/tests/fieldsettest.cpp b/document/src/tests/fieldsettest.cpp index 0297e7bdda4..b0cad61b72a 100644 --- a/document/src/tests/fieldsettest.cpp +++ b/document/src/tests/fieldsettest.cpp @@ -169,7 +169,7 @@ FieldSetTest::doCopyFields(const Document& src, const std::string& fieldSetStr, Document* dest) const { - Document destDoc(src.getType(), DocumentId("doc:test:fieldsdest")); + Document destDoc(src.getType(), DocumentId("id:ns:" + src.getType().getName() + "::fieldset")); if (!dest) { dest = &destDoc; } @@ -195,7 +195,7 @@ Document::UP FieldSetTest::createTestDocument(const TestDocMan& testDocMan) const { Document::UP doc(testDocMan.createDocument("megafoo megabar", - "doc:test:fieldssrc", + "id:ns:testdoctype1::1", "testdoctype1")); doc->setValue(doc->getField("headerval"), IntFieldValue(5678)); doc->setValue(doc->getField("hstringval"), @@ -225,7 +225,7 @@ TEST_F(FieldSetTest, testCopyDocumentFields) doCopyFields(*src, repo, "testdoctype1:hstringval,content")); // Test that we overwrite already set fields in destination document { - Document dest(src->getType(), DocumentId("doc:foo:bar")); + Document dest(src->getType(), DocumentId("id:ns:" + src->getType().getName() + "::bar")); dest.setValue(dest.getField("content"), StringFieldValue("overwriteme")); EXPECT_EQ(std::string("content: megafoo megabar\n"), doCopyFields(*src, repo, "[body]", &dest)); |