restore code preventing the events being generated from inside our own DoRead/Write...

[wxWidgets.git] / tests / test.cpp

diff --git a/tests/test.cpp b/tests/test.cpp
index 1559f2944f8059d974fd97fe23a33c80169b5c2d..9b1f65d0650f92a83ac344e21b671b273542a6c6 100644 (file)
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -20,6 +20,18 @@
     #include "wx/wx.h"
 #endif
 
+#include "wx/beforestd.h"
+#ifdef __VISUALC__
+    #pragma warning(disable:4100)
+#endif
+#include <cppunit/TestListener.h>
+#ifdef __VISUALC__
+    #pragma warning(default:4100)
+#endif
+#include <cppunit/Test.h>
+#include <cppunit/TestResult.h>
+#include "wx/afterstd.h"
+
 #include "wx/cmdline.h"
 #include <iostream>
 
@@ -27,6 +39,37 @@ using CppUnit::Test;
 using CppUnit::TestSuite;
 using CppUnit::TestFactoryRegistry;
 
+
+// Displays the test name before starting to execute it: this helps with
+// diagnosing where exactly does a test crash or hang when/if it does.
+class DetailListener : public CppUnit::TestListener
+{
+public:
+    DetailListener(bool doTiming = false):
+        CppUnit::TestListener(),
+        m_timing(doTiming)
+    {
+    }
+
+    virtual void startTest(CppUnit::Test *test)
+    {
+        std::cout << test->getName () << " ";
+        m_watch.Start();
+    }
+
+    virtual void endTest(CppUnit::Test * WXUNUSED(test))
+    {
+        m_watch.Pause();
+        if ( m_timing )
+            std::cout << " (in "<< m_watch.Time() << " ms )";
+        std::cout << "\n";
+    }
+
+protected :
+    bool m_timing;
+    wxStopWatch m_watch;
+};
+
 using namespace std;
 
 #if wxUSE_GUI
@@ -49,12 +92,25 @@ public:
     virtual int  OnRun();
     virtual int  OnExit();
 
+#ifdef __WXDEBUG__
+    virtual void OnAssertFailure(const wxChar *,
+                                 int,
+                                 const wxChar *,
+                                 const wxChar *,
+                                 const wxChar *)
+    {
+        throw TestAssertFailure();
+    }
+#endif // __WXDEBUG__
+
 private:
     void List(Test *test, const string& parent = "") const;
 
     // command lines options/parameters
     bool m_list;
     bool m_longlist;
+    bool m_detail;
+    bool m_timing;
     vector<string> m_registries;
 };
 
@@ -97,6 +153,12 @@ void TestApp::OnInitCmdLine(wxCmdLineParser& parser)
         { wxCMD_LINE_SWITCH, "L", "longlist",
             "list the test cases, do not run them",
             wxCMD_LINE_VAL_NONE, 0 },
+        { wxCMD_LINE_SWITCH, "d", "detail",
+            "print the test case names, run them",
+            wxCMD_LINE_VAL_NONE, 0 },
+        { wxCMD_LINE_SWITCH, "t", "timing",
+            "print names and mesure running time of individual test, run them",
+            wxCMD_LINE_VAL_NONE, 0 },
         { wxCMD_LINE_PARAM, NULL, NULL, "REGISTRY", wxCMD_LINE_VAL_STRING,
             wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },
         wxCMD_LINE_DESC_END
@@ -117,6 +179,8 @@ bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser)
 
     m_longlist = parser.Found(_T("longlist"));
     m_list = m_longlist || parser.Found(_T("list"));
+    m_timing = parser.Found(_T("timing"));
+    m_detail = !m_timing && parser.Found(_T("detail"));
 
     return TestAppBase::OnCmdLineParsed(parser);
 }
@@ -163,6 +227,11 @@ int TestApp::OnRun()
     // is not very useful so unbuffer cout to work around this
     cout.setf(ios::unitbuf);
 
+    // add detail listener if needed
+    DetailListener detailListener(m_timing);
+    if ( m_detail || m_timing )
+        runner.eventManager().addListener(&detailListener);
+
     return runner.run("", false, true, !verbose) ? EXIT_SUCCESS : EXIT_FAILURE;
 }