Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

produce a better looking report with --time option (closes #10643)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-03-25 16:28:20 +00:00
parent 0eefa65979
commit 29e0c68ef5
1 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tests/test.cpp
View File

@@ -31,6 +31,7 @@
#include <cppunit/Protector.h> #include <cppunit/Protector.h>
#include <cppunit/Test.h> #include <cppunit/Test.h>
#include <cppunit/TestResult.h> #include <cppunit/TestResult.h>
#include <cppunit/TestFailure.h>
#include "wx/afterstd.h" #include "wx/afterstd.h"
#include "wx/cmdline.h" #include "wx/cmdline.h"
@@ -137,21 +138,45 @@ public:
virtual void startTest(CppUnit::Test *test) virtual void startTest(CppUnit::Test *test)
{ {
std::cout << test->getName () << " "; wxPrintf(" %-60s ", test->getName());
m_result = RESULT_OK;
m_watch.Start(); m_watch.Start();
} }
virtual void addFailure(const CppUnit::TestFailure& failure) {
m_result = failure.isError() ? RESULT_ERROR : RESULT_FAIL;
}
virtual void endTest(CppUnit::Test * WXUNUSED(test)) virtual void endTest(CppUnit::Test * WXUNUSED(test))
{ {
m_watch.Pause(); m_watch.Pause();
if ( m_timing ) wxPrintf(GetResultStr(m_result));
std::cout << " (in "<< m_watch.Time() << " ms )"; if (m_timing)
std::cout << "\n"; wxPrintf(" %6d ms", m_watch.Time());
wxPrintf("\n");
} }
protected : protected :
enum ResultType {
RESULT_OK = 0,
RESULT_FAIL,
RESULT_ERROR
};
wxString GetResultStr(ResultType type) const {
static const wxChar* ResultTypeNames[] = {
wxT("OK"),
wxT(" F"),
wxT("ER")
};
wxCHECK_MSG(static_cast<size_t>(type) < WXSIZEOF(ResultTypeNames),
ResultTypeNames[RESULT_ERROR], "invalid entry type");
return ResultTypeNames[type];
}
bool m_timing; bool m_timing;
wxStopWatch m_watch; wxStopWatch m_watch;
ResultType m_result;
}; };
#if wxUSE_GUI #if wxUSE_GUI
@@ -404,7 +429,8 @@ int TestApp::OnRun()
// giving "uncaught exception of unknown type" messages // giving "uncaught exception of unknown type" messages
runner.eventManager().pushProtector(new wxUnitTestProtector); runner.eventManager().pushProtector(new wxUnitTestProtector);
return runner.run("", false, true, !verbose) ? EXIT_SUCCESS : EXIT_FAILURE; bool printProgress = !(verbose || m_detail || m_timing);
return runner.run("", false, true, printProgress) ? EXIT_SUCCESS : EXIT_FAILURE;
} }
int TestApp::OnExit() int TestApp::OnExit()