diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-25 18:22:00 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-25 18:22:00 +0200 |
| commit | d9a33c05e2b3f45cba50fd0f8c48c422541b1ee8 (patch) | |
| tree | 1d97192477c4d2eaf51ead0f3c6f5873653b99da /vdslib/src/tests/container | |
| parent | 575f2d7572ac68f9dfc6c6e0d4ea4240c3aac2e8 (diff) | |
Add missing override.
remove virtual on override.
optimize includes.
Diffstat (limited to 'vdslib/src/tests/container')
| -rw-r--r-- | vdslib/src/tests/container/documentlisttest.cpp | 13 | ||||
| -rw-r--r-- | vdslib/src/tests/container/documentsummarytest.cpp | 3 | ||||
| -rw-r--r-- | vdslib/src/tests/container/parameterstest.cpp | 3 | ||||
| -rw-r--r-- | vdslib/src/tests/container/searchresulttest.cpp | 3 |
4 files changed, 6 insertions, 16 deletions
diff --git a/vdslib/src/tests/container/documentlisttest.cpp b/vdslib/src/tests/container/documentlisttest.cpp index 2c72e29787e..5120c4efa05 100644 --- a/vdslib/src/tests/container/documentlisttest.cpp +++ b/vdslib/src/tests/container/documentlisttest.cpp @@ -1,20 +1,13 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include <vespa/vdslib/container/writabledocumentlist.h> - -#include <cppunit/extensions/HelperMacros.h> #include <vespa/document/base/testdocman.h> -#include <vespa/document/config/config-documenttypes.h> -#include <vespa/document/fieldvalue/document.h> -#include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/update/assignvalueupdate.h> #include <vespa/document/update/documentupdate.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/util/random.h> #include <vespa/vespalib/testkit/testapp.h> -#include <vespa/vespalib/util/vstringfmt.h> -#include <iostream> +#include <cppunit/extensions/HelperMacros.h> using document::DocumentTypeRepo; using document::readDocumenttypesConfig; @@ -522,14 +515,14 @@ void WritableDocumentListTest::testOperationList() for (uint32_t i=0; i<3000; ++i, it++) { CPPUNIT_ASSERT_EQUAL( - vespalib::make_vespa_string("userdoc:test:1298798789:%d", i), + vespalib::make_string("userdoc:test:1298798789:%d", i), it->getDocument()->getId().toString()); CPPUNIT_ASSERT(!it->isRemoveEntry()); } for (uint32_t i=5000; i<5900; ++i, it++) { CPPUNIT_ASSERT_EQUAL( - vespalib::make_vespa_string("userdoc:test:1298798789:%d", i), + vespalib::make_string("userdoc:test:1298798789:%d", i), it->getDocument()->getId().toString()); CPPUNIT_ASSERT(it->isRemoveEntry()); } diff --git a/vdslib/src/tests/container/documentsummarytest.cpp b/vdslib/src/tests/container/documentsummarytest.cpp index 80547e28d1f..86684420278 100644 --- a/vdslib/src/tests/container/documentsummarytest.cpp +++ b/vdslib/src/tests/container/documentsummarytest.cpp @@ -1,9 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <cppunit/extensions/HelperMacros.h> #include <vespa/document/base/testdocman.h> #include <vespa/vdslib/container/documentsummary.h> +#include <cppunit/extensions/HelperMacros.h> namespace vdslib { diff --git a/vdslib/src/tests/container/parameterstest.cpp b/vdslib/src/tests/container/parameterstest.cpp index 63ab18bcd26..4e34e48eef0 100644 --- a/vdslib/src/tests/container/parameterstest.cpp +++ b/vdslib/src/tests/container/parameterstest.cpp @@ -1,9 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <cppunit/extensions/HelperMacros.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/vdslib/container/parameters.h> +#include <cppunit/extensions/HelperMacros.h> using document::DocumentTypeRepo; using namespace vdslib; diff --git a/vdslib/src/tests/container/searchresulttest.cpp b/vdslib/src/tests/container/searchresulttest.cpp index b72df61c2dd..d26424dba06 100644 --- a/vdslib/src/tests/container/searchresulttest.cpp +++ b/vdslib/src/tests/container/searchresulttest.cpp @@ -1,9 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <cppunit/extensions/HelperMacros.h> #include <vespa/document/base/testdocman.h> #include <vespa/vdslib/container/searchresult.h> +#include <cppunit/extensions/HelperMacros.h> namespace vdslib { |