From 3dfdfef07a81f0f26758b7c22cb57242362d32ff Mon Sep 17 00:00:00 2001
From: Xu Peng <xupeng3112@163.com>
Date: Mon, 29 Apr 2019 13:17:13 +0800
Subject: [PATCH] test(db): add utils in db test

Former-commit-id: 0e65a0a885cc3ead0fb233bd041bb4f8b8645898
---
 cpp/unittest/db/CMakeLists.txt |  1 +
 cpp/unittest/db/db_tests.cpp   | 38 +---------------------------------
 cpp/unittest/db/utils.cpp      | 27 ++++++++++++++++++++++++
 cpp/unittest/db/utils.h        | 37 +++++++++++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 37 deletions(-)
 create mode 100644 cpp/unittest/db/utils.cpp
 create mode 100644 cpp/unittest/db/utils.h

diff --git a/cpp/unittest/db/CMakeLists.txt b/cpp/unittest/db/CMakeLists.txt
index f76d3536..99ef28c9 100644
--- a/cpp/unittest/db/CMakeLists.txt
+++ b/cpp/unittest/db/CMakeLists.txt
@@ -26,6 +26,7 @@ set(db_test_src
     ${db_srcs}
     ${wrapper_src}
     ${require_files}
+    utils.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 723f52e2..61c4ab45 100644
--- a/cpp/unittest/db/db_tests.cpp
+++ b/cpp/unittest/db/db_tests.cpp
@@ -6,48 +6,12 @@
 #include <gtest/gtest.h>
 #include <thread>
 #include <easylogging++.h>
-#include <chrono>
 
+#include "utils.h"
 #include "db/DB.h"
 
 using namespace zilliz::vecwise;
 
-#define TIMING
-
-#ifdef TIMING
-#define INIT_TIMER auto start = std::chrono::high_resolution_clock::now();
-#define START_TIMER  start = std::chrono::high_resolution_clock::now();
-#define STOP_TIMER(name)  LOG(DEBUG) << "RUNTIME of " << name << ": " << \
-    std::chrono::duration_cast<std::chrono::milliseconds>( \
-            std::chrono::high_resolution_clock::now()-start \
-    ).count() << " ms ";
-#else
-#define INIT_TIMER
-#define START_TIMER
-#define STOP_TIMER(name)
-#endif
-
-class DBTest : public ::testing::Test {
-protected:
-    virtual void SetUp() {
-        el::Configurations defaultConf;
-        defaultConf.setToDefault();
-        defaultConf.set(el::Level::Debug,
-                el::ConfigurationType::Format, "[%thread-%datetime-%level]: %msg (%fbase:%line)");
-        el::Loggers::reconfigureLogger("default", defaultConf);
-    }
-
-};
-
-namespace {
-    void ASSERT_STATS(engine::Status& stat) {
-        ASSERT_TRUE(stat.ok());
-        if(!stat.ok()) {
-            std::cout << stat.ToString() << std::endl;
-        }
-    }
-}
-
 TEST_F(DBTest, DB_TEST) {
 
     static const std::string group_name = "test_group";
diff --git a/cpp/unittest/db/utils.cpp b/cpp/unittest/db/utils.cpp
new file mode 100644
index 00000000..cf105a1d
--- /dev/null
+++ b/cpp/unittest/db/utils.cpp
@@ -0,0 +1,27 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright 上海赜睿信息科技有限公司(Zilliz) - All Rights Reserved
+// Unauthorized copying of this file, via any medium is strictly prohibited.
+// Proprietary and confidential.
+////////////////////////////////////////////////////////////////////////////////
+
+#include <iostream>
+#include <easylogging++.h>
+
+#include "utils.h"
+
+using namespace zilliz::vecwise;
+
+void ASSERT_STATS(engine::Status& stat) {
+    ASSERT_TRUE(stat.ok());
+    if(!stat.ok()) {
+        std::cout << stat.ToString() << std::endl;
+    }
+}
+
+void DBTest::SetUp() {
+    el::Configurations defaultConf;
+    defaultConf.setToDefault();
+    defaultConf.set(el::Level::Debug,
+            el::ConfigurationType::Format, "[%thread-%datetime-%level]: %msg (%fbase:%line)");
+    el::Loggers::reconfigureLogger("default", defaultConf);
+}
diff --git a/cpp/unittest/db/utils.h b/cpp/unittest/db/utils.h
new file mode 100644
index 00000000..3ee01bcd
--- /dev/null
+++ b/cpp/unittest/db/utils.h
@@ -0,0 +1,37 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright 上海赜睿信息科技有限公司(Zilliz) - All Rights Reserved
+// Unauthorized copying of this file, via any medium is strictly prohibited.
+// Proprietary and confidential.
+////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include <gtest/gtest.h>
+#include <chrono>
+
+#include "db/DB.h"
+
+
+#define TIMING
+
+#ifdef TIMING
+#define INIT_TIMER auto start = std::chrono::high_resolution_clock::now();
+#define START_TIMER  start = std::chrono::high_resolution_clock::now();
+#define STOP_TIMER(name)  LOG(DEBUG) << "RUNTIME of " << name << ": " << \
+    std::chrono::duration_cast<std::chrono::milliseconds>( \
+            std::chrono::high_resolution_clock::now()-start \
+    ).count() << " ms ";
+#else
+#define INIT_TIMER
+#define START_TIMER
+#define STOP_TIMER(name)
+#endif
+
+
+void ASSERT_STATS(zilliz::vecwise::engine::Status& stat);
+
+
+class DBTest : public ::testing::Test {
+protected:
+    virtual void SetUp() override;
+};
-- 
GitLab