fixing text matrix (dataview custom renderer showed problems) and reordering SaveGState

[wxWidgets.git] / tests / test.cpp

diff --git a/tests/test.cpp b/tests/test.cpp
index 758c5fcb1a4e404bc2a4699a3ad0fc96c798719f..676e33b35118cec65484eac0968506af130d4689 100644 (file)
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -28,14 +28,16 @@
 #ifdef __VISUALC__
     #pragma warning(disable:4100)
 #endif
 #ifdef __VISUALC__
     #pragma warning(disable:4100)
 #endif

+

 #include <cppunit/TestListener.h>
 #include <cppunit/TestListener.h>

-#ifdef __VISUALC__
-    #pragma warning(default:4100)
-#endif

 #include <cppunit/Protector.h>
 #include <cppunit/Test.h>
 #include <cppunit/TestResult.h>
 #include <cppunit/TestFailure.h>
 #include <cppunit/Protector.h>
 #include <cppunit/Test.h>
 #include <cppunit/TestResult.h>
 #include <cppunit/TestFailure.h>

+
+#ifdef __VISUALC__
+    #pragma warning(default:4100)
+#endif

 #include "wx/afterstd.h"
 
 #include "wx/cmdline.h"
 #include "wx/afterstd.h"
 
 #include "wx/cmdline.h"


@@ -76,6 +78,41 @@ struct CrtAssertFailure
 
 #endif // wxUSE_VC_CRTDBG
 
 
 #endif // wxUSE_VC_CRTDBG
 

+#if wxDEBUG_LEVEL
+
+static wxString FormatAssertMessage(const wxString& file,
+                                    int line,
+                                    const wxString& func,
+                                    const wxString& cond,
+                                    const wxString& msg)
+{
+    wxString str;
+    str << "wxWidgets assert: " << cond << " failed "
+           "at " << file << ":" << line << " in " << func
+        << " with message '" << msg << "'";
+    return str;
+}
+
+static void TestAssertHandler(const wxString& file,
+                              int line,
+                              const wxString& func,
+                              const wxString& cond,
+                              const wxString& msg)
+{
+    // can't throw from other threads, die immediately
+    if ( !wxIsMainThread() )
+    {
+        wxPrintf("%s in a worker thread -- aborting.",
+                 FormatAssertMessage(file, line, func, cond, msg));
+        fflush(stdout);
+        _exit(-1);
+    }
+
+    throw TestAssertFailure(file, line, func, cond, msg);
+}
+
+#endif // wxDEBUG_LEVEL
+

 // this function should only be called from a catch clause
 static string GetExceptionMessage()
 {
 // this function should only be called from a catch clause
 static string GetExceptionMessage()
 {


@@ -88,9 +125,8 @@ static string GetExceptionMessage()
 #if wxDEBUG_LEVEL
     catch ( TestAssertFailure& e )
     {
 #if wxDEBUG_LEVEL
     catch ( TestAssertFailure& e )
     {

-        msg << "wxWidgets assert: " << e.m_cond << " failed "
-               "at " << e.m_file << ":" << e.m_line << " in " << e.m_func
-            << " with message '" << e.m_msg << "'";
+        msg << FormatAssertMessage(e.m_file, e.m_line, e.m_func,
+                                   e.m_cond, e.m_msg);

     }
 #endif // wxDEBUG_LEVEL
 #ifdef wxUSE_VC_CRTDBG
     }
 #endif // wxDEBUG_LEVEL
 #ifdef wxUSE_VC_CRTDBG


@@ -272,19 +308,6 @@ static int TestCrtReportHook(int reportType, char *message, int *)
 
 #endif // wxUSE_VC_CRTDBG
 
 
 #endif // wxUSE_VC_CRTDBG
 

-#if wxDEBUG_LEVEL
-
-static void TestAssertHandler(const wxString& file,
-                              int line,
-                              const wxString& func,
-                              const wxString& cond,
-                              const wxString& msg)
-{
-    throw TestAssertFailure(file, line, func, cond, msg);
-}
-
-#endif // wxDEBUG_LEVEL
-

 int main(int argc, char **argv)
 {
     // tests can be ran non-interactively so make sure we don't show any assert
 int main(int argc, char **argv)
 {
     // tests can be ran non-interactively so make sure we don't show any assert


@@ -336,6 +359,7 @@ extern bool IsNetworkAvailable()
     }
 
     wxSocketClient sock;
     }
 
     wxSocketClient sock;

+    sock.SetTimeout(10);    // 10 secs

     bool online = sock.Connect(addr);
     
     wxSocketBase::Shutdown();
     bool online = sock.Connect(addr);
     
     wxSocketBase::Shutdown();


@@ -385,7 +409,11 @@ bool TestApp::OnInit()
     if ( !TestAppBase::OnInit() )
         return false;
 
     if ( !TestAppBase::OnInit() )
         return false;
 

-    cout << "Test program for wxWidgets\n"
+#if wxUSE_GUI
+    cout << "Test program for wxWidgets GUI features\n"
+#else
+    cout << "Test program for wxWidgets non-GUI features\n"
+#endif

          << "build: " << WX_BUILD_OPTIONS_SIGNATURE << std::endl;
 
 #if wxUSE_GUI
          << "build: " << WX_BUILD_OPTIONS_SIGNATURE << std::endl;
 
 #if wxUSE_GUI