diff options
Diffstat (limited to 'vespalib/src/tests')
11 files changed, 27 insertions, 27 deletions
diff --git a/vespalib/src/tests/btree/btree_test.cpp b/vespalib/src/tests/btree/btree_test.cpp index 1b7eb4512ad..848c8a37125 100644 --- a/vespalib/src/tests/btree/btree_test.cpp +++ b/vespalib/src/tests/btree/btree_test.cpp @@ -21,9 +21,9 @@ LOG_SETUP("btree_test"); #include <vespa/vespalib/test/btree/btree_printer.h> using vespalib::GenerationHandler; -using search::datastore::EntryRef; +using vespalib::datastore::EntryRef; -namespace search::btree { +namespace vespalib::btree { namespace { @@ -1521,4 +1521,4 @@ Test::Main() } -TEST_APPHOOK(search::btree::Test); +TEST_APPHOOK(vespalib::btree::Test); diff --git a/vespalib/src/tests/btree/btreeaggregation_test.cpp b/vespalib/src/tests/btree/btreeaggregation_test.cpp index 2b4b37af171..da7f677bb8a 100644 --- a/vespalib/src/tests/btree/btreeaggregation_test.cpp +++ b/vespalib/src/tests/btree/btreeaggregation_test.cpp @@ -27,9 +27,9 @@ LOG_SETUP("btreeaggregation_test"); using vespalib::GenerationHandler; -using search::datastore::EntryRef; +using vespalib::datastore::EntryRef; -namespace search::btree { +namespace vespalib::btree { namespace { @@ -1234,4 +1234,4 @@ Test::Main() } -TEST_APPHOOK(search::btree::Test); +TEST_APPHOOK(vespalib::btree::Test); diff --git a/vespalib/src/tests/btree/frozenbtree_test.cpp b/vespalib/src/tests/btree/frozenbtree_test.cpp index 9bf6f3773eb..e78c1b40dc6 100644 --- a/vespalib/src/tests/btree/frozenbtree_test.cpp +++ b/vespalib/src/tests/btree/frozenbtree_test.cpp @@ -13,14 +13,14 @@ #include <vespa/log/log.h> LOG_SETUP("frozenbtree_test"); -using search::btree::BTreeRoot; -using search::btree::BTreeNode; -using search::btree::BTreeInternalNode; -using search::btree::BTreeLeafNode; -using search::btree::BTreeDefaultTraits; +using vespalib::btree::BTreeRoot; +using vespalib::btree::BTreeNode; +using vespalib::btree::BTreeInternalNode; +using vespalib::btree::BTreeLeafNode; +using vespalib::btree::BTreeDefaultTraits; using vespalib::GenerationHandler; -namespace search { +namespace vespalib { class FrozenBTreeTest : public vespalib::TestApp @@ -468,4 +468,4 @@ FrozenBTreeTest::Main() } -TEST_APPHOOK(search::FrozenBTreeTest); +TEST_APPHOOK(vespalib::FrozenBTreeTest); diff --git a/vespalib/src/tests/btree/iteratespeed.cpp b/vespalib/src/tests/btree/iteratespeed.cpp index e20e9537f7f..e0664b1c588 100644 --- a/vespalib/src/tests/btree/iteratespeed.cpp +++ b/vespalib/src/tests/btree/iteratespeed.cpp @@ -21,7 +21,7 @@ #include <vespa/log/log.h> LOG_SETUP("iteratespeed"); -namespace search::btree { +namespace vespalib::btree { enum class IterateMethod { @@ -204,6 +204,6 @@ IterateSpeed::Main() } -FASTOS_MAIN(search::btree::IterateSpeed); +FASTOS_MAIN(vespalib::btree::IterateSpeed); diff --git a/vespalib/src/tests/datastore/array_store/array_store_test.cpp b/vespalib/src/tests/datastore/array_store/array_store_test.cpp index e74a277d964..ea7c746e58f 100644 --- a/vespalib/src/tests/datastore/array_store/array_store_test.cpp +++ b/vespalib/src/tests/datastore/array_store/array_store_test.cpp @@ -8,12 +8,12 @@ #include <vespa/vespalib/util/traits.h> #include <vector> -using namespace search::datastore; +using namespace vespalib::datastore; using vespalib::MemoryUsage; using vespalib::ArrayRef; using generation_t = vespalib::GenerationHandler::generation_t; -using MemStats = search::datastore::test::MemStats; -using BufferStats = search::datastore::test::BufferStats; +using MemStats = vespalib::datastore::test::MemStats; +using BufferStats = vespalib::datastore::test::BufferStats; constexpr float ALLOC_GROW_FACTOR = 0.2; diff --git a/vespalib/src/tests/datastore/array_store_config/array_store_config_test.cpp b/vespalib/src/tests/datastore/array_store_config/array_store_config_test.cpp index 4779cf1aa70..e90149ed08f 100644 --- a/vespalib/src/tests/datastore/array_store_config/array_store_config_test.cpp +++ b/vespalib/src/tests/datastore/array_store_config/array_store_config_test.cpp @@ -4,7 +4,7 @@ #include <vespa/vespalib/datastore/entryref.h> #include <vespa/vespalib/datastore/array_store_config.h> -using namespace search::datastore; +using namespace vespalib::datastore; using AllocSpec = ArrayStoreConfig::AllocSpec; constexpr float ALLOC_GROW_FACTOR = 0.2; diff --git a/vespalib/src/tests/datastore/buffer_type/buffer_type_test.cpp b/vespalib/src/tests/datastore/buffer_type/buffer_type_test.cpp index 3b748d1d4c7..abcf6d3b4e5 100644 --- a/vespalib/src/tests/datastore/buffer_type/buffer_type_test.cpp +++ b/vespalib/src/tests/datastore/buffer_type/buffer_type_test.cpp @@ -3,7 +3,7 @@ #include <vespa/vespalib/datastore/buffer_type.h> #include <vespa/vespalib/testkit/testapp.h> -using namespace search::datastore; +using namespace vespalib::datastore; using IntBufferType = BufferType<int>; constexpr uint32_t ARRAYS_SIZE(4); diff --git a/vespalib/src/tests/datastore/datastore/datastore_test.cpp b/vespalib/src/tests/datastore/datastore/datastore_test.cpp index 0981280ac23..2429ad3853f 100644 --- a/vespalib/src/tests/datastore/datastore/datastore_test.cpp +++ b/vespalib/src/tests/datastore/datastore/datastore_test.cpp @@ -8,7 +8,7 @@ #include <vespa/log/log.h> LOG_SETUP("datastore_test"); -namespace search::datastore { +namespace vespalib::datastore { using vespalib::alloc::MemoryAllocator; diff --git a/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp b/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp index e4631e28625..fad78ea30ae 100644 --- a/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp +++ b/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp @@ -12,10 +12,10 @@ #include <vespa/log/log.h> LOG_SETUP("unique_store_test"); -using namespace search::datastore; +using namespace vespalib::datastore; using vespalib::ArrayRef; using generation_t = vespalib::GenerationHandler::generation_t; -using search::datastore::test::BufferStats; +using vespalib::datastore::test::BufferStats; template <typename UniqueStoreT> struct TestBase : public ::testing::Test { diff --git a/vespalib/src/tests/datastore/unique_store_dictionary/unique_store_dictionary_test.cpp b/vespalib/src/tests/datastore/unique_store_dictionary/unique_store_dictionary_test.cpp index 1ec89aea69e..37a22108dc5 100644 --- a/vespalib/src/tests/datastore/unique_store_dictionary/unique_store_dictionary_test.cpp +++ b/vespalib/src/tests/datastore/unique_store_dictionary/unique_store_dictionary_test.cpp @@ -7,8 +7,8 @@ #include <vespa/log/log.h> LOG_SETUP("unique_store_dictionary_test"); -using namespace search::datastore; -using namespace search::datastore::uniquestore; +using namespace vespalib::datastore; +using namespace vespalib::datastore::uniquestore; class Comparator : public EntryComparator { private: diff --git a/vespalib/src/tests/datastore/unique_store_string_allocator/unique_store_string_allocator_test.cpp b/vespalib/src/tests/datastore/unique_store_string_allocator/unique_store_string_allocator_test.cpp index 048e1653ee4..94f96cdf707 100644 --- a/vespalib/src/tests/datastore/unique_store_string_allocator/unique_store_string_allocator_test.cpp +++ b/vespalib/src/tests/datastore/unique_store_string_allocator/unique_store_string_allocator_test.cpp @@ -7,10 +7,10 @@ #include <vespa/vespalib/util/traits.h> #include <vector> -using namespace search::datastore; +using namespace vespalib::datastore; using vespalib::MemoryUsage; using generation_t = vespalib::GenerationHandler::generation_t; -using BufferStats = search::datastore::test::BufferStats; +using BufferStats = vespalib::datastore::test::BufferStats; namespace { |