interface fixes; removed many functions which were deprecated in past and have alread...

[wxWidgets.git] / tests / test.cpp

diff --git a/tests/test.cpp b/tests/test.cpp
index d54a53583f569d467647a24c432ee995a67f2cec..89f7307fd455b9e78dd5183f502164a1ed256c0b 100644 (file)
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -7,13 +7,9 @@
 // Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWidgets licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma implementation
-    #pragma interface
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
+// For compilers that support precompilation, includes "wx/wx.h"
+// and "wx/cppunit.h"
+#include "testprec.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop


@@ -24,25 +20,70 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

+#include "wx/beforestd.h"
+#include <cppunit/TestListener.h>
+#include <cppunit/Test.h>
+#include <cppunit/TestResult.h>
+#include "wx/afterstd.h"
+

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

-#include "wx/cppunit.h"

 #include <iostream>
 
 #include <iostream>
 

+using CppUnit::Test;
+using CppUnit::TestSuite;
+using CppUnit::TestFactoryRegistry;
+
+
+// Displays the test name. This allow for quick investigation on which test hangs
+class DetailListener : public CppUnit::TestListener
+{
+public:
+    DetailListener(bool doTiming = false):
+        CppUnit::TestListener(),
+        m_timing(doTiming)
+    {
+    }
+
+    virtual void startTest(CppUnit::Test *test)
+    {
+        CppUnit::stdCOut() << test->getName () << " ";
+        m_watch.Start();
+    }
+
+    virtual void endTest(CppUnit::Test * WXUNUSED(test))
+    {
+        m_watch.Pause();
+        if ( m_timing )
+            CppUnit::stdCOut() << " (in "<< m_watch.Time() << " ms )";
+        CppUnit::stdCOut() << "\n";
+    }
+
+protected :
+    bool m_timing;
+    wxStopWatch m_watch;
+};
+

 using namespace std;
 using namespace std;

-using namespace CppUnit;
+
+#if wxUSE_GUI
+    typedef wxApp TestAppBase;
+#else
+    typedef wxAppConsole TestAppBase;
+#endif

 
 // The application class
 //
 
 // The application class
 //

-class TestApp : public wxAppConsole
+class TestApp : public TestAppBase

 {
 public:
     TestApp();
 
     // standard overrides
 {
 public:
     TestApp();
 
     // standard overrides

-    void OnInitCmdLine(wxCmdLineParser& parser);
-    bool OnCmdLineParsed(wxCmdLineParser& parser);
-    bool OnInit();
-    int  OnRun();
+    virtual void OnInitCmdLine(wxCmdLineParser& parser);
+    virtual bool OnCmdLineParsed(wxCmdLineParser& parser);
+    virtual bool OnInit();
+    virtual int  OnRun();
+    virtual int  OnExit();

 
 private:
     void List(Test *test, const string& parent = "") const;
 
 private:
     void List(Test *test, const string& parent = "") const;


@@ -50,6 +91,8 @@ private:
     // command lines options/parameters
     bool m_list;
     bool m_longlist;
     // command lines options/parameters
     bool m_list;
     bool m_longlist;

+    bool m_detail;
+    bool m_timing;

     vector<string> m_registries;
 };
 
     vector<string> m_registries;
 };
 


@@ -65,27 +108,42 @@ TestApp::TestApp()
 //
 bool TestApp::OnInit()
 {
 //
 bool TestApp::OnInit()
 {

+    if ( !TestAppBase::OnInit() )
+        return false;
+

     cout << "Test program for wxWidgets\n"
     cout << "Test program for wxWidgets\n"

-         << "build: " << WX_BUILD_OPTIONS_SIGNATURE << endl;
-    return wxAppConsole::OnInit();
-};
+         << "build: " << WX_BUILD_OPTIONS_SIGNATURE << std::endl;
+
+#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");
+#endif // wxUSE_GUI
+
+    return true;
+}

 
 // The table of command line options
 //
 void TestApp::OnInitCmdLine(wxCmdLineParser& parser)
 {
 
 // The table of command line options
 //
 void TestApp::OnInitCmdLine(wxCmdLineParser& parser)
 {

-    wxAppConsole::OnInitCmdLine(parser);
+    TestAppBase::OnInitCmdLine(parser);

 
     static const wxCmdLineEntryDesc cmdLineDesc[] = {
 
     static const wxCmdLineEntryDesc cmdLineDesc[] = {

-        { wxCMD_LINE_SWITCH, _T("l"), _T("list"),
-            _T("list the test suites, do not run them"),
+        { wxCMD_LINE_SWITCH, "l", "list",
+            "list the test suites, do not run them",
+            wxCMD_LINE_VAL_NONE, 0 },
+        { 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_VAL_NONE, 0 },

-        { wxCMD_LINE_SWITCH, _T("L"), _T("longlist"),
-            _T("list the test cases, do not run them"),
+        { wxCMD_LINE_SWITCH, "t", "timing",
+            "print names and mesure running time of individual test, run them",

             wxCMD_LINE_VAL_NONE, 0 },
             wxCMD_LINE_VAL_NONE, 0 },

-        { wxCMD_LINE_PARAM, 0, 0, _T("REGISTRY"), wxCMD_LINE_VAL_STRING,
+        { wxCMD_LINE_PARAM, NULL, NULL, "REGISTRY", wxCMD_LINE_VAL_STRING,

             wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },
             wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },

-        { wxCMD_LINE_NONE , 0, 0, 0, wxCMD_LINE_VAL_NONE, 0 }
+        wxCMD_LINE_DESC_END

     };
 
     parser.SetDesc(cmdLineDesc);
     };
 
     parser.SetDesc(cmdLineDesc);


@@ -100,18 +158,20 @@ bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser)
             m_registries.push_back(string(parser.GetParam(i).mb_str()));
     else
         m_registries.push_back("");
             m_registries.push_back(string(parser.GetParam(i).mb_str()));
     else
         m_registries.push_back("");

- 
+

     m_longlist = parser.Found(_T("longlist"));
     m_list = m_longlist || parser.Found(_T("list"));
     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 wxAppConsole::OnCmdLineParsed(parser);
+    return TestAppBase::OnCmdLineParsed(parser);

 }
 
 // Run
 //
 int TestApp::OnRun()
 {
 }
 
 // Run
 //
 int TestApp::OnRun()
 {

-    TextUi::TestRunner runner;
+    CppUnit::TextTestRunner runner;

 
     for (size_t i = 0; i < m_registries.size(); i++) {
         auto_ptr<Test> test(m_registries[i].empty() ?
 
     for (size_t i = 0; i < m_registries.size(); i++) {
         auto_ptr<Test> test(m_registries[i].empty() ?


@@ -129,11 +189,41 @@ int TestApp::OnRun()
             runner.addTest(test.release());
     }
 
             runner.addTest(test.release());
     }
 

+    if ( m_list )
+        return EXIT_SUCCESS;
+
+    runner.setOutputter(new CppUnit::CompilerOutputter(&runner.result(), cout));
+
+#if wxUSE_LOG

     // Switch off logging unless --verbose
     // Switch off logging unless --verbose

-    wxLog::EnableLogging(wxLog::GetVerbose());
+    bool verbose = wxLog::GetVerbose();
+    wxLog::EnableLogging(verbose);
+#else
+    bool verbose = false;
+#endif
+
+    // 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);

 
 

-    return m_list || runner.run("", false, true, !wxLog::GetVerbose()) ?
-        EXIT_SUCCESS : EXIT_FAILURE;
+    // 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()
+{
+#if wxUSE_GUI
+    delete GetTopWindow();
+#endif // wxUSE_GUI
+
+    return 0;

 }
 
 // List the tests
 }
 
 // List the tests


@@ -143,11 +233,13 @@ void TestApp::List(Test *test, const string& parent /*=""*/) const
     TestSuite *suite = dynamic_cast<TestSuite*>(test);
     string name;
 
     TestSuite *suite = dynamic_cast<TestSuite*>(test);
     string name;
 

-    if (suite || m_longlist) {
+    if (suite) {

         // take the last component of the name and append to the parent
         name = test->getName();
         string::size_type i = name.find_last_of(".:");
         // take the last component of the name and append to the parent
         name = test->getName();
         string::size_type i = name.find_last_of(".:");

-        name = parent + "." + (i != string::npos ? name.substr(i + 1) : name);
+        if (i != string::npos)
+            name = name.substr(i + 1);
+        name = parent + "." + name;

 
         // drop the 1st component from the display and indent
         if (parent != "") {
 
         // drop the 1st component from the display and indent
         if (parent != "") {


@@ -156,15 +248,19 @@ void TestApp::List(Test *test, const string& parent /*=""*/) const
                 cout << "  ";
             cout << "  " << name.substr(i + 1) << "\n";
         }
                 cout << "  ";
             cout << "  " << name.substr(i + 1) << "\n";
         }

-    }

 
 

-    if (suite) {
-        typedef const vector<Test*> Tests;
+        typedef vector<Test*> Tests;

         typedef Tests::const_iterator Iter;
 
         typedef Tests::const_iterator Iter;
 

-        Tests& tests = suite->getTests();
+        const Tests& tests = suite->getTests();

 
         for (Iter it = tests.begin(); it != tests.end(); ++it)
             List(*it, name);
     }
 
         for (Iter it = tests.begin(); it != tests.end(); ++it)
             List(*it, name);
     }

+    else if (m_longlist) {
+        string::size_type i = 0;
+        while ((i = parent.find('.', i + 1)) != string::npos)
+            cout << "  ";
+        cout << "  " << test->getName() << "\n";
+    }

 }
 }