From 690967ca2c244986047c874cd2fd97ae25c9dc49 Mon Sep 17 00:00:00 2001
From: Marcin Niesluchowski <m.niesluchow@samsung.com>
Date: Thu, 16 Oct 2014 10:54:15 +0200
Subject: [PATCH] Remove unnecessary test result from test runner

Change-Id: I6a5257e0f4325f76219f798bc7e352fbef81376b
---
 src/framework/include/dpl/test/test_runner.h |  4 +---
 src/framework/src/test_runner.cpp            | 14 ++++++--------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/framework/include/dpl/test/test_runner.h b/src/framework/include/dpl/test/test_runner.h
index a95ac48..8fb8803 100644
--- a/src/framework/include/dpl/test/test_runner.h
+++ b/src/framework/include/dpl/test/test_runner.h
@@ -125,9 +125,7 @@ class TestRunner
     bool filterByXML(std::map<std::string, bool> & casesMap);
     void normalizeXMLTag(std::string& str, const std::string& testcase);
 
-    enum Status { FAILED, IGNORED, PASS };
-
-    Status RunTestCase(const TestCaseStruct& testCase);
+    void RunTestCase(const TestCaseStruct& testCase);
 
     void setCurrentTestCase(TestCaseStruct* testCase);
     TestCaseStruct *getCurrentTestCase();
diff --git a/src/framework/src/test_runner.cpp b/src/framework/src/test_runner.cpp
index 5d82330..b753cdd 100644
--- a/src/framework/src/test_runner.cpp
+++ b/src/framework/src/test_runner.cpp
@@ -243,7 +243,7 @@ bool TestRunner::filterByXML(std::map<std::string, bool> & casesMap)
     return true;
 }
 
-TestRunner::Status TestRunner::RunTestCase(const TestCaseStruct& testCase)
+void TestRunner::RunTestCase(const TestCaseStruct& testCase)
 {
     setCurrentTestCase(&(const_cast<TestCaseStruct &>(testCase)));
     try {
@@ -255,7 +255,7 @@ TestRunner::Status TestRunner::RunTestCase(const TestCaseStruct& testCase)
                                  getConcatedFailReason(e.GetMessage())));
 
         setCurrentTestCase(nullptr);
-        return FAILED;
+        return;
     } catch (const Ignored &e) {
         if (m_runIgnored) {
             // Simple test have to be implemented
@@ -264,30 +264,28 @@ TestRunner::Status TestRunner::RunTestCase(const TestCaseStruct& testCase)
         }
 
         setCurrentTestCase(nullptr);
-        return IGNORED;
+        return;
     } catch (const std::exception &) {
         // std exception failure
         CollectResult(testCase.name,
                       TestResult(TestResult::FailStatus::FAILED, "std exception"));
 
         setCurrentTestCase(nullptr);
-        return FAILED;
+        return;
     } catch (...) {
         // Unknown exception failure
         CollectResult(testCase.name,
                       TestResult(TestResult::FailStatus::FAILED, "unknown exception"));
         setCurrentTestCase(nullptr);
-        return FAILED;
+        return;
     }
 
+    // Everything OK
     CollectResult(testCase.name,
                   TestResult(TestResult::FailStatus::NONE,
                              std::string(),
                              testCase.performance));
     setCurrentTestCase(nullptr);
-
-    // Everything OK
-    return PASS;
 }
 
 void TestRunner::RunTests()
-- 
2.7.4