Patch 1053127 - Test fixes.

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

tests/formatconverter/formatconvertertest.cpp

@@ -56,9 +56,8 @@
 extern wxString wxConvertFormat(const wxChar *format);
 #endif
 
-using namespace std;
+using CppUnit::TestCase;
-using namespace CppUnit;
+using std::string;
-
 
 ///////////////////////////////////////////////////////////////////////////////
 // The test case

tests/regex/regextest.cpp

@@ -43,10 +43,16 @@
 
 #include "wx/regex.h"
 #include "wx/cppunit.h"
-#include <stdexcept>
+#include <string>
+#include <vector>
 
-using namespace std;
+using CppUnit::Test;
-using namespace CppUnit;
+using CppUnit::TestCase;
+using CppUnit::TestSuite;
+using CppUnit::Exception;
+
+using std::vector;
+using std::string;
 
 // many of the tests are specific to the builtin regex lib, so only attempts
 // to do them when using the builtin regex lib.

tests/regex/wxregextest.cpp

@@ -24,8 +24,10 @@
 #include "wx/tokenzr.h"
 #include <string>
 
-using namespace std;
+using CppUnit::Test;
-using namespace CppUnit;
+using CppUnit::TestCase;
+using CppUnit::TestSuite;
+using std::string;
 
 
 ///////////////////////////////////////////////////////////////////////////////

tests/streams/bstream.cpp

@@ -27,7 +27,8 @@
 #include "wx/cppunit.h"
 #include "bstream.h"
 
-using namespace CppUnit;
+using CppUnit::TestSuite;
+using CppUnit::Test;
 
 ///////////////////////////////////////////////////////////////////////////////
 // Streams main test suite, it houses all stream test suites.

tests/streams/bstream.h

@@ -11,7 +11,6 @@
 #define _WX_TESTBSTREAM_H__
 
 #include "wx/cppunit.h"
-using namespace CppUnit;
 
 ///////////////////////////////////////////////////////////////////////////////
 // Some macros preventing us from typing too much ;-)
@@ -21,10 +20,10 @@ using namespace CppUnit;
 #define COMPOSE_TEST_NAME(Name) \
     STREAM_TEST_NAME "." #Name
 #define STREAM_REGISTER_SUB_SUITE(Name) \
-    extern Test* Get##Name##Suite(); \
+    extern CppUnit::Test* Get##Name##Suite(); \
     suite->addTest(Get##Name##Suite())
 #define STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE(Name) \
-    Test* Get##Name##Suite() { return Name::suite(); }
+    CppUnit::Test* Get##Name##Suite() { return Name::suite(); }
 #define STREAM_TEST_SUBSUITE_NAMED_REGISTRATION(Name) \
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( Name, COMPOSE_TEST_NAME(Name) ); \
     STREAM_IMPLEMENT_SUB_REGISTRATION_ROUTINE( Name )
@@ -34,7 +33,7 @@ using namespace CppUnit;
 // Template class that implements a test for all base stream functions.
 //
 
-template <class TStreamIn, class TStreamOut> class BaseStreamTestCase : public TestCase
+template <class TStreamIn, class TStreamOut> class BaseStreamTestCase : public CppUnit::TestCase
 {
 protected:
     typedef BaseStreamTestCase<TStreamIn, TStreamOut> StreamTestCase;

tests/streams/ffilestream.cpp

@@ -29,9 +29,6 @@
 
 #include "bstream.h"
 
-using namespace std;
-using namespace CppUnit;
-
 #define DATABUFFER_SIZE     1024
 
 static const wxString FILENAME_FFILEINSTREAM = _T("ffileinstream.test");

tests/streams/filestream.cpp

@@ -29,9 +29,6 @@
 
 #include "bstream.h"
 
-using namespace std;
-using namespace CppUnit;
-
 #define DATABUFFER_SIZE     1024
 
 static const wxString FILENAME_FILEINSTREAM = _T("fileinstream.test");

tests/streams/memstream.cpp

@@ -29,9 +29,6 @@
 
 #include "bstream.h"
 
-using namespace std;
-using namespace CppUnit;
-
 #define DATABUFFER_SIZE     256
 
 ///////////////////////////////////////////////////////////////////////////////

tests/streams/sstream.cpp

@@ -23,9 +23,6 @@
 
 #include "bstream.h"
 
-using namespace std;
-using namespace CppUnit;
-
 ///////////////////////////////////////////////////////////////////////////////
 // The test case
 //

tests/streams/zlibstream.cpp

@@ -33,8 +33,7 @@
 
 #include "bstream.h"
 
-using namespace std;
+using std::string;
-using namespace CppUnit;
 
 #define WXTEST_WITH_GZIP_CONDITION(testMethod) \
     WXTEST_WITH_CONDITION( COMPOSE_TEST_NAME(zlibStream), wxZlibInputStream::CanHandleGZip() && wxZlibOutputStream::CanHandleGZip(), testMethod )

tests/test.cpp

@@ -28,8 +28,15 @@
 #include "wx/cppunit.h"
 #include <iostream>
 
-using namespace std;
+using CppUnit::Test;
-using namespace CppUnit;
+using CppUnit::TestSuite;
+using CppUnit::TestFactoryRegistry;
+using CppUnit::TextUi::TestRunner;
+
+using std::string;
+using std::vector;
+using std::auto_ptr;
+using std::cout;
 
 // The application class
 //
@@ -66,7 +73,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();
 };
 
@@ -112,7 +119,7 @@ bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser)
 //
 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() ?
@@ -132,16 +139,15 @@ int TestApp::OnRun()
 
 #if wxUSE_LOG
     // Switch off logging unless --verbose
-    wxLog::EnableLogging(wxLog::GetVerbose());
+    bool verbose = wxLog::GetVerbose();
-#endif // wxUSE_LOG
+    wxLog::EnableLogging(verbose);
-
-    return m_list || runner.run("", false, true, 
-#if wxUSE_LOG
-        !wxLog::GetVerbose()
 #else
-        true
+    bool verbose = false;
-#endif // wxUSE_LOG
+#endif
-    ) ? EXIT_SUCCESS : EXIT_FAILURE;
+
+    return ( m_list || runner.run("", false, true, !verbose) )
+           ? EXIT_SUCCESS
+           : EXIT_FAILURE;
 }
 
 // List the tests