transfer get_account_detail_test to ExecutorItf

Signed-off-by: Mikhail Boldyrev <miboldyrev@gmail.com>
hyperledger · Sep 12, 2019 · cbc9a3e · cbc9a3e
1 parent 4af3143
commit cbc9a3e
Show file tree

Hide file tree

Showing 10 changed files with 517 additions and 854 deletions.
diff --git a/test/integration/acceptance/CMakeLists.txt b/test/integration/acceptance/CMakeLists.txt
@@ -127,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_acc_details.cpp;\
 query_permission_test_txs.cpp"
     )
 target_link_libraries(query_permissions_common_test

diff --git a/test/integration/acceptance/query_permission_common_tests.cpp b/test/integration/acceptance/query_permission_common_tests.cpp
@@ -4,14 +4,12 @@
  */
 
 #include "query_permission_fixture.hpp"
-#include "query_permission_test_acc_details.hpp"
 #include "query_permission_test_ast_txs.hpp"
 #include "query_permission_test_txs.hpp"
 
 using namespace common_constants;
-using QueryPermissionTestingTypes = ::testing::Types<QueryPermissionAssetTxs,
-                                                     QueryPermissionAccDetails,
-                                                     QueryPermissionTxs>;
+using QueryPermissionTestingTypes =
+    ::testing::Types<QueryPermissionAssetTxs, QueryPermissionTxs>;
 TYPED_TEST_CASE(QueryPermissionFixture, QueryPermissionTestingTypes, );
 
 /**
@@ -44,14 +42,9 @@ TYPED_TEST(QueryPermissionFixture,
  * @then the query recognized as stateless invalid
  */
 TYPED_TEST(QueryPermissionFixture, ReadEmptyAccountHavingPermissionForAll) {
-  // in GetAccountDetail query empty target is substituted with spectator
-  const auto checker = std::is_same<QueryPermissionAccDetails,
-                                    typename TestFixture::ParamType>::value
-      ? this->impl_.getGeneralResponseChecker()
-      : getQueryStatelesslyInvalidChecker();
   this->impl_.prepareState(*this, {this->impl_.kPermissionToQueryEveryone})
       .sendQuery(this->impl_.makeQuery(*this, "", kUserId, kUserKeypair),
-                 checker);
+                 getQueryStatelesslyInvalidChecker());
 }
 
 /*

diff --git a/test/integration/acceptance/query_permission_test_acc_details.cpp b/test/integration/acceptance/query_permission_test_acc_details.cpp
diff --git a/test/integration/acceptance/query_permission_test_acc_details.hpp b/test/integration/acceptance/query_permission_test_acc_details.hpp
diff --git a/test/integration/executor/CMakeLists.txt b/test/integration/executor/CMakeLists.txt
@@ -60,6 +60,15 @@ target_link_libraries(get_account_assets_test
     query_permission_test
     )
 
+addtest(get_account_detail_test get_account_detail_test.cpp)
+target_link_libraries(get_account_detail_test
+    account_detail_checker
+    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