From f1bf3276752a10a2cdf4e3cf3087399d199c4566 Mon Sep 17 00:00:00 2001 From: Baptiste Lepilleur Date: Sat, 13 Jul 2002 09:33:50 +0000 Subject: Include/cppunit/ui/text/TestRunner. include/cppunit/ui/text/TestRunner.h: * src/cppunit/TextTestRunner.cpp: Renamed TextUi::TestRunner TextTestRunner and moved it to the CppUnit namespace. Added a deprecated typedef for compatibility with previous version. * include/cppunit/ui/text/TextTestRunner.h: added. * include/cppunit/ui/mfc/TestRunner.h: * src/cppunit/msvc6/testrunner/TestRunner.cpp: Renamed MfcUi::TestRunner MfcTestRunner. Added deprecated typedef for compatibility. Renamed TestRunner.cpp to MfcTestRunner.cpp. * include/cppunit/ui/mfc/MfcTestRunner.h: added. * include/cppunit/ui/qt/TestRunner.h: * src/qttestrunner/TestRunner.cpp: renamed QtUi::TestRunner QtTestRunner and moved it to CppUnit namespace. Added a deprecated typedef for compatibility. Renamed TestRunner.cpp to QtTestRunner.cpp. * include/cppunit/ui/qt/TestRunner.h: * src/qttestrunner/TestRunner.h: Moved TestRunner to CppUnit namespace and renamed it QtTestRunner. Added deprecated typedef for compatibility. * include/cppunit/Asserter.h: * src/cppunit/Asserter.cpp: changed namespace Asserter to a struct and made all methods static. * include/cppunit/extensions/HelperMacros.h: * include/cppunit/extensions/SourceLine.h: * include/cppunit/extensions/TestAssert.h: * include/cppunit/extensions/TestPlugIn.h: * include/cppunit/Portability.h: changed CPPUNIT_NS(symbol) to a symbol macro that expand either to CppUnit or nothing. The symbol is no longer a parameter. * include/cppunit/portability/CppUnitVector.h: * include/cppunit/portability/CppUnitDeque.h: * include/cppunit/portability/CppUnitMap.h: added. STL Wrapper for compilers that do not support template default argumenent and need the allocator to be passed when instantiating STL container. * examples/cppunittest/*.h: * examples/cppunittest/*.cpp: * src/msvc6/testrunner/*.h: * src/msvc6/testrunner/*.cpp: * src/msvc6/testpluginrunner/*.h: * src/msvc6/testpluginrunner/*.cpp: * src/qttestrunner/*.h: * src/qttestrunner/*.cpp: replaced occurence of CppUnit:: by CPPUNIT_NS. * src/cppunit/TestSuite.h: replaced occurence of std::vector by CppUnitVector. --- include/cppunit/plugin/Parameters.h | 4 ++-- include/cppunit/plugin/PlugInManager.h | 4 +++- include/cppunit/plugin/TestPlugIn.h | 16 ++++++++-------- include/cppunit/plugin/TestPlugInDefaultImpl.h | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) (limited to 'include/cppunit/plugin') diff --git a/include/cppunit/plugin/Parameters.h b/include/cppunit/plugin/Parameters.h index 54a26d2..e914f3f 100644 --- a/include/cppunit/plugin/Parameters.h +++ b/include/cppunit/plugin/Parameters.h @@ -5,13 +5,13 @@ #if !defined(CPPUNIT_NO_TESTPLUGIN) -#include +#include #include CPPUNIT_NS_BEGIN -typedef std::deque Parameters; +typedef CppUnitDeque Parameters; CPPUNIT_NS_END diff --git a/include/cppunit/plugin/PlugInManager.h b/include/cppunit/plugin/PlugInManager.h index 87455f0..585ac89 100644 --- a/include/cppunit/plugin/PlugInManager.h +++ b/include/cppunit/plugin/PlugInManager.h @@ -74,6 +74,8 @@ public: void removeXmlOutputterHooks(); protected: + /*! \brief (INTERNAL) Information about a specific plug-in. + */ struct PlugInInfo { std::string m_fileName; @@ -94,7 +96,7 @@ private: void operator =( const PlugInManager © ); private: - typedef std::deque PlugIns; + typedef CppUnitDeque PlugIns; PlugIns m_plugIns; }; diff --git a/include/cppunit/plugin/TestPlugIn.h b/include/cppunit/plugin/TestPlugIn.h index 568293e..d206d79 100644 --- a/include/cppunit/plugin/TestPlugIn.h +++ b/include/cppunit/plugin/TestPlugIn.h @@ -20,7 +20,7 @@ class XmlOutputter; */ -/*! Test plug-in interface. +/*! \brief Test plug-in interface. * \ingroup WritingTestPlugIn * * This class define the interface implemented by test plug-in. A pointer to that @@ -54,8 +54,8 @@ struct CppUnitTestPlugIn * N.B.: Parameters interface is not define yet, and the plug-in runner does * not yet support plug-in parameter. */ - virtual void initialize( CPPUNIT_NS(TestFactoryRegistry) *registry, - const CPPUNIT_NS(Parameters) ¶meters ) =0; + virtual void initialize( CPPUNIT_NS::TestFactoryRegistry *registry, + const CPPUNIT_NS::Parameters ¶meters ) =0; /*! Gives a chance to the plug-in to register TestListener. * @@ -64,17 +64,17 @@ struct CppUnitTestPlugIn * setUp some global resource: listen to TestListener::startTestRun(), * and TestListener::endTestRun(). */ - virtual void addListener( CPPUNIT_NS(TestResult) *eventManager ) =0; + virtual void addListener( CPPUNIT_NS::TestResult *eventManager ) =0; /*! Gives a chance to the plug-in to remove its registered TestListener. * * Override this method to remove a TestListener that has been added. */ - virtual void removeListener( CPPUNIT_NS(TestResult) *eventManager ) =0; + virtual void removeListener( CPPUNIT_NS::TestResult *eventManager ) =0; /*! Provides a way for the plug-in to register some XmlOutputterHook. */ - virtual void addXmlOutputterHooks( CPPUNIT_NS(XmlOutputter) *outputter ) =0; + virtual void addXmlOutputterHooks( CPPUNIT_NS::XmlOutputter *outputter ) =0; /*! Called when the XmlOutputter is destroyed. * @@ -90,7 +90,7 @@ struct CppUnitTestPlugIn * reference on test that are no longer available if they are not * unregistered. */ - virtual void uninitialize( CPPUNIT_NS(TestFactoryRegistry) *registry ) =0; + virtual void uninitialize( CPPUNIT_NS::TestFactoryRegistry *registry ) =0; }; @@ -186,7 +186,7 @@ typedef CppUnitTestPlugIn *(*TestPlugInSignature)(); * \see CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL(), CPPUNIT_PLUGIN_IMPLEMENT_MAIN(). */ #define CPPUNIT_PLUGIN_IMPLEMENT() \ - CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL( CPPUNIT_NS(TestPlugInDefaultImpl) ); \ + CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL( CPPUNIT_NS::TestPlugInDefaultImpl ); \ CPPUNIT_PLUGIN_IMPLEMENT_MAIN() diff --git a/include/cppunit/plugin/TestPlugInDefaultImpl.h b/include/cppunit/plugin/TestPlugInDefaultImpl.h index a6cc09e..f1efd81 100644 --- a/include/cppunit/plugin/TestPlugInDefaultImpl.h +++ b/include/cppunit/plugin/TestPlugInDefaultImpl.h @@ -13,7 +13,7 @@ CPPUNIT_NS_BEGIN class TestSuite; -/*! Default implementation of test plug-in interface. +/*! \brief Default implementation of test plug-in interface. * \ingroup WritingTestPlugIn * * Override getSuiteName() to specify the suite name. Default is "All Tests". -- cgit v1.2.1