X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670ec357654cdee164e8ade5f6b7852f3108fa26..686ca1b5d4867bca6c82a82078fd26291c6e6659:/tests/test.cpp

diff --git a/tests/test.cpp b/tests/test.cpp
index 11e6909081..b26e73317f 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -7,13 +7,9 @@
 // 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
@@ -25,11 +21,18 @@
 #endif
 
 #include "wx/cmdline.h"
-#include "wx/cppunit.h"
 #include <iostream>
 
-using namespace std;
-using namespace CppUnit;
+using CppUnit::Test;
+using CppUnit::TestSuite;
+using CppUnit::TestFactoryRegistry;
+using CppUnit::TextUi::TestRunner;
+using CppUnit::CompilerOutputter;
+
+using std::string;
+using std::vector;
+using std::auto_ptr;
+using std::cout;
 
 // The application class
 //
@@ -45,17 +48,19 @@ public:
     int  OnRun();
 
 private:
-    void List(Test *test, int depth = 0) const;
+    void List(Test *test, const string& parent = "") const;
 
     // command lines options/parameters
     bool m_list;
-    string m_registry;
+    bool m_longlist;
+    vector<string> m_registries;
 };
 
 IMPLEMENT_APP_CONSOLE(TestApp)
 
 TestApp::TestApp()
-  : m_list(false)
+  : m_list(false),
+    m_longlist(false)
 {
 }
 
@@ -64,7 +69,7 @@ TestApp::TestApp()
 bool TestApp::OnInit()
 {
     cout << "Test program for wxWidgets\n"
-         << "build: " << WX_BUILD_OPTIONS_SIGNATURE << endl;
+         << "build: " << WX_BUILD_OPTIONS_SIGNATURE << std::endl;
     return wxAppConsole::OnInit();
 };
 
@@ -76,10 +81,13 @@ void TestApp::OnInitCmdLine(wxCmdLineParser& parser)
 
     static const wxCmdLineEntryDesc cmdLineDesc[] = {
         { wxCMD_LINE_SWITCH, _T("l"), _T("list"),
-            _T("list the tests, do not run them"),
+            _T("list the test suites, do not run them"),
+            wxCMD_LINE_VAL_NONE, 0 },
+        { wxCMD_LINE_SWITCH, _T("L"), _T("longlist"),
+            _T("list the test cases, do not run them"),
             wxCMD_LINE_VAL_NONE, 0 },
         { wxCMD_LINE_PARAM, 0, 0, _T("REGISTRY"), wxCMD_LINE_VAL_STRING,
-            wxCMD_LINE_PARAM_OPTIONAL },
+            wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },
         { wxCMD_LINE_NONE , 0, 0, 0, wxCMD_LINE_VAL_NONE, 0 }
     };
 
@@ -90,10 +98,14 @@ void TestApp::OnInitCmdLine(wxCmdLineParser& parser)
 //
 bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser)
 {
-    if (parser.GetParamCount() > 0)
-        m_registry = parser.GetParam(0).mb_str();
- 
-    m_list = parser.Found(_T("list"));
+    if (parser.GetParamCount())
+        for (size_t i = 0; i < parser.GetParamCount(); i++)
+            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"));
 
     return wxAppConsole::OnCmdLineParsed(parser);
 }
@@ -102,35 +114,74 @@ bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser)
 //
 int TestApp::OnRun()
 {
-    Test *test = m_registry.empty()?
-        TestFactoryRegistry::getRegistry().makeTest() :
-        TestFactoryRegistry::getRegistry(m_registry).makeTest();
-
-    if (m_list) {
-        List(test);
-        return EXIT_SUCCESS;
-    } else {
-        TextUi::TestRunner runner;
-        runner.addTest(test);
-        return runner.run("", false, true, false) ? EXIT_SUCCESS : EXIT_FAILURE;
+    TestRunner runner;
+
+    for (size_t i = 0; i < m_registries.size(); i++) {
+        auto_ptr<Test> test(m_registries[i].empty() ?
+            TestFactoryRegistry::getRegistry().makeTest() :
+            TestFactoryRegistry::getRegistry(m_registries[i]).makeTest());
+
+        TestSuite *suite = dynamic_cast<TestSuite*>(test.get());
+
+        if (suite && suite->countTestCases() == 0)
+            wxLogError(_T("No such test suite: %s"),
+                wxString(m_registries[i].c_str(), wxConvUTF8).c_str());
+        else if (m_list)
+            List(test.get());
+        else
+            runner.addTest(test.release());
     }
+
+    runner.setOutputter(new CompilerOutputter(&runner.result(), cout));
+
+#if wxUSE_LOG
+    // Switch off logging unless --verbose
+    bool verbose = wxLog::GetVerbose();
+    wxLog::EnableLogging(verbose);
+#else
+    bool verbose = false;
+#endif
+
+    return ( m_list || runner.run("", false, true, !verbose) )
+           ? EXIT_SUCCESS
+           : EXIT_FAILURE;
 }
 
 // List the tests
 //
-void TestApp::List(Test *test, int depth /*=0*/) const
+void TestApp::List(Test *test, const string& parent /*=""*/) const
 {
-    cout << string(depth * 2, ' ') << test->getName() << "\n";
-
     TestSuite *suite = dynamic_cast<TestSuite*>(test);
+    string name;
 
     if (suite) {
-        typedef const std::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;
 
-        Tests& tests = suite->getTests();
+        const Tests& tests = suite->getTests();
 
         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";
     }
 }