From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 26 Mar 2009 15:35:30 +0000 (+0000)
Subject: no changes, just some cleanup (use compile-time asserts instead of run-time ones... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/62714742f35be79c2e6fe86306e37a23245a60da?ds=sidebyside

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
---

diff --git a/tests/test.cpp b/tests/test.cpp
index 077a95829c..54f56612f6 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -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;