From d23d661d8868677218f33dfe7e9b01f5de65d6f8 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Fri, 20 Jan 2017 11:48:51 +0100
Subject: Clean up a very dangerous interface to prevent potential misuse.

---
 vsm/src/tests/docsum/docsum.cpp     | 30 ------------------------------
 vsm/src/tests/document/document.cpp |  9 ++-------
 vsm/src/tests/searcher/searcher.cpp |  4 +---
 3 files changed, 3 insertions(+), 40 deletions(-)

(limited to 'vsm/src/tests')

diff --git a/vsm/src/tests/docsum/docsum.cpp b/vsm/src/tests/docsum/docsum.cpp
index c084bd5593f..4ebd7061b69 100644
--- a/vsm/src/tests/docsum/docsum.cpp
+++ b/vsm/src/tests/docsum/docsum.cpp
@@ -245,35 +245,6 @@ DocsumTest::requireThatJSONDocsumWriterHandlesMap()
     }
 }
 
-void
-DocsumTest::testDocSumCache()
-{
-    Document::SP d1(new TestDocument(0, 1));
-    d1->setField(0, FieldValue::UP(new StringFieldValue("aa")));
-    Document::SP d2(new TestDocument(1, 2));
-    d2->setField(0, FieldValue::UP(new StringFieldValue("bbb")));
-    d2->setField(1, FieldValue::UP(new StringFieldValue("cccc")));
-    DocSumCache cac1;
-    cac1.push_back(d1);
-    cac1.push_back(d2);
-    EXPECT_EQUAL(cac1.cache().size(), 2u);
-
-    Document::SP d3(new TestDocument(2, 1));
-    d3->setField(0, FieldValue::UP(new StringFieldValue("ddddd")));
-    DocSumCache cac2;
-    cac2.push_back(d3);
-    cac1.insert(cac2);
-    EXPECT_EQUAL(cac1.cache().size(), 3u);
-
-    Document::SP d4(new TestDocument(2, 1));
-    d4->setField(0, FieldValue::UP(new StringFieldValue("eeeeee")));
-    DocSumCache cac3;
-    cac3.push_back(d4);
-    cac1.insert(cac3);
-    EXPECT_EQUAL(cac1.cache().size(), 3u);
-    EXPECT_EQUAL(2u, cac1.getDocSum(2).getDocId());
-}
-
 int
 DocsumTest::Main()
 {
@@ -282,7 +253,6 @@ DocsumTest::Main()
     testFlattenDocsumWriter();
     testJSONDocsumWriter();
     requireThatJSONDocsumWriterHandlesMap();
-    testDocSumCache();
 
     TEST_DONE();
 }
diff --git a/vsm/src/tests/document/document.cpp b/vsm/src/tests/document/document.cpp
index a824d59a788..f13d4020054 100644
--- a/vsm/src/tests/document/document.cpp
+++ b/vsm/src/tests/document/document.cpp
@@ -41,11 +41,8 @@ DocumentTest::testStorageDocument()
     ASSERT_TRUE((*fpmap)[1].size() == 1);
     ASSERT_TRUE((*fpmap)[2].size() == 0);
 
-    StorageDocument sdoc(std::move(doc));
+    StorageDocument sdoc(std::move(doc), fpmap, 3);
     ASSERT_TRUE(sdoc.valid());
-    sdoc.setFieldCount(3);
-    sdoc.fieldPathMap(fpmap);
-    sdoc.init();
 
     EXPECT_EQUAL(std::string("foo"), sdoc.getField(0)->getAsString());
     EXPECT_EQUAL(std::string("bar"), sdoc.getField(1)->getAsString());
@@ -69,8 +66,6 @@ DocumentTest::testStorageDocument()
     EXPECT_EQUAL(std::string("qux"), sdoc.getField(1)->getAsString());
     EXPECT_EQUAL(std::string("quux"), sdoc.getField(2)->getAsString());
 
-    // reset cached field values
-    sdoc.init();
     EXPECT_EQUAL(std::string("foo"), sdoc.getField(0)->getAsString());
     EXPECT_EQUAL(std::string("bar"), sdoc.getField(1)->getAsString());
     EXPECT_TRUE(sdoc.getField(2) == NULL);
@@ -78,7 +73,7 @@ DocumentTest::testStorageDocument()
     EXPECT_TRUE(!sdoc.setField(3, FieldValue::UP(new StringFieldValue("thud"))));
 
     SharedFieldPathMap fim;
-    StorageDocument s2(fim);
+    StorageDocument s2(std::make_unique<document::Document>(), fim, 0);
     EXPECT_EQUAL(vespalib::string("null::"), s2.docDoc().getId().toString());
 }
 
diff --git a/vsm/src/tests/searcher/searcher.cpp b/vsm/src/tests/searcher/searcher.cpp
index 28e97f5e726..5bb47b7d2ae 100644
--- a/vsm/src/tests/searcher/searcher.cpp
+++ b/vsm/src/tests/searcher/searcher.cpp
@@ -300,9 +300,7 @@ performSearch(FieldSearcher & fs, const StringList & query, const FieldValue & f
     // setup document
     SharedFieldPathMap sfim(new FieldPathMapT());
     sfim->push_back(FieldPath());
-    StorageDocument doc(sfim);
-    doc.setFieldCount(1);
-    doc.init();
+    StorageDocument doc(std::make_unique<document::Document>(), sfim, 1);
     doc.setField(0, document::FieldValue::UP(fv.clone()));
 
     fs.search(doc);
-- 
cgit v1.2.3