Fix warnings in the MSW IE backend.

[wxWidgets.git] / tests / test.cpp

diff --git a/tests/test.cpp b/tests/test.cpp
index 067af9edd172c4612be565a2b7afefb64310b44c..983bc4f3ce2eb2326046d95a315ef40c9417f377 100644 (file)
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -4,7 +4,7 @@
 // Author:      Mike Wetherell
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Mike Wetherell
 // Author:      Mike Wetherell
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 Mike Wetherell

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
 ///////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------


@@ -28,17 +28,21 @@
 #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>

+#include <cppunit/TestResultCollector.h>
+
+#ifdef __VISUALC__
+    #pragma warning(default:4100)
+#endif

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

+#include <exception>

 #include <iostream>
 
 #ifdef __WXMSW__
 #include <iostream>
 
 #ifdef __WXMSW__


@@ -49,7 +53,12 @@
     #include "wx/osx/private.h"
 #endif
 
     #include "wx/osx/private.h"
 #endif
 

+#if wxUSE_GUI
+    #include "testableframe.h"
+#endif
+

 #include "wx/socket.h"
 #include "wx/socket.h"

+#include "wx/evtloop.h"

 
 using namespace std;
 
 
 using namespace std;
 


@@ -76,6 +85,58 @@ 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)
+{
+    // Determine whether we can safely throw an exception to just make the test
+    // fail or whether we need to abort (in this case "msg" will contain the
+    // explanation why did we decide to do it).
+    wxString abortReason;
+    if ( !wxIsMainThread() )
+    {
+        // Exceptions thrown from worker threads are not caught currently and
+        // so we'd just die without any useful information -- abort instead.
+        abortReason = "in a worker thread";
+    }
+    else if ( uncaught_exception() )
+    {
+        // Throwing while already handling an exception would result in
+        // terminate() being called and we wouldn't get any useful information
+        // about why the test failed then.
+        abortReason = "while handling an exception";
+    }
+    else // Can "safely" throw from here.
+    {
+        throw TestAssertFailure(file, line, func, cond, msg);
+    }
+
+    wxFprintf(stderr, "%s %s -- aborting.",
+              FormatAssertMessage(file, line, func, cond, msg),
+              abortReason);
+    fflush(stderr);
+    _exit(-1);
+}
+
+#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 +149,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


@@ -168,7 +228,7 @@ public:
         m_watch.Pause();
         wxPrintf(GetResultStr(m_result));
         if (m_timing)
         m_watch.Pause();
         wxPrintf(GetResultStr(m_result));
         if (m_timing)

-            wxPrintf("  %6d ms", m_watch.Time());
+            wxPrintf("  %6ld ms", m_watch.Time());

         wxPrintf("\n");
     }
 
         wxPrintf("\n");
     }
 


@@ -248,6 +308,9 @@ private:
     wxArrayString m_registries;
     wxLocale *m_locale;
 
     wxArrayString m_registries;
     wxLocale *m_locale;
 

+    // event loop for GUI tests
+    wxEventLoop* m_eventloop;
+

     // event handling hooks
     FilterEventFunc m_filterEventFunc;
     ProcessEventFunc m_processEventFunc;
     // event handling hooks
     FilterEventFunc m_filterEventFunc;
     ProcessEventFunc m_processEventFunc;


@@ -272,19 +335,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 +386,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();


@@ -376,6 +427,7 @@ TestApp::TestApp()
     m_processEventFunc = NULL;
 
     m_locale = NULL;
     m_processEventFunc = NULL;
 
     m_locale = NULL;

+    m_eventloop = NULL;

 }
 
 // Init
 }
 
 // Init


@@ -394,7 +446,11 @@ bool TestApp::OnInit()
 
 #if wxUSE_GUI
     // create a hidden parent window to be used as parent for the GUI controls
 
 #if wxUSE_GUI
     // create a hidden parent window to be used as parent for the GUI controls

-    new wxFrame(NULL, wxID_ANY, "Hidden wx test frame");
+    wxTestableFrame* frame = new wxTestableFrame();
+    frame->Show();
+
+    m_eventloop = new wxEventLoop;
+    wxEventLoop::SetActive(m_eventloop);

 #endif // wxUSE_GUI
 
     return true;
 #endif // wxUSE_GUI
 
     return true;


@@ -417,7 +473,7 @@ void TestApp::OnInitCmdLine(wxCmdLineParser& parser)
             "print the test case names, run them",
             wxCMD_LINE_VAL_NONE, 0 },
         { wxCMD_LINE_SWITCH, "t", "timing",
             "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",
+            "print names and measure running time of individual test, run them",

             wxCMD_LINE_VAL_NONE, 0 },
         { wxCMD_LINE_OPTION, "", "locale",
             "locale to use when running the program",
             wxCMD_LINE_VAL_NONE, 0 },
         { wxCMD_LINE_OPTION, "", "locale",
             "locale to use when running the program",


@@ -506,8 +562,17 @@ int TestApp::OnRun()
 
     if ( m_registries.empty() )
     {
 
     if ( m_registries.empty() )
     {

-        // run or list all tests
+        // run or list all tests which use the CPPUNIT_TEST_SUITE_REGISTRATION() macro
+        // (i.e. those registered in the "All tests" registry); if there are other
+        // tests not registered with the CPPUNIT_TEST_SUITE_REGISTRATION() macro
+        // then they won't be listed/run!

         AddTest(runner, TestFactoryRegistry::getRegistry().makeTest());
         AddTest(runner, TestFactoryRegistry::getRegistry().makeTest());

+
+        if (m_list)
+        {
+            cout << "\nNote that the list above is not complete as it doesn't include the \n";
+            cout << "tests disabled by default.\n";
+        }

     }
     else // run only the selected tests
     {
     }
     else // run only the selected tests
     {


@@ -553,7 +618,9 @@ int TestApp::OnRun()
     runner.eventManager().pushProtector(new wxUnitTestProtector);
 
     bool printProgress = !(verbose || m_detail || m_timing);
     runner.eventManager().pushProtector(new wxUnitTestProtector);
 
     bool printProgress = !(verbose || m_detail || m_timing);

-    return runner.run("", false, true, printProgress) ? EXIT_SUCCESS : EXIT_FAILURE;
+    runner.run("", false, true, printProgress);
+
+    return runner.result().testFailures() == 0 ? EXIT_SUCCESS : EXIT_FAILURE;

 }
 
 int TestApp::OnExit()
 }
 
 int TestApp::OnExit()


@@ -562,6 +629,8 @@ int TestApp::OnExit()
 
 #if wxUSE_GUI
     delete GetTopWindow();
 
 #if wxUSE_GUI
     delete GetTopWindow();

+    wxEventLoop::SetActive(NULL);
+    delete m_eventloop;

 #endif // wxUSE_GUI
 
     return 0;
 #endif // wxUSE_GUI
 
     return 0;