- Use stash instead of the single use of VariableSizeVector.

1 files changed, 4 insertions, 50 deletions

diff --git a/vespalib/src/tests/memorydatastore/memorydatastore.cpp b/vespalib/src/tests/memorydatastore/memorydatastore.cpp
index 1d49b0af91b..649bd45a541 100644
--- a/vespalib/src/tests/memorydatastore/memorydatastore.cpp
+++ b/vespalib/src/tests/memorydatastore/memorydatastore.cpp
@@ -6,17 +6,7 @@
 
 using namespace vespalib;
 
-class MemoryDataStoreTest : public vespalib::TestApp
-{
-private:
-    void testMemoryDataStore();
-    void testVariableSizeVector();
-public:
-    int Main() override;
-};
-
-void
-MemoryDataStoreTest::testMemoryDataStore()
+TEST("testMemoryDataStore")
 {
     MemoryDataStore s(alloc::Alloc::alloc(256));
     std::vector<MemoryDataStore::Reference> v;
@@ -28,45 +18,9 @@ MemoryDataStoreTest::testMemoryDataStore()
     v.push_back(s.push_back("mumbo", 5));
     EXPECT_EQUAL(52ul, v.size());
     EXPECT_NOT_EQUAL(static_cast<const char *>(v[50].data()) + 5, v[51].data());
-    for (size_t i(0); i < v.size(); i++) {
-        EXPECT_EQUAL(0, memcmp("mumbo", v[i].data(), 5));
+    for (auto & i : v) {
+        EXPECT_EQUAL(0, memcmp("mumbo", i.data(), 5));
     }
 }
 
-void
-MemoryDataStoreTest::testVariableSizeVector()
-{
-    VariableSizeVector v(20000, 5*20000);
-    for (size_t i(0); i < 10000; i++) {
-        asciistream os;
-        os << i;
-        v.push_back(os.str().data(), os.str().size());
-    }
-    for (size_t i(0); i < v.size(); i++) {
-        asciistream os;
-        os << i;
-        EXPECT_EQUAL(os.str().size(), v[i].size());
-        EXPECT_EQUAL(0, memcmp(os.str().data(), v[i].data(), os.str().size()));
-    }
-    size_t i(0);
-    for (auto it(v.begin()), mt(v.end()); it != mt; it++, i++) {
-        asciistream os;
-        os << i;
-        EXPECT_EQUAL(os.str().size(), it->size());
-        EXPECT_EQUAL(0, memcmp(os.str().data(), (*it).data(), os.str().size()));
-    }
-    
-}
-
-int
-MemoryDataStoreTest::Main()
-{
-    TEST_INIT("data_test");
-    testMemoryDataStore();
-    testVariableSizeVector();
-
-    TEST_DONE();
-}
-
-TEST_APPHOOK(MemoryDataStoreTest);
-
+TEST_MAIN() { TEST_RUN_ALL(); }