no changes, just some cleanup (use compile-time asserts instead of run-time ones; use "FAIL" instead of "F")

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-03-26 15:35:30 +00:00
parent 875f82b1b6
commit 62714742f3

View File

@@ -143,7 +143,8 @@ public:
m_watch.Start();
}
virtual void addFailure(const CppUnit::TestFailure& failure) {
virtual void addFailure(const CppUnit::TestFailure& failure)
{
m_result = failure.isError() ? RESULT_ERROR : RESULT_FAIL;
}
@@ -157,21 +158,27 @@ public:
}
protected :
enum ResultType {
enum ResultType
{
RESULT_OK = 0,
RESULT_FAIL,
RESULT_ERROR
RESULT_ERROR,
RESULT_MAX
};
wxString GetResultStr(ResultType type) const {
static const wxChar* ResultTypeNames[] = {
wxT("OK"),
wxT(" F"),
wxT("ER")
wxString GetResultStr(ResultType type) const
{
static const char *resultTypeNames[] =
{
" OK",
"FAIL",
" ERR"
};
wxCHECK_MSG(static_cast<size_t>(type) < WXSIZEOF(ResultTypeNames),
ResultTypeNames[RESULT_ERROR], "invalid entry type");
return ResultTypeNames[type];
wxCOMPILE_TIME_ASSERT( WXSIZEOF(resultTypeNames) == RESULT_MAX,
ResultTypeNamesMismatch );
return resultTypeNames[type];
}
bool m_timing;