Merge all executor tests (#249)

Co-authored-by: dutor <440396+dutor@users.noreply.github.com>

src/executor/CMakeLists.txt

@@ -55,5 +55,4 @@ nebula_add_library(
     admin/ConfigExecutor.cpp
 )
 
-nebula_add_subdirectory(query/test)
-nebula_add_subdirectory(logic/test)
+nebula_add_subdirectory(test)

src/executor/logic/test/CMakeLists.txt

-# Copyright (c) 2020 vesoft inc. All rights reserved.
-#
-# This source code is licensed under Apache 2.0 License,
-# attached with Common Clause Condition 1.0, found in the LICENSES directory.
-
-SET(EXEC_LOGIC_TEST_LIBS
-    $<TARGET_OBJECTS:common_time_function_obj>
-    $<TARGET_OBJECTS:common_expression_obj>
-    $<TARGET_OBJECTS:common_network_obj>
-    $<TARGET_OBJECTS:common_process_obj>
-    $<TARGET_OBJECTS:common_graph_thrift_obj>
-    $<TARGET_OBJECTS:common_storage_client_base_obj>
-    $<TARGET_OBJECTS:common_graph_storage_client_obj>
-    $<TARGET_OBJECTS:common_storage_thrift_obj>
-    $<TARGET_OBJECTS:common_meta_client_obj>
-    $<TARGET_OBJECTS:common_stats_obj>
-    $<TARGET_OBJECTS:common_time_obj>
-    $<TARGET_OBJECTS:common_meta_thrift_obj>
-    $<TARGET_OBJECTS:common_common_thrift_obj>
-    $<TARGET_OBJECTS:common_thrift_obj>
-    $<TARGET_OBJECTS:common_meta_obj>
-    $<TARGET_OBJECTS:common_thread_obj>
-    $<TARGET_OBJECTS:common_time_obj>
-    $<TARGET_OBJECTS:common_fs_obj>
-    $<TARGET_OBJECTS:common_base_obj>
-    $<TARGET_OBJECTS:common_concurrent_obj>
-    $<TARGET_OBJECTS:common_datatypes_obj>
-    $<TARGET_OBJECTS:common_conf_obj>
-    $<TARGET_OBJECTS:common_file_based_cluster_id_man_obj>
-    $<TARGET_OBJECTS:common_charset_obj>
-    $<TARGET_OBJECTS:common_function_manager_obj>
-    $<TARGET_OBJECTS:common_agg_function_obj>
-    $<TARGET_OBJECTS:common_encryption_obj>
-    $<TARGET_OBJECTS:common_http_client_obj>
-    $<TARGET_OBJECTS:session_obj>
-    $<TARGET_OBJECTS:graph_flags_obj>
-    $<TARGET_OBJECTS:parser_obj>
-    $<TARGET_OBJECTS:validator_obj>
-    $<TARGET_OBJECTS:planner_obj>
-    $<TARGET_OBJECTS:executor_obj>
-    $<TARGET_OBJECTS:scheduler_obj>
-    $<TARGET_OBJECTS:util_obj>
-    $<TARGET_OBJECTS:idgenerator_obj>
-    $<TARGET_OBJECTS:context_obj>
-    $<TARGET_OBJECTS:graph_auth_obj>
-    $<TARGET_OBJECTS:expr_visitor_obj>
-)
-
-nebula_add_test(
-    NAME logic_executors_test
-    SOURCES
-        LogicExecutorsTest.cpp
-    OBJECTS
-        ${EXEC_LOGIC_TEST_LIBS}
-    LIBRARIES
-        ${THRIFT_LIBRARIES}
-        gtest
-        gtest_main
-        wangle
-        proxygenhttpserver
-        proxygenlib
-)

src/executor/query/test/CMakeLists.txt → src/executor/test/CMakeLists.txt

@@ -4,7 +4,6 @@
 # attached with Common Clause Condition 1.0, found in the LICENSES directory.
 
 SET(EXEC_QUERY_TEST_OBJS
-    $<TARGET_OBJECTS:common_time_function_obj>
     $<TARGET_OBJECTS:common_expression_obj>
     $<TARGET_OBJECTS:common_network_obj>
     $<TARGET_OBJECTS:common_process_obj>
@@ -15,12 +14,12 @@ SET(EXEC_QUERY_TEST_OBJS
     $<TARGET_OBJECTS:common_meta_client_obj>
     $<TARGET_OBJECTS:common_stats_obj>
     $<TARGET_OBJECTS:common_time_obj>
+    $<TARGET_OBJECTS:common_time_function_obj>
     $<TARGET_OBJECTS:common_meta_thrift_obj>
     $<TARGET_OBJECTS:common_common_thrift_obj>
     $<TARGET_OBJECTS:common_thrift_obj>
     $<TARGET_OBJECTS:common_meta_obj>
     $<TARGET_OBJECTS:common_thread_obj>
-    $<TARGET_OBJECTS:common_time_obj>
     $<TARGET_OBJECTS:common_fs_obj>
     $<TARGET_OBJECTS:common_base_obj>
     $<TARGET_OBJECTS:common_concurrent_obj>
@@ -57,8 +56,9 @@ SET(EXEC_QUERY_TEST_LIBS
 
 nebula_add_test(
     NAME
-        query_executors_test
+        executor_test
     SOURCES
+        LogicExecutorsTest.cpp
         ProjectTest.cpp
         GetNeighborsTest.cpp
         DataCollectTest.cpp

src/executor/query/test/DataJoinTest.cpp → src/executor/test/DataJoinTest.cpp

@@ -9,7 +9,7 @@
 #include "context/QueryContext.h"
 #include "planner/Query.h"
 #include "executor/query/DataJoinExecutor.h"
-#include "executor/query/test/QueryTestBase.h"
+#include "executor/test/QueryTestBase.h"
 
 namespace nebula {
 namespace graph {

src/executor/query/test/DedupTest.cpp → src/executor/test/DedupTest.cpp

@@ -8,7 +8,7 @@
 #include "context/QueryContext.h"
 #include "planner/Query.h"
 #include "executor/query/DedupExecutor.h"
-#include "executor/query/test/QueryTestBase.h"
+#include "executor/test/QueryTestBase.h"
 #include "executor/query/ProjectExecutor.h"
 
 namespace nebula {

src/executor/query/test/FilterTest.cpp → src/executor/test/FilterTest.cpp

@@ -8,7 +8,7 @@
 #include "context/QueryContext.h"
 #include "executor/query/FilterExecutor.h"
 #include "executor/query/ProjectExecutor.h"
-#include "executor/query/test/QueryTestBase.h"
+#include "executor/test/QueryTestBase.h"
 #include "planner/Query.h"
 #include "util/ExpressionUtils.h"
 

src/executor/query/test/LimitTest.cpp → src/executor/test/LimitTest.cpp

@@ -9,7 +9,7 @@
 #include "context/QueryContext.h"
 #include "executor/query/LimitExecutor.h"
 #include "executor/query/ProjectExecutor.h"
-#include "executor/query/test/QueryTestBase.h"
+#include "executor/test/QueryTestBase.h"
 #include "planner/Logic.h"
 #include "planner/Query.h"
 #include "util/ExpressionUtils.h"

src/executor/query/test/ProjectTest.cpp → src/executor/test/ProjectTest.cpp

@@ -8,7 +8,7 @@
 
 #include "context/QueryContext.h"
 #include "executor/query/ProjectExecutor.h"
-#include "executor/query/test/QueryTestBase.h"
+#include "executor/test/QueryTestBase.h"
 #include "planner/Logic.h"
 #include "planner/Query.h"
 

src/executor/query/test/SortTest.cpp → src/executor/test/SortTest.cpp

@@ -9,7 +9,7 @@
 #include "context/QueryContext.h"
 #include "executor/query/ProjectExecutor.h"
 #include "executor/query/SortExecutor.h"
-#include "executor/query/test/QueryTestBase.h"
+#include "executor/test/QueryTestBase.h"
 #include "planner/Logic.h"
 #include "planner/Query.h"