Add init and finish functionality

[platform/core/test/security-tests.git] / src / framework / include / dpl / test / test_runner_child.h

diff --git a/src/framework/include/dpl/test/test_runner_child.h b/src/framework/include/dpl/test/test_runner_child.h
index 8c52600..ea6d8c9 100644 (file)
--- a/src/framework/include/dpl/test/test_runner_child.h
+++ b/src/framework/include/dpl/test/test_runner_child.h
@@ -16,12 +16,19 @@
 /*
  * @file        test_runner_child.h
  * @author      Bartlomiej Grzelewski (b.grzelewski@samsung.com)
+ * @author      Marcin Niesluchowski (m.niesluchow@samsung.com)
  * @version     1.0
  * @brief       This file is the header file of test runner
  */
 #ifndef DPL_TEST_RUNNER_CHILD_H
 #define DPL_TEST_RUNNER_CHILD_H
 
+#include <functional>
+#include <memory>
+#include <tuple>
+
+#include <dpl/availability.h>
+#include <dpl/test/test_case_extended.h>
 #include <dpl/test/test_runner.h>
 
 namespace DPL {
@@ -74,22 +81,23 @@ class PipeWrapper : DPL::Noncopyable
     int m_pipefd[2];
 };
 
-void RunChildProc(TestRunner::TestCase procChild);
+void RunChildProc(const std::function<void(void)> &testFunc);
 } // namespace Test
 } // namespace DPL
 
-#define RUNNER_CHILD_TEST(Proc)                                                      \
-    void Proc();                                                                     \
-    void Proc##Child();                                                              \
-    static int Static##Proc##Init()                                                  \
-    {                                                                                \
-        DPL::Test::TestRunnerSingleton::Instance().RegisterTest(#Proc, &Proc);       \
-        return 0;                                                                    \
-    }                                                                                \
-    const int DPL_UNUSED Static##Proc##InitVar = Static##Proc##Init();               \
-    void Proc(){                                                                     \
-        DPL::Test::RunChildProc(&Proc##Child);                                       \
-    }                                                                                \
-    void Proc##Child()
+#define RUNNER_CHILD_TEST(Proc, ...)                                                    \
+    void Proc(std::tuple<__VA_ARGS__> &optionalArgsTuple);                              \
+    void Proc##Child(std::tuple<__VA_ARGS__> &optionalArgsTuple);                       \
+    static int Static##Proc##Init()                                                     \
+    {                                                                                   \
+        DPL::Test::TestRunnerSingleton::Instance().RegisterTest(                        \
+            new DPL::Test::TestCaseExtended<__VA_ARGS__>(#Proc, &Proc));                \
+        return 0;                                                                       \
+    }                                                                                   \
+    const int DPL_UNUSED Static##Proc##InitVar = Static##Proc##Init();                  \
+    void Proc(std::tuple<__VA_ARGS__> &optionalArgsTuple) {                             \
+        DPL::Test::RunChildProc(std::bind(Proc##Child, optionalArgsTuple));             \
+    }                                                                                   \
+    void Proc##Child(std::tuple<__VA_ARGS__> &optionalArgsTuple DPL_UNUSED)
 
 #endif // DPL_TEST_RUNNER_CHILD_H