Fix TC according to on_demand style

Change-Id: I838690016ce7aa0f1f61faf3ad45b0543667dcc2

3 files changed, 14 insertions, 20 deletions

diff --git a/tests/logic_.cpp b/tests/logic_.cpp
index 5679b96..f603168 100644
--- a/tests/logic_.cpp
+++ b/tests/logic_.cpp
@@ -129,9 +129,9 @@ void Logic_::wait_for_worker(int installCnt, int uninstallCnt, int bufferCnt)
                        m_bufferCnt == bufferCnt;
             }
     );
+    reset_cnt();
     _m_mutex_wait_cv.unlock();
     BOOST_REQUIRE(!timeout);
-    reset_cnt();
 }
 
 const std::list<app_t>& Logic_::get_buffer_()
diff --git a/tests/logic_.h b/tests/logic_.h
index a9317aa..690e986 100644
--- a/tests/logic_.h
+++ b/tests/logic_.h
@@ -53,7 +53,7 @@ class Logic_ : public Logic {
         int m_bufferCnt;
 
         void process_event(const event_t &event);
-        void app_processed();
+        void app_processed() override;
         std::condition_variable _m_wait_for_process;
         std::mutex _m_mutex_wait_cv;
 };
diff --git a/tests/test_logic.cpp b/tests/test_logic.cpp
index 46f7a68..589442a 100644
--- a/tests/test_logic.cpp
+++ b/tests/test_logic.cpp
@@ -65,7 +65,6 @@ BOOST_AUTO_TEST_CASE(logic_setup) {
 }
 
 BOOST_AUTO_TEST_CASE(logic_workflow_mixed) {
-
     BOOST_REQUIRE(setup() == NO_ERROR);
 
     wait_for_worker();
@@ -129,7 +128,7 @@ BOOST_AUTO_TEST_CASE(logic_workflow_mixed_2) {
     wait_for_worker();
 
     // turn off the network
-    connman_callback_manual_(true);
+    connman_callback_manual_(false);
 
     // add applications:
     app_t app1("app_1", "pkg_1", 5001, {});
@@ -147,6 +146,9 @@ BOOST_AUTO_TEST_CASE(logic_workflow_mixed_2) {
     app_t app5("app_5", "pkg_5", 100, {{"OCSP_APP_REVOKED"}}); // popup will fail
     pkgmgr_install_manual_(app5);
 
+    // turn on the Internet - buffer should be processed
+    connman_callback_manual_(true);
+
     wait_for_worker(5, 0, 5);
     std::list<app_t> buff = get_buffer_();
 #if POPUP
@@ -278,14 +280,14 @@ BOOST_AUTO_TEST_CASE(logic_workflow_OCSP_CHECK_AGAIN) {
     app_t app2("app_2", "pkg_2", 5002, {{"OCSP_CHECK_AGAIN"}});
     pkgmgr_install_manual_(app2);
 
-    connman_callback_manual_(true);
-
     app_t app3("app_3", "pkg_3", 100, {{"OCSP_CHECK_AGAIN"}});
     pkgmgr_install_manual_(app3);
 
     app_t app4("app_4", "pkg_4", 5004, {{"OCSP_CHECK_AGAIN"}});
     pkgmgr_install_manual_(app4);
 
+    connman_callback_manual_(true);
+
     wait_for_worker(4, 0, 4);
 
     std::list<app_t> buff = get_buffer_();
@@ -293,13 +295,6 @@ BOOST_AUTO_TEST_CASE(logic_workflow_OCSP_CHECK_AGAIN) {
 
     BOOST_CHECK_MESSAGE(buff == apps, log_apps(apps, buff));
 
-    connman_callback_manual_(false);
-
-    wait_for_worker(0, 0, 0);
-
-    buff = get_buffer_();
-    BOOST_CHECK_MESSAGE(buff == apps, log_apps(apps, buff));
-
     connman_callback_manual_(true);
 
     wait_for_worker(0, 0, 4);
@@ -326,7 +321,6 @@ BOOST_AUTO_TEST_CASE(logic_workflow_OCSP_CERT_ERROR) {
     app_t app2("app_2", "pkg_2", 5002, {{"OCSP_CERT_ERROR"}});
     pkgmgr_install_manual_(app2);
 
-    connman_callback_manual_(true);
 
     app_t app3("app_3", "pkg_3", 100, {{"OCSP_CERT_ERROR"}});
     pkgmgr_install_manual_(app3);
@@ -334,6 +328,7 @@ BOOST_AUTO_TEST_CASE(logic_workflow_OCSP_CERT_ERROR) {
     app_t app4("app_4", "pkg_4", 5004, {{"OCSP_CERT_ERROR"}});
     pkgmgr_install_manual_(app4);
 
+    connman_callback_manual_(true);
     wait_for_worker(4, 0, 4);
     std::list<app_t> buff = get_buffer_();
 
@@ -371,14 +366,13 @@ BOOST_AUTO_TEST_CASE(logic_workflow_OCSP_APP_REVOKED) {
     app_t app2("app_2", "pkg_2", 5002, {{"OCSP_APP_REVOKED"}});
     pkgmgr_install_manual_(app2);
 
-    connman_callback_manual_(true);
-
     app_t app3("app_3", "pkg_3", 5003, {{"OCSP_APP_REVOKED"}});
     pkgmgr_install_manual_(app3);
 
     app_t app4("app_4", "pkg_4", 5004, {{"OCSP_APP_REVOKED"}});
     pkgmgr_install_manual_(app4);
 
+    connman_callback_manual_(true);
     wait_for_worker(4, 0, 4);
 
     std::list<app_t> buff = get_buffer_();
@@ -417,14 +411,14 @@ BOOST_AUTO_TEST_CASE(logic_workflow_OCSP_APP_REVOKED_2) {
     app_t app2("app_2", "pkg_2", 1002, {{"OCSP_APP_REVOKED"}});
     pkgmgr_install_manual_(app2);
 
-    connman_callback_manual_(true);
-
     app_t app3("app_3", "pkg_3", 1003, {{"OCSP_APP_REVOKED"}});
     pkgmgr_install_manual_(app3);
 
     app_t app4("app_4", "pkg_4", 1004, {{"OCSP_APP_REVOKED"}});
     pkgmgr_install_manual_(app4);
 
+    connman_callback_manual_(true);
+
     wait_for_worker(4, 0, 4);
 
     std::list<app_t> buff = get_buffer_();
@@ -434,14 +428,14 @@ BOOST_AUTO_TEST_CASE(logic_workflow_OCSP_APP_REVOKED_2) {
 
     connman_callback_manual_(true);
 
-    wait_for_worker();
+    wait_for_worker(0, 0, 4);
 
     buff = get_buffer_();
     BOOST_CHECK_MESSAGE(buff == apps, log_apps(apps, buff));
 
     connman_callback_manual_(true);
 
-    wait_for_worker();
+    wait_for_worker(0, 0, 4);
 
     buff = get_buffer_();
     BOOST_CHECK_MESSAGE(buff == apps, log_apps(apps, buff));