From 77f86fdeee5e2756269cf8ca57b64d030312f01a Mon Sep 17 00:00:00 2001
From: jinhai <hai.jin@zilliz.com>
Date: Wed, 8 May 2019 17:38:37 +0800
Subject: [PATCH] License tests success

Former-commit-id: e10d0146a51286664bb01f5d55f694e547a8f597
---
 cpp/unittest/CMakeLists.txt            |  2 +-
 cpp/unittest/license/CMakeLists.txt    | 45 +++++++++++---------------
 cpp/unittest/license/license_tests.cpp |  5 +--
 3 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/cpp/unittest/CMakeLists.txt b/cpp/unittest/CMakeLists.txt
index 0982b08904..715e8d5338 100644
--- a/cpp/unittest/CMakeLists.txt
+++ b/cpp/unittest/CMakeLists.txt
@@ -20,4 +20,4 @@ set(unittest_libs
 add_subdirectory(server)
 add_subdirectory(db)
 add_subdirectory(faiss_wrapper)
-#add_subdirectory(license)
\ No newline at end of file
+add_subdirectory(license)
\ No newline at end of file
diff --git a/cpp/unittest/license/CMakeLists.txt b/cpp/unittest/license/CMakeLists.txt
index 103f932921..dd742d66fe 100644
--- a/cpp/unittest/license/CMakeLists.txt
+++ b/cpp/unittest/license/CMakeLists.txt
@@ -4,50 +4,41 @@
 # Proprietary and confidential.
 #-------------------------------------------------------------------------------
 include_directories(../../src)
-include_directories(/usr/include)
-
-include_directories(/usr/local/cuda/include)
 
 aux_source_directory(../../src/db db_srcs)
 aux_source_directory(../../src/config config_files)
 aux_source_directory(../../src/cache cache_srcs)
 aux_source_directory(../../src/wrapper wrapper_src)
 
+include_directories(/usr/local/cuda/include)
 link_directories("/usr/local/cuda/lib64")
 
 set(require_files
+        ../../src/server/ServerConfig.cpp
+        ../../src/utils/CommonUtil.cpp
+        ../../src/utils/TimeRecorder.cpp
         ../../src/license/License.cpp
         )
 
-cuda_add_executable(license_test
-        ${unittest_srcs}
-        ${config_files}
-        ${cache_srcs}
-        ${db_srcs}
-        ${require_files}
-        )
+set(db_test_src
+    ${unittest_srcs}
+    ${config_files}
+    ${cache_srcs}
+    ${db_srcs}
+    ${wrapper_src}
+    ${require_files}
+    license_tests.cpp)
 
-set(require_libs
-        libvecwise_engine.a
-        stdc++
-        boost_system
-        boost_filesystem
-        pthread
-        snappy
-        bz2
-        z
-        zstd
-        rocksdb
+cuda_add_executable(license_test ${db_test_src})
+
+set(db_libs
         faiss
         cudart
         cublas
         sqlite3
+        boost_system
+        boost_filesystem
         lz4
-        crypto
         )
 
-target_link_libraries(license_test
-        ${unittest_libs}
-        ${require_libs}
-        ${cuda_library}
-        )
\ No newline at end of file
+target_link_libraries(license_test ${unittest_libs} ${db_libs})
diff --git a/cpp/unittest/license/license_tests.cpp b/cpp/unittest/license/license_tests.cpp
index 69595c01a5..798160f671 100644
--- a/cpp/unittest/license/license_tests.cpp
+++ b/cpp/unittest/license/license_tests.cpp
@@ -5,11 +5,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 #include <gtest/gtest.h>
 #include "license/License.h"
+#include "utils/Error.h"
 
-using namespace zilliz::vecwise::server;
+using namespace zilliz::vecwise;
 
 TEST(LicenseTest, LICENSE_TEST) {
     std::string path1 = "/tmp/vecwise_engine.license";
-    ServerError err = LicenseValidate(path1);
+    server::ServerError err = server::LicenseValidate(path1);
     ASSERT_EQ(err, server::SERVER_SUCCESS);
 }