From 991249b70460b61f3b73b53387dbc20357aedaa1 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 21 Aug 2019 09:14:35 +0200 Subject: Revert "Revert "doc: -> id:"" --- document/src/tests/fieldsettest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'document/src/tests/fieldsettest.cpp') 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)); -- cgit v1.2.3