transfer get_account_assets_test to ExecutorItf

Signed-off-by: Mikhail Boldyrev <miboldyrev@gmail.com>
hyperledger · Sep 5, 2019 · afef70b · afef70b
1 parent b1eb5fa
commit afef70b
Show file tree

Hide file tree

Showing 8 changed files with 272 additions and 561 deletions.
diff --git a/test/integration/acceptance/CMakeLists.txt b/test/integration/acceptance/CMakeLists.txt
@@ -95,16 +95,6 @@ target_link_libraries(tx_heavy_data
     integration_framework
     )
 
-addtest(get_account_assets_test
-    "get_account_assets_test.cpp;\
-query_permission_test_ast.cpp;\
-query_permission_test_base.cpp"
-    )
-target_link_libraries(get_account_assets_test
-    acceptance_fixture
-    integration_framework
-    )
-
 addtest(get_roles_test get_roles_test.cpp)
 target_link_libraries(get_roles_test
     acceptance_fixture
@@ -137,7 +127,6 @@ addtest(query_permissions_common_test
     "query_permission_common_tests.cpp;\
 query_permission_test_ast_txs.cpp;\
 query_permission_test_base.cpp;\
-query_permission_test_ast.cpp;\
 query_permission_test_acc_details.cpp;\
 query_permission_test_txs.cpp;\
 query_permission_test_signatories.cpp"

diff --git a/test/integration/acceptance/get_account_assets_test.cpp b/test/integration/acceptance/get_account_assets_test.cpp
diff --git a/test/integration/acceptance/query_permission_common_tests.cpp b/test/integration/acceptance/query_permission_common_tests.cpp
@@ -5,15 +5,13 @@
 
 #include "query_permission_fixture.hpp"
 #include "query_permission_test_acc_details.hpp"
-#include "query_permission_test_ast.hpp"
 #include "query_permission_test_ast_txs.hpp"
 #include "query_permission_test_signatories.hpp"
 #include "query_permission_test_txs.hpp"
 
 using namespace common_constants;
 using QueryPermissionTestingTypes =
     ::testing::Types<QueryPermissionAssetTxs,
-                     QueryPermissionAssets,
                      QueryPermissionAccDetails,
                      QueryPermissionTxs,
                      QueryPermissionSignatories>;

diff --git a/test/integration/acceptance/query_permission_test_ast.cpp b/test/integration/acceptance/query_permission_test_ast.cpp
diff --git a/test/integration/acceptance/query_permission_test_ast.hpp b/test/integration/acceptance/query_permission_test_ast.hpp
diff --git a/test/integration/executor/CMakeLists.txt b/test/integration/executor/CMakeLists.txt
@@ -52,6 +52,14 @@ target_link_libraries(create_account_test
     executor_fixture_param_provider
     )
 
+addtest(get_account_assets_test get_account_assets_test.cpp)
+target_link_libraries(get_account_assets_test
+    executor_fixture
+    executor_fixture_param_provider
+    common_test_constants
+    query_permission_test
+    )
+
 add_library(query_permission_test query_permission_test.cpp)
 target_link_libraries(query_permission_test
     executor_fixture