Patch 950002 after agreement from Markus Sinner

[wxWidgets.git] / tests / test.cpp

diff --git a/tests/test.cpp b/tests/test.cpp
index 4a3618deff76077ea53f02412238ddd0f90987e2..040ed7eeda3ba785b7216aed86539c914f0c61b3 100644 (file)
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -45,7 +45,7 @@ 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;
@@ -56,7 +56,8 @@ private:
 IMPLEMENT_APP_CONSOLE(TestApp)
 
 TestApp::TestApp()
-  : m_list(false)
+  : m_list(false),
+    m_longlist(false)
 {
 }
 
@@ -137,20 +138,37 @@ int TestApp::OnRun()
 
 // 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);
-
-    if (suite || m_longlist)
-        cout << string(depth * 2, ' ') << test->getName() << "\n";
+    string name;
 
     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(".:");
+        name = parent + "." + (i != string::npos ? name.substr(i + 1) : 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";
     }
 }