fix compilation with cppunit 1.9 (which doesn't have stdCOut()) and some harmless warnings (which probably were fixed in newer cppunit version too)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-11-18 15:51:09 +00:00
parent 7105649b88
commit 6d9407fec4

View File

@@ -21,7 +21,13 @@
#endif #endif
#include "wx/beforestd.h" #include "wx/beforestd.h"
#ifdef __VISUALC__
#pragma warning(disable:4100)
#endif
#include <cppunit/TestListener.h> #include <cppunit/TestListener.h>
#ifdef __VISUALC__
#pragma warning(default:4100)
#endif
#include <cppunit/Test.h> #include <cppunit/Test.h>
#include <cppunit/TestResult.h> #include <cppunit/TestResult.h>
#include "wx/afterstd.h" #include "wx/afterstd.h"
@@ -34,7 +40,8 @@ using CppUnit::TestSuite;
using CppUnit::TestFactoryRegistry; using CppUnit::TestFactoryRegistry;
// Displays the test name. This allow for quick investigation on which test hangs // Displays the test name before starting to execute it: this helps with
// diagnosing where exactly does a test crash or hang when/if it does.
class DetailListener : public CppUnit::TestListener class DetailListener : public CppUnit::TestListener
{ {
public: public:
@@ -46,7 +53,7 @@ public:
virtual void startTest(CppUnit::Test *test) virtual void startTest(CppUnit::Test *test)
{ {
CppUnit::stdCOut() << test->getName () << " "; std::cout << test->getName () << " ";
m_watch.Start(); m_watch.Start();
} }
@@ -54,8 +61,8 @@ public:
{ {
m_watch.Pause(); m_watch.Pause();
if ( m_timing ) if ( m_timing )
CppUnit::stdCOut() << " (in "<< m_watch.Time() << " ms )"; std::cout << " (in "<< m_watch.Time() << " ms )";
CppUnit::stdCOut() << "\n"; std::cout << "\n";
} }
protected : protected :