X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afd9046882b6e76bb02d6e716ae2d9c2c28f12a2..f965a844db8663b80c42afcbb6ae2dc36fd77ac3:/tests/test.cpp

diff --git a/tests/test.cpp b/tests/test.cpp
index 89f7307fd4..00d746b2f8 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -21,7 +21,13 @@
 #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"
@@ -34,7 +40,8 @@ using CppUnit::TestSuite;
 using CppUnit::TestFactoryRegistry;
 
 
-// Displays the test name. This allow for quick investigation on which test hangs
+// 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:
@@ -46,7 +53,7 @@ public:
 
     virtual void startTest(CppUnit::Test *test)
     {
-        CppUnit::stdCOut() << test->getName () << " ";
+        std::cout << test->getName () << " ";
         m_watch.Start();
     }
 
@@ -54,8 +61,8 @@ public:
     {
         m_watch.Pause();
         if ( m_timing )
-            CppUnit::stdCOut() << " (in "<< m_watch.Time() << " ms )";
-        CppUnit::stdCOut() << "\n";
+            std::cout << " (in "<< m_watch.Time() << " ms )";
+        std::cout << "\n";
     }
 
 protected :
@@ -85,6 +92,24 @@ 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;
 
@@ -94,6 +119,10 @@ private:
     bool m_detail;
     bool m_timing;
     vector<string> m_registries;
+
+    // event handling hooks
+    FilterEventFunc m_filterEventFunc;
+    ProcessEventFunc m_processEventFunc;
 };
 
 IMPLEMENT_APP_CONSOLE(TestApp)
@@ -102,6 +131,8 @@ TestApp::TestApp()
   : m_list(false),
     m_longlist(false)
 {
+    m_filterEventFunc = NULL;
+    m_processEventFunc = NULL;
 }
 
 // Init
@@ -167,6 +198,33 @@ bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser)
     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()