avoid the ugly hack with adding an empty string to m_registries to indicate that...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/test.cpp b/tests/test.cpp
index ca527e17ec2cc441a049e311dcfd96bf36a32ce8..667c2c0c3055e21bb510e0e323a0d772b14b2912 100644 (file)
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -216,6 +216,15 @@ public:
 private:
     void List(Test *test, const string& parent = "") const;
 
 private:
     void List(Test *test, const string& parent = "") const;
 

+    // call List() if m_list or runner.addTest() otherwise
+    void AddTest(CppUnit::TestRunner& runner, Test *test)
+    {
+        if (m_list)
+            List(test);
+        else
+            runner.addTest(test);
+    }
+

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


@@ -349,11 +358,6 @@ bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser)
         for (size_t i = 0; i < parser.GetParamCount(); i++)
             m_registries.push_back(parser.GetParam(i));
     }
         for (size_t i = 0; i < parser.GetParamCount(); i++)
             m_registries.push_back(parser.GetParam(i));
     }

-    else
-    {
-        // FIXME: this is an ugly and unnecessary hack
-        m_registries.push_back("");
-    }

 
     m_longlist = parser.Found("longlist");
     m_list = m_longlist || parser.Found("list");
 
     m_longlist = parser.Found("longlist");
     m_list = m_longlist || parser.Found("list");


@@ -442,19 +446,17 @@ int TestApp::OnRun()
 
     CppUnit::TextTestRunner runner;
 
 
     CppUnit::TextTestRunner runner;
 

-    for (size_t i = 0; i < m_registries.size(); i++)
+    if ( m_registries.empty() )

     {
     {

-        Test *test;
-
-        wxString reg = m_registries[i];
-        if ( reg.empty() )
-        {
-            // no test name, run all the tests
-            test = TestFactoryRegistry::getRegistry().makeTest();
-        }
-        else // test name specified, run just this test
+        // run or list all tests
+        AddTest(runner, TestFactoryRegistry::getRegistry().makeTest());
+    }
+    else // run only the selected tests
+    {
+        for (size_t i = 0; i < m_registries.size(); i++)

         {
         {

-            test = GetTestByName(reg);
+            const wxString reg = m_registries[i];
+            Test *test = GetTestByName(reg);

 
             if ( !test && !reg.EndsWith("TestCase") )
             {
 
             if ( !test && !reg.EndsWith("TestCase") )
             {


@@ -466,12 +468,9 @@ int TestApp::OnRun()
                 cerr << "No such test suite: " << string(reg.mb_str()) << endl;
                 return 2;
             }
                 cerr << "No such test suite: " << string(reg.mb_str()) << endl;
                 return 2;
             }

-        }

 
 

-        if (m_list)
-            List(test);
-        else
-            runner.addTest(test);
+            AddTest(runner, test);
+        }

     }
 
     if ( m_list )
     }
 
     if ( m_list )