Merge all executor tests (vesoft-inc#249)

Co-authored-by: dutor <[email protected]>
CPWstatic · Sep 2, 2020 · 9a0d808 · 9a0d808
1 parent fe7f894
commit 9a0d808
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 73 deletions.
diff --git a/src/executor/CMakeLists.txt b/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)
diff --git a/src/executor/logic/test/CMakeLists.txt b/src/executor/logic/test/CMakeLists.txt
diff --git a/src/executor/query/test/AggregateTest.cpp → src/executor/test/AggregateTest.cpp b/src/executor/query/test/AggregateTest.cpp → src/executor/test/AggregateTest.cpp
diff --git a/src/executor/query/test/CMakeLists.txt → src/executor/test/CMakeLists.txt b/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

diff --git a/src/executor/query/test/DataCollectTest.cpp → src/executor/test/DataCollectTest.cpp b/src/executor/query/test/DataCollectTest.cpp → src/executor/test/DataCollectTest.cpp
diff --git a/src/executor/query/test/DataJoinTest.cpp → src/executor/test/DataJoinTest.cpp b/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 {

diff --git a/src/executor/query/test/DedupTest.cpp → src/executor/test/DedupTest.cpp b/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 {

diff --git a/src/executor/query/test/FilterTest.cpp → src/executor/test/FilterTest.cpp b/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"
 

diff --git a/src/executor/query/test/GetNeighborsTest.cpp → src/executor/test/GetNeighborsTest.cpp b/src/executor/query/test/GetNeighborsTest.cpp → src/executor/test/GetNeighborsTest.cpp
diff --git a/src/executor/query/test/LimitTest.cpp → src/executor/test/LimitTest.cpp b/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"

diff --git a/...xecutor/logic/test/LogicExecutorsTest.cpp → src/executor/test/LogicExecutorsTest.cpp b/...xecutor/logic/test/LogicExecutorsTest.cpp → src/executor/test/LogicExecutorsTest.cpp
diff --git a/src/executor/query/test/ProjectTest.cpp → src/executor/test/ProjectTest.cpp b/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"
 

diff --git a/src/executor/query/test/QueryTestBase.h → src/executor/test/QueryTestBase.h b/src/executor/query/test/QueryTestBase.h → src/executor/test/QueryTestBase.h
diff --git a/src/executor/query/test/SetExecutorTest.cpp → src/executor/test/SetExecutorTest.cpp b/src/executor/query/test/SetExecutorTest.cpp → src/executor/test/SetExecutorTest.cpp
diff --git a/src/executor/query/test/SortTest.cpp → src/executor/test/SortTest.cpp b/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"