compilation fix for ASCII STL build (#9661)

[wxWidgets.git] / tests / test.cpp

diff --git a/tests/test.cpp b/tests/test.cpp
index 4a3618deff76077ea53f02412238ddd0f90987e2..406e6dcd391db61686231c44c81cf285319b483a 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


@@ -25,27 +21,38 @@
 #endif
 
 #include "wx/cmdline.h"
 #endif
 
 #include "wx/cmdline.h"

-#include "wx/cppunit.h"

 #include <iostream>
 
 #include <iostream>
 

+using CppUnit::Test;
+using CppUnit::TestSuite;
+using CppUnit::TestFactoryRegistry;
+using CppUnit::TextUi::TestRunner;
+using CppUnit::CompilerOutputter;
+

 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:
 
 private:

-    void List(Test *test, int depth = 0) const;
+    void List(Test *test, const string& parent = "") const;

 
     // command lines options/parameters
     bool m_list;
 
     // command lines options/parameters
     bool m_list;


@@ -56,7 +63,8 @@ private:
 IMPLEMENT_APP_CONSOLE(TestApp)
 
 TestApp::TestApp()
 IMPLEMENT_APP_CONSOLE(TestApp)
 
 TestApp::TestApp()

-  : m_list(false)
+  : m_list(false),
+    m_longlist(false)

 {
 }
 
 {
 }
 


@@ -64,27 +72,36 @@ 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_VAL_NONE, 0 },

-        { wxCMD_LINE_SWITCH, _T("L"), _T("longlist"),
-            _T("list the test cases, do not run them"),
+        { wxCMD_LINE_SWITCH, "L", "longlist",
+            "list the test cases, do not 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);


@@ -99,18 +116,18 @@ 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"));
 

-    return wxAppConsole::OnCmdLineParsed(parser);
+    return TestAppBase::OnCmdLineParsed(parser);

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

-    TextUi::TestRunner runner;
+    TestRunner 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() ?


@@ -128,29 +145,65 @@ int TestApp::OnRun()
             runner.addTest(test.release());
     }
 
             runner.addTest(test.release());
     }
 

+    runner.setOutputter(new 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
+
+    return ( m_list || runner.run("", false, true, !verbose) )
+           ? EXIT_SUCCESS
+           : EXIT_FAILURE;
+}

 
 

-    return m_list || runner.run("", false, true, !wxLog::GetVerbose()) ?
-        EXIT_SUCCESS : EXIT_FAILURE;
+int TestApp::OnExit()
+{
+#if wxUSE_GUI
+    delete GetTopWindow();
+#endif // wxUSE_GUI
+
+    return 0;

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

-void TestApp::List(Test *test, int depth /*=0*/) const
+void TestApp::List(Test *test, const string& parent /*=""*/) const

 {
     TestSuite *suite = dynamic_cast<TestSuite*>(test);
 {
     TestSuite *suite = dynamic_cast<TestSuite*>(test);

-
-    if (suite || m_longlist)
-        cout << string(depth * 2, ' ') << test->getName() << "\n";
+    string name;

 
     if (suite) {
 
     if (suite) {

-        typedef const vector<Test*> Tests;
+        // take the last component of the name and append to the parent
+        name = test->getName();
+        string::size_type i = name.find_last_of(".:");
+        if (i != string::npos)
+            name = name.substr(i + 1);
+        name = parent + "." + name;
+
+        // drop the 1st component from the display and indent
+        if (parent != "") {
+            string::size_type j = i = name.find('.', 1);
+            while ((j = name.find('.', j + 1)) != string::npos)
+                cout << "  ";
+            cout << "  " << name.substr(i + 1) << "\n";
+        }
+
+        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)
 
         for (Iter it = tests.begin(); it != tests.end(); ++it)

-            List(*it, depth + 1);
+            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";

     }
 }
     }
 }