X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/05b5a45f9653c0c825cc838265c0accf991c1640..b480b80a27bb103fd77e196aaed5a5306456d174:/tests/test.cpp

diff --git a/tests/test.cpp b/tests/test.cpp
index 406e6dcd39..00d746b2f8 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -20,14 +20,55 @@
     #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>
 
 using CppUnit::Test;
 using CppUnit::TestSuite;
 using CppUnit::TestFactoryRegistry;
-using CppUnit::TextUi::TestRunner;
-using CppUnit::CompilerOutputter;
+
+
+// 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;
 
@@ -51,13 +92,37 @@ public:
     virtual int  OnRun();
     virtual int  OnExit();
 
+    // used by events propagation test
+    virtual int FilterEvent(wxEvent& event);
+    virtual bool ProcessEvent(wxEvent& event);
+
+    void SetFilterEventFunc(FilterEventFunc f) { m_filterEventFunc = f; }
+    void SetProcessEventFunc(ProcessEventFunc f) { m_processEventFunc = f; }
+
+#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;
+
+    // event handling hooks
+    FilterEventFunc m_filterEventFunc;
+    ProcessEventFunc m_processEventFunc;
 };
 
 IMPLEMENT_APP_CONSOLE(TestApp)
@@ -66,6 +131,8 @@ TestApp::TestApp()
   : m_list(false),
     m_longlist(false)
 {
+    m_filterEventFunc = NULL;
+    m_processEventFunc = NULL;
 }
 
 // Init
@@ -84,7 +151,7 @@ bool TestApp::OnInit()
 #endif // wxUSE_GUI
 
     return true;
-};
+}
 
 // The table of command line options
 //
@@ -99,6 +166,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
@@ -119,15 +192,44 @@ 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);
 }
 
+// Event handling
+int TestApp::FilterEvent(wxEvent& event)
+{
+    if ( m_filterEventFunc )
+        return (*m_filterEventFunc)(event);
+
+    return TestAppBase::FilterEvent(event);
+}
+
+bool TestApp::ProcessEvent(wxEvent& event)
+{
+    if ( m_processEventFunc )
+        return (*m_processEventFunc)(event);
+
+    return TestAppBase::ProcessEvent(event);
+}
+
+extern void SetFilterEventFunc(FilterEventFunc func)
+{
+    wxGetApp().SetFilterEventFunc(func);
+}
+
+extern void SetProcessEventFunc(ProcessEventFunc func)
+{
+    wxGetApp().SetProcessEventFunc(func);
+}
+
 // Run
 //
 int TestApp::OnRun()
 {
-    TestRunner runner;
+    CppUnit::TextTestRunner runner;
 
     for (size_t i = 0; i < m_registries.size(); i++) {
         auto_ptr<Test> test(m_registries[i].empty() ?
@@ -145,7 +247,10 @@ int TestApp::OnRun()
             runner.addTest(test.release());
     }
 
-    runner.setOutputter(new CompilerOutputter(&runner.result(), cout));
+    if ( m_list )
+        return EXIT_SUCCESS;
+
+    runner.setOutputter(new CppUnit::CompilerOutputter(&runner.result(), cout));
 
 #if wxUSE_LOG
     // Switch off logging unless --verbose
@@ -155,9 +260,19 @@ int TestApp::OnRun()
     bool verbose = false;
 #endif
 
-    return ( m_list || runner.run("", false, true, !verbose) )
-           ? EXIT_SUCCESS
-           : EXIT_FAILURE;
+    // there is a bug
+    // (http://sf.net/tracker/index.php?func=detail&aid=1649369&group_id=11795&atid=111795)
+    // in some versions of cppunit: they write progress dots to cout (and not
+    // cerr) and don't flush it so all the dots appear at once at the end which
+    // 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;
 }
 
 int TestApp::OnExit()