diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-08-14 18:48:09 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-08-14 18:48:09 +0000 |
commit | 729e8546d793a43ecfc94c11d5eed042d4dc74e1 (patch) | |
tree | 5923c808c8a83c8c617a949f98c30e5fce0c13cd /document/src/tests/fieldsettest.cpp | |
parent | bbc768d6ef92f166717d65e67689f6aa15c98952 (diff) |
Build the FieldSetRepo up front with all configured fieldsets to avoid building them for every get() call."
Diffstat (limited to 'document/src/tests/fieldsettest.cpp')
-rw-r--r-- | document/src/tests/fieldsettest.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/document/src/tests/fieldsettest.cpp b/document/src/tests/fieldsettest.cpp index 29581ff4549..af23e713735 100644 --- a/document/src/tests/fieldsettest.cpp +++ b/document/src/tests/fieldsettest.cpp @@ -31,7 +31,7 @@ TEST_F(FieldSetTest, testParsing) (void) dynamic_cast<NoFields&>(*FieldSetRepo::parse(docRepo, NoFields::NAME)); (void) dynamic_cast<DocIdOnly&>(*FieldSetRepo::parse(docRepo, DocIdOnly::NAME)); - FieldSet::UP set = FieldSetRepo::parse(docRepo, "testdoctype1:headerval,content"); + auto set = FieldSetRepo::parse(docRepo, "testdoctype1:headerval,content"); auto & coll = dynamic_cast<FieldCollection&>(*set); std::ostringstream ost; @@ -46,8 +46,8 @@ namespace { bool checkContains(const DocumentTypeRepo& repo, const std::string& str1, const std::string & str2) { - FieldSet::UP set1 = FieldSetRepo::parse(repo, str1); - FieldSet::UP set2 = FieldSetRepo::parse(repo, str2); + auto set1 = FieldSetRepo::parse(repo, str1); + auto set2 = FieldSetRepo::parse(repo, str2); return set1->contains(*set2); } @@ -141,7 +141,7 @@ FieldSetTest::doCopyFields(const Document& src, if (!dest) { dest = &destDoc; } - FieldSet::UP fset = FieldSetRepo::parse(docRepo, fieldSetStr); + auto 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()); - FieldSet::UP fset = FieldSetRepo::parse(docRepo, fieldSetStr); + auto 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) { - FieldSet::UP fset = FieldSetRepo::parse(docRepo, fieldSetStr); + auto fset = FieldSetRepo::parse(docRepo, fieldSetStr); Document::UP doc(FieldSet::createDocumentSubsetCopy(src, *fset)); return stringifyFields(*doc); } @@ -244,10 +244,9 @@ TEST_F(FieldSetTest, testSerialize) "testdoctype1:content,hstringval" }; - FieldSetRepo repo; for (const char * fieldSet : fieldSets) { - FieldSet::UP fs = FieldSetRepo::parse(docRepo, fieldSet); - EXPECT_EQ(vespalib::string(fieldSet), repo.serialize(*fs)); + auto fs = FieldSetRepo::parse(docRepo, fieldSet); + EXPECT_EQ(vespalib::string(fieldSet), FieldSetRepo::serialize(*fs)); } } |