From 00db8990112f00183e0647fb680d4255fe5cb724 Mon Sep 17 00:00:00 2001 From: Marcin Niesluchowski Date: Mon, 13 Oct 2014 17:02:17 +0200 Subject: [PATCH] Change FailStatus from struct to enum class Change-Id: I9df26486b0b009e5f97b99358d0112556d87a700 --- tests/common/summary_collector.cpp | 4 ++-- tests/common/summary_collector.h | 6 +++--- tests/framework/include/dpl/test/statistic.h | 4 ++-- tests/framework/include/dpl/test/test_results_collector.h | 13 +++++-------- .../include/dpl/test/test_results_collector_console.h | 2 +- .../include/dpl/test/test_results_collector_html.h | 2 +- .../framework/include/dpl/test/test_results_collector_xml.h | 2 +- tests/framework/include/dpl/test/test_runner.h | 2 +- tests/framework/src/test_results_collector_console.cpp | 8 ++++---- tests/framework/src/test_results_collector_html.cpp | 8 ++++---- tests/framework/src/test_results_collector_xml.cpp | 8 ++++---- tests/framework/src/test_runner.cpp | 2 +- 12 files changed, 29 insertions(+), 32 deletions(-) diff --git a/tests/common/summary_collector.cpp b/tests/common/summary_collector.cpp index 5a96530..3af8157 100644 --- a/tests/common/summary_collector.cpp +++ b/tests/common/summary_collector.cpp @@ -58,7 +58,7 @@ void SummaryCollector::Finish() void SummaryCollector::CollectResult(const std::string& /*id*/, const std::string& /*description*/, - const FailStatus::Type status, + const FailStatus status, const std::string& /*reason = ""*/, const bool& isPerformanceTest, const std::chrono::system_clock::duration& performanceTime, @@ -77,7 +77,7 @@ void SummaryCollector::CollectResult(const std::string& /*id*/, void SummaryCollector::CollectResult(const std::string& /*id*/, const std::string& /*description*/, - const FailStatus::Type status, + const FailStatus status, const std::string& /*reason = ""*/) { switch (status) { diff --git a/tests/common/summary_collector.h b/tests/common/summary_collector.h index 3f2eb3c..f04b2c2 100644 --- a/tests/common/summary_collector.h +++ b/tests/common/summary_collector.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Samsung Electronics Co., Ltd All Rights Reserved + * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,11 +41,11 @@ class SummaryCollector : public DPL::Test::TestResultsCollectorBase void Finish(); void CollectResult(const std::string& /*id*/, const std::string& /*description*/, - const FailStatus::Type status, + const FailStatus status, const std::string& /*reason = ""*/); void CollectResult(const std::string& /*id*/, const std::string& /*description*/, - const FailStatus::Type status, + const FailStatus status, const std::string& /*reason = ""*/, const bool& isPerformanceTest = false, const std::chrono::system_clock::duration& diff --git a/tests/framework/include/dpl/test/statistic.h b/tests/framework/include/dpl/test/statistic.h index a4aaccc..fe550bd 100644 --- a/tests/framework/include/dpl/test/statistic.h +++ b/tests/framework/include/dpl/test/statistic.h @@ -42,10 +42,10 @@ class Statistic m_count(0) {} - void AddTest(TestResultsCollectorBase::FailStatus::Type type) + void AddTest(TestResultsCollectorBase::FailStatus status) { ++m_count; - switch (type) { + switch (status) { case TestResultsCollectorBase::FailStatus::FAILED: ++m_failed; break; case TestResultsCollectorBase::FailStatus::IGNORED: ++m_ignored; diff --git a/tests/framework/include/dpl/test/test_results_collector.h b/tests/framework/include/dpl/test/test_results_collector.h index f1ba2f6..ac568e4 100644 --- a/tests/framework/include/dpl/test/test_results_collector.h +++ b/tests/framework/include/dpl/test/test_results_collector.h @@ -43,14 +43,11 @@ class TestResultsCollectorBase : public: typedef TestResultsCollectorBase* (*CollectorConstructorFunc)(); typedef std::list TestCaseIdList; - struct FailStatus + enum class FailStatus { - enum Type - { - NONE, - FAILED, - IGNORED - }; + NONE, + FAILED, + IGNORED }; virtual ~TestResultsCollectorBase() {} @@ -67,7 +64,7 @@ class TestResultsCollectorBase : virtual void CollectTestsCasesList(const TestCaseIdList& /*list*/) {} virtual void CollectResult(const std::string& id, const std::string& description, - const FailStatus::Type status = FailStatus::NONE, + const FailStatus status = FailStatus::NONE, const std::string& reason = "", const bool& isPerformanceTest = false, const std::chrono::system_clock::duration& performanceTime = std::chrono::microseconds::zero(), diff --git a/tests/framework/include/dpl/test/test_results_collector_console.h b/tests/framework/include/dpl/test/test_results_collector_console.h index 8d67a0b..06d9467 100644 --- a/tests/framework/include/dpl/test/test_results_collector_console.h +++ b/tests/framework/include/dpl/test/test_results_collector_console.h @@ -43,7 +43,7 @@ private: virtual void CollectCurrentTestGroupName(const std::string& name); virtual void CollectResult(const std::string& id, const std::string& /*description*/, - const FailStatus::Type status = FailStatus::NONE, + const FailStatus status = FailStatus::NONE, const std::string& reason = "", const bool& isPerformanceTest = true, const std::chrono::system_clock::duration& performanceTime diff --git a/tests/framework/include/dpl/test/test_results_collector_html.h b/tests/framework/include/dpl/test/test_results_collector_html.h index 5bc1c9f..4a7b764 100644 --- a/tests/framework/include/dpl/test/test_results_collector_html.h +++ b/tests/framework/include/dpl/test/test_results_collector_html.h @@ -48,7 +48,7 @@ private: virtual void CollectCurrentTestGroupName(const std::string& name); virtual void CollectResult(const std::string& id, const std::string& /*description*/, - const FailStatus::Type status = FailStatus::NONE, + const FailStatus status = FailStatus::NONE, const std::string& reason = "", const bool& isPerformanceTest = false, const std::chrono::system_clock::duration& performanceTime diff --git a/tests/framework/include/dpl/test/test_results_collector_xml.h b/tests/framework/include/dpl/test/test_results_collector_xml.h index be5fcec..422af1c 100644 --- a/tests/framework/include/dpl/test/test_results_collector_xml.h +++ b/tests/framework/include/dpl/test/test_results_collector_xml.h @@ -46,7 +46,7 @@ private: virtual void CollectCurrentTestGroupName(const std::string& name); virtual void CollectResult(const std::string& id, const std::string& /*description*/, - const FailStatus::Type status = FailStatus::NONE, + const FailStatus status = FailStatus::NONE, const std::string& reason = "", const bool& isPerformanceTest = false, const std::chrono::system_clock::duration& performanceTime diff --git a/tests/framework/include/dpl/test/test_runner.h b/tests/framework/include/dpl/test/test_runner.h index 70117e3..4b41cfb 100644 --- a/tests/framework/include/dpl/test/test_runner.h +++ b/tests/framework/include/dpl/test/test_runner.h @@ -137,7 +137,7 @@ class TestRunner void CollectResult(const std::string& id, const std::string& description, - const TestResultsCollectorBase::FailStatus::Type status + const TestResultsCollectorBase::FailStatus status = TestResultsCollectorBase::FailStatus::NONE, const std::string& reason = std::string(), const bool& isPerformanceTest = false, diff --git a/tests/framework/src/test_results_collector_console.cpp b/tests/framework/src/test_results_collector_console.cpp index 375c385..6c92db5 100644 --- a/tests/framework/src/test_results_collector_console.cpp +++ b/tests/framework/src/test_results_collector_console.cpp @@ -61,7 +61,7 @@ void ConsoleCollector::Finish() void ConsoleCollector::CollectResult(const std::string& id, const std::string& /*description*/, - const FailStatus::Type status, + const FailStatus status, const std::string& reason, const bool& isPerformanceTest, const std::chrono::system_clock::duration& performanceTime, @@ -72,7 +72,7 @@ void ConsoleCollector::CollectResult(const std::string& id, printf("Running test case %-60s", tmp.c_str()); switch (status) { - case TestResultsCollectorBase::FailStatus::NONE: + case FailStatus::NONE: if (isPerformanceTest) { if (performanceMaxTime <= std::chrono::microseconds::zero()) { printf(GREEN_RESULT_OK_TIME, @@ -93,10 +93,10 @@ void ConsoleCollector::CollectResult(const std::string& id, } printf(GREEN_RESULT_OK); break; - case TestResultsCollectorBase::FailStatus::FAILED: + case FailStatus::FAILED: PrintfErrorMessage(" FAILED ", reason, true); break; - case TestResultsCollectorBase::FailStatus::IGNORED: + case FailStatus::IGNORED: PrintfIgnoredMessage("Ignored ", reason, true); break; default: diff --git a/tests/framework/src/test_results_collector_html.cpp b/tests/framework/src/test_results_collector_html.cpp index 77111ce..c34922a 100644 --- a/tests/framework/src/test_results_collector_html.cpp +++ b/tests/framework/src/test_results_collector_html.cpp @@ -107,7 +107,7 @@ bool HtmlCollector::ParseCollectorSpecificArg(const std::string& arg) void HtmlCollector::CollectResult(const std::string& id, const std::string& /*description*/, - const FailStatus::Type status, + const FailStatus status, const std::string& reason, const bool& isPerformanceTest, const std::chrono::system_clock::duration& performanceTime, @@ -118,7 +118,7 @@ void HtmlCollector::CollectResult(const std::string& id, fprintf(m_fp.Get(), "Running test case %-100s", tmp.c_str()); switch (status) { - case TestResultsCollectorBase::FailStatus::NONE: + case FailStatus::NONE: if (isPerformanceTest) { if (performanceMaxTime <= std::chrono::microseconds::zero()) { fprintf(m_fp.Get(), GREEN_RESULT_OK_TIME, @@ -138,10 +138,10 @@ void HtmlCollector::CollectResult(const std::string& id, } fprintf(m_fp.Get(), GREEN_RESULT_OK); break; - case TestResultsCollectorBase::FailStatus::FAILED: + case FailStatus::FAILED: PrintfErrorMessage(" FAILED ", reason, true); break; - case TestResultsCollectorBase::FailStatus::IGNORED: + case FailStatus::IGNORED: PrintfIgnoredMessage("Ignored ", reason, true); break; default: diff --git a/tests/framework/src/test_results_collector_xml.cpp b/tests/framework/src/test_results_collector_xml.cpp index efdb458..f65d6fd 100644 --- a/tests/framework/src/test_results_collector_xml.cpp +++ b/tests/framework/src/test_results_collector_xml.cpp @@ -127,7 +127,7 @@ bool XmlCollector::ParseCollectorSpecificArg(const std::string& arg) void XmlCollector::CollectResult(const std::string& id, const std::string&, - const FailStatus::Type status, + const FailStatus status, const std::string& reason, const bool& isPerformanceTest, const std::chrono::system_clock::duration& performanceTime, @@ -138,7 +138,7 @@ void XmlCollector::CollectResult(const std::string& id, m_resultBuffer.append(EscapeSpecialCharacters(id)); m_resultBuffer.append("\""); switch (status) { - case TestResultsCollectorBase::FailStatus::NONE: + case FailStatus::NONE: if (isPerformanceTest) { if (performanceMaxTime <= std::chrono::microseconds::zero()) { m_resultBuffer.append(" status=\"OK\" time=\""); @@ -162,12 +162,12 @@ void XmlCollector::CollectResult(const std::string& id, } m_resultBuffer.append(" status=\"OK\"/>\n"); break; - case TestResultsCollectorBase::FailStatus::FAILED: + case FailStatus::FAILED: m_resultBuffer.append(" status=\"FAILED\">\n"); PrintfErrorMessage("FAILED", EscapeSpecialCharacters(reason), true); m_resultBuffer.append("\t\t\n"); break; - case TestResultsCollectorBase::FailStatus::IGNORED: + case FailStatus::IGNORED: m_resultBuffer.append(" status=\"Ignored\">\n"); PrintfIgnoredMessage("Ignored", EscapeSpecialCharacters( reason), true); diff --git a/tests/framework/src/test_runner.cpp b/tests/framework/src/test_runner.cpp index ba67fd2..7818ab2 100644 --- a/tests/framework/src/test_runner.cpp +++ b/tests/framework/src/test_runner.cpp @@ -421,7 +421,7 @@ void TestRunner::setCurrentTestCasePerformanceResult(bool isPerformanceTest, void TestRunner::CollectResult( const std::string& id, const std::string& description, - const TestResultsCollectorBase::FailStatus::Type status, + const TestResultsCollectorBase::FailStatus status, const std::string& reason, const bool& isPerformanceTest, const std::chrono::system_clock::duration& performanceTestDurationTime, -- 2.7.4