From 3a9f8a641d5312e83a34f6aa293f98182c90adfe Mon Sep 17 00:00:00 2001 From: Arnstein Ressem Date: Wed, 19 Aug 2020 17:54:54 +0200 Subject: Revert "Balder/use an actual fieldset repo" --- document/src/tests/fieldsettest.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'document/src/tests/fieldsettest.cpp') diff --git a/document/src/tests/fieldsettest.cpp b/document/src/tests/fieldsettest.cpp index af23e713735..29581ff4549 100644 --- a/document/src/tests/fieldsettest.cpp +++ b/document/src/tests/fieldsettest.cpp @@ -31,7 +31,7 @@ TEST_F(FieldSetTest, testParsing) (void) dynamic_cast(*FieldSetRepo::parse(docRepo, NoFields::NAME)); (void) dynamic_cast(*FieldSetRepo::parse(docRepo, DocIdOnly::NAME)); - auto set = FieldSetRepo::parse(docRepo, "testdoctype1:headerval,content"); + FieldSet::UP set = FieldSetRepo::parse(docRepo, "testdoctype1:headerval,content"); auto & coll = dynamic_cast(*set); std::ostringstream ost; @@ -46,8 +46,8 @@ namespace { bool checkContains(const DocumentTypeRepo& repo, const std::string& str1, const std::string & str2) { - auto set1 = FieldSetRepo::parse(repo, str1); - auto set2 = FieldSetRepo::parse(repo, str2); + FieldSet::UP set1 = FieldSetRepo::parse(repo, str1); + FieldSet::UP set2 = FieldSetRepo::parse(repo, str2); return set1->contains(*set2); } @@ -141,7 +141,7 @@ FieldSetTest::doCopyFields(const Document& src, if (!dest) { dest = &destDoc; } - auto fset = FieldSetRepo::parse(docRepo, fieldSetStr); + FieldSet::UP fset = FieldSetRepo::parse(docRepo, fieldSetStr); FieldSet::copyFields(*dest, src, *fset); return stringifyFields(*dest); } @@ -152,7 +152,7 @@ FieldSetTest::doStripFields(const Document& doc, const std::string& fieldSetStr) { Document::UP copy(doc.clone()); - auto fset = FieldSetRepo::parse(docRepo, fieldSetStr); + FieldSet::UP fset = FieldSetRepo::parse(docRepo, fieldSetStr); FieldSet::stripFields(*copy, *fset); return stringifyFields(*copy); } @@ -198,7 +198,7 @@ FieldSetTest::doCopyDocument(const Document& src, const DocumentTypeRepo& docRepo, const std::string& fieldSetStr) { - auto fset = FieldSetRepo::parse(docRepo, fieldSetStr); + FieldSet::UP fset = FieldSetRepo::parse(docRepo, fieldSetStr); Document::UP doc(FieldSet::createDocumentSubsetCopy(src, *fset)); return stringifyFields(*doc); } @@ -244,9 +244,10 @@ TEST_F(FieldSetTest, testSerialize) "testdoctype1:content,hstringval" }; + FieldSetRepo repo; for (const char * fieldSet : fieldSets) { - auto fs = FieldSetRepo::parse(docRepo, fieldSet); - EXPECT_EQ(vespalib::string(fieldSet), FieldSetRepo::serialize(*fs)); + FieldSet::UP fs = FieldSetRepo::parse(docRepo, fieldSet); + EXPECT_EQ(vespalib::string(fieldSet), repo.serialize(*fs)); } } -- cgit v1.2.3