Adjust restart of cynara in cynara-tests

[platform/core/test/security-tests.git] / src / cynara-tests / test_cases_async.cpp

diff --git a/src/cynara-tests/test_cases_async.cpp b/src/cynara-tests/test_cases_async.cpp
index e866d53..1412fcd 100644 (file)
--- a/src/cynara-tests/test_cases_async.cpp
+++ b/src/cynara-tests/test_cases_async.cpp
@@ -224,7 +224,6 @@ void tca08_disconnect1_func()
 {
     std::string testNo("08");
     int subtest = 1;
-    ServiceManager serviceManager(CynaraTestConsts::SERVICE);
     cynara_check_id id;
     RequestEntity callbackData = {RequestFunction(),
                                   CYNARA_API_ACCESS_DENIED,
@@ -234,7 +233,7 @@ void tca08_disconnect1_func()
     client.createRequest({testNo, subtest}, id, callbackData);
     client.assertStatus(READWRITE);
 
-    serviceManager.restartService();
+    restartCynaraServiceAndSockets();
 
     client.process();
     client.assertStatus(READ);
@@ -245,7 +244,6 @@ void tca08_disconnect2_func()
 {
     std::string testNo("08");
     int subtest = 2;
-    ServiceManager serviceManager(CynaraTestConsts::SERVICE);
     cynara_check_id id;
     RequestEntity callbackData = {RequestFunction(),
                                   CYNARA_API_ACCESS_DENIED,
@@ -255,12 +253,12 @@ void tca08_disconnect2_func()
     client.createRequest({testNo, subtest}, id, callbackData);
     client.assertStatus(READWRITE);
 
-    serviceManager.restartService();
+    restartCynaraServiceAndSockets();
 
     client.process();
     client.assertStatus(READ);
 
-    serviceManager.restartService();
+    restartCynaraServiceAndSockets();
 
     client.process();
     client.process(CYNARA_API_SUCCESS, Client::IGNORE_TIMEOUT);
@@ -271,10 +269,7 @@ void tca08_disconnect3_func()
     std::string testNo("08");
     int subtest = 2;
     cynara_check_id id;
-    RequestEntity callbackData = {[&](){
-                                           ServiceManager serviceManager(CynaraTestConsts::SERVICE);
-                                           serviceManager.restartService();
-                                       },
+    RequestEntity callbackData = {restartCynaraServiceAndSockets,
                                   CYNARA_API_ACCESS_DENIED,
                                   CYNARA_CALL_CAUSE_ANSWER};
     Client client;
@@ -293,7 +288,6 @@ void tca09_disconnect_and_cancel1_func()
 {
     std::string testNo("09");
     int subtest = 1;
-    ServiceManager serviceManager(CynaraTestConsts::SERVICE);
     cynara_check_id id;
     RequestEntity callbackData = {RequestFunction(),
                                   CYNARA_API_ACCESS_DENIED,
@@ -308,7 +302,7 @@ void tca09_disconnect_and_cancel1_func()
     client.process();
     client.assertStatus(READ);
 
-    serviceManager.restartService();
+    restartCynaraServiceAndSockets();
 
     client.cancel(id);
     client.assertStatus(READWRITE);
@@ -326,7 +320,6 @@ void tca09_disconnect_and_cancel2_func()
 {
     std::string testNo("09");
     int subtest = 2;
-    ServiceManager serviceManager(CynaraTestConsts::SERVICE);
     cynara_check_id id;
     RequestEntity callbackData = {RequestFunction(),
                                   CYNARA_API_ACCESS_DENIED,
@@ -344,7 +337,7 @@ void tca09_disconnect_and_cancel2_func()
     client.cancel(id);
     client.assertStatus(READWRITE);
 
-    serviceManager.restartService();
+    restartCynaraServiceAndSockets();
 
     //handle reconnect
     client.process();
@@ -390,8 +383,7 @@ void tca11_double_request_with_restart_func()
                                   CYNARA_CALL_CAUSE_ANSWER};
 
     RequestEntity callbackData = {[&](){
-                                      ServiceManager serviceManager(CynaraTestConsts::SERVICE);
-                                      serviceManager.restartService();
+                                      restartCynaraServiceAndSockets();
                                       client.createRequest({testNo}, id2, callbackData2);
                                   },
                                   CYNARA_API_ACCESS_DENIED,