From 4b18d9fec15c707dfd1e062fc0c492f53f29bc03 Mon Sep 17 00:00:00 2001 From: Xu Peng Date: Mon, 29 Apr 2019 15:47:09 +0800 Subject: [PATCH] test(db): add more meta test Former-commit-id: b8078e972d1c08b38cd6ff272ec2cd6ab1d895b2 --- cpp/unittest/db/CMakeLists.txt | 2 +- cpp/unittest/db/db_tests.cpp | 2 +- cpp/unittest/db/meta_tests.cpp | 12 ++++++------ cpp/unittest/db/utils.cpp | 10 ++++++++++ cpp/unittest/db/utils.h | 10 ++++++++++ 5 files changed, 28 insertions(+), 8 deletions(-) diff --git a/cpp/unittest/db/CMakeLists.txt b/cpp/unittest/db/CMakeLists.txt index 1a0d9642f0..5258f3576c 100644 --- a/cpp/unittest/db/CMakeLists.txt +++ b/cpp/unittest/db/CMakeLists.txt @@ -27,8 +27,8 @@ set(db_test_src ${wrapper_src} ${require_files} utils.cpp + db_tests.cpp meta_tests.cpp) - # db_tests.cpp) cuda_add_executable(db_test ${db_test_src}) diff --git a/cpp/unittest/db/db_tests.cpp b/cpp/unittest/db/db_tests.cpp index 61c4ab45df..b3a94b181e 100644 --- a/cpp/unittest/db/db_tests.cpp +++ b/cpp/unittest/db/db_tests.cpp @@ -65,7 +65,7 @@ TEST_F(DBTest, DB_TEST) { std::stringstream ss; long count = 0; - for (auto j=0; j<8; ++j) { + for (auto j=0; j<15; ++j) { ss.str(""); db->count(group_name, count); diff --git a/cpp/unittest/db/meta_tests.cpp b/cpp/unittest/db/meta_tests.cpp index 3ad5b1b2bf..c2fbfea979 100644 --- a/cpp/unittest/db/meta_tests.cpp +++ b/cpp/unittest/db/meta_tests.cpp @@ -13,22 +13,22 @@ using namespace zilliz::vecwise::engine; -TEST_F(DBTest, META_TEST) { - auto impl = DBMetaImplFactory::Build(); +TEST_F(MetaTest, META_TEST) { + /* auto impl = DBMetaImplFactory::Build(); */ auto group_id = "meta_test_group"; meta::GroupSchema group; group.group_id = group_id; - auto status = impl->add_group(group); + auto status = impl_->add_group(group); ASSERT_TRUE(status.ok()); - status = impl->get_group(group); + status = impl_->get_group(group); ASSERT_TRUE(status.ok()); group.group_id = "not_found"; - status = impl->get_group(group); + status = impl_->get_group(group); ASSERT_TRUE(!status.ok()); - impl->drop_all(); + /* impl->drop_all(); */ } diff --git a/cpp/unittest/db/utils.cpp b/cpp/unittest/db/utils.cpp index cf105a1dc9..6b24fd926a 100644 --- a/cpp/unittest/db/utils.cpp +++ b/cpp/unittest/db/utils.cpp @@ -8,6 +8,7 @@ #include #include "utils.h" +#include "db/Factories.h" using namespace zilliz::vecwise; @@ -25,3 +26,12 @@ void DBTest::SetUp() { el::ConfigurationType::Format, "[%thread-%datetime-%level]: %msg (%fbase:%line)"); el::Loggers::reconfigureLogger("default", defaultConf); } + +void MetaTest::SetUp() { + DBTest::SetUp(); + impl_ = engine::DBMetaImplFactory::Build(); +} + +void MetaTest::TearDown() { + impl_->drop_all(); +} diff --git a/cpp/unittest/db/utils.h b/cpp/unittest/db/utils.h index 3ee01bcd7f..04329de362 100644 --- a/cpp/unittest/db/utils.h +++ b/cpp/unittest/db/utils.h @@ -10,6 +10,7 @@ #include #include "db/DB.h" +#include "db/DBMetaImpl.h" #define TIMING @@ -35,3 +36,12 @@ class DBTest : public ::testing::Test { protected: virtual void SetUp() override; }; + + +class MetaTest : public DBTest { +protected: + std::shared_ptr impl_; + + virtual void SetUp() override; + virtual void TearDown() override; +};