Remove unused members and functions from test runner

Conflicts:
	src/framework/include/dpl/test/test_runner.h

Change-Id: Id7daab6582ced29db585322775cdfd54be708b0a

diff --git a/src/framework/include/dpl/test/test_runner.h b/src/framework/include/dpl/test/test_runner.h
index 9da89df..ee1d7c3 100644 (file)
--- a/src/framework/include/dpl/test/test_runner.h
+++ b/src/framework/include/dpl/test/test_runner.h
@@ -109,14 +109,8 @@ class TestRunner
 
     TestCaseStruct * m_currentTestCase;
 
-    typedef std::set<std::string> SelectedTestNameSet;
-    SelectedTestNameSet m_selectedTestNamesSet;
-    typedef std::set<std::string> SelectedTestGroupSet;
-    SelectedTestGroupSet m_selectedTestGroupSet;
     std::string m_currentGroup;
 
-    DPL::Atomic m_totalAssertions;
-
     // Terminate without any logs.
     // Some test requires to call fork function.
     // Child process must not produce any logs and should die quietly.
@@ -143,15 +137,12 @@ class TestRunner
     void CollectResult(const std::string& id, const TestResult &result);
 
   public:
-    void MarkAssertion();
-
     void RegisterTest(const char *testName, TestCase proc);
     void InitGroup(const char* name);
 
     int ExecTestRunner(int argc, char *argv[]);
     typedef std::vector<std::string> ArgsList;
     int ExecTestRunner(ArgsList args);
-    bool getRunIgnored() const;
     // The runner will terminate as soon as possible (after current test).
     void Terminate();
     bool GetAllowChildLogs();
@@ -206,8 +197,6 @@ typedef DPL::Singleton<TestRunner> TestRunnerSingleton;
 #define RUNNER_ASSERT_MSG(test, message)                                              \
     do                                                                                \
     {                                                                                 \
-        DPL::Test::TestRunnerSingleton::Instance().MarkAssertion();                   \
-                                                                                      \
         if (!(test))                                                                  \
         {                                                                             \
             std::ostringstream assertMsg;                                             \
@@ -225,8 +214,6 @@ typedef DPL::Singleton<TestRunner> TestRunnerSingleton;
 #define RUNNER_ASSERT_ERRNO_MSG(test, message)                                        \
     do                                                                                \
     {                                                                                 \
-        DPL::Test::TestRunnerSingleton::Instance().MarkAssertion();                   \
-                                                                                      \
         if (!(test))                                                                  \
         {                                                                             \
             const char *err = strerror(errno);                                        \

diff --git a/src/framework/src/test_runner.cpp b/src/framework/src/test_runner.cpp
index 726d434..95e1698 100644 (file)
--- a/src/framework/src/test_runner.cpp
+++ b/src/framework/src/test_runner.cpp
@@ -462,11 +462,6 @@ int TestRunner::ExecTestRunner(int argc, char *argv[])
     return ExecTestRunner(args);
 }
 
-void TestRunner::MarkAssertion()
-{
-    ++m_totalAssertions;
-}
-
 int TestRunner::ExecTestRunner(ArgsList args)
 {
     m_runIgnored = false;
@@ -672,11 +667,6 @@ int TestRunner::ExecTestRunner(ArgsList args)
     return 0;
 }
 
-bool TestRunner::getRunIgnored() const
-{
-    return m_runIgnored;
-}
-
 void TestRunner::Terminate()
 {
     m_terminate = true;