summaryrefslogtreecommitdiff
path: root/include/cppunit
diff options
context:
space:
mode:
authorBaptiste Lepilleur <gaiacrtn@free.fr>2002-08-27 20:51:18 +0000
committerBaptiste Lepilleur <gaiacrtn@free.fr>2002-08-27 20:51:18 +0000
commitc86c65b7d821fe4bb046c489528108843513e63d (patch)
tree0df76dcf21360b74ec3a401f8b077da5d839f2e9 /include/cppunit
parent69a36d9356412dddb51d8f31fbbac45ac52f7f30 (diff)
downloadcppunit-c86c65b7d821fe4bb046c489528108843513e63d.tar.gz
CodingGuideLines.
CodingGuideLines.txt: updated for OS/390 C++ limitation. * examples/cppunittests/MockFunctor.h: added. Mock Functor to help testing. * examples/cppunittests/MockProtector.h: qdded. Mock Protector to help testing. * examples/cppunittests/TestResultTest.h * examples/cppunittests/TestResultTest.cpp: added tests for pushProtector(), popProtector() and protect(). * include/cppunit/TestAssert.h: removed default message value from assertEquals(). Caused compilation error on OS/390. * include/cppunit/plugin/PlugInParameters.h: * src/cppunit/PlugInParameters.cpp: renamed commandLine() to getCommandLine(). * src/msvc6/testrunner/TestRunnerDlg.h: * src/msvc6/testrunner/TestRunnerDlg.cpp: bug fix, disabled Browse button while running tests.
Diffstat (limited to 'include/cppunit')
-rw-r--r--include/cppunit/TestAssert.h7
-rw-r--r--include/cppunit/plugin/Makefile.am2
-rw-r--r--include/cppunit/plugin/PlugInManager.h4
-rw-r--r--include/cppunit/plugin/PlugInParameters.h (renamed from include/cppunit/plugin/Parameters.h)13
-rw-r--r--include/cppunit/plugin/TestPlugIn.h4
-rw-r--r--include/cppunit/plugin/TestPlugInDefaultImpl.h2
6 files changed, 22 insertions, 10 deletions
diff --git a/include/cppunit/TestAssert.h b/include/cppunit/TestAssert.h
index 87510df..4583cfd 100644
--- a/include/cppunit/TestAssert.h
+++ b/include/cppunit/TestAssert.h
@@ -57,7 +57,7 @@ template <class T>
void assertEquals( const T& expected,
const T& actual,
SourceLine sourceLine,
- const std::string &message ="" )
+ const std::string &message )
{
if ( !assertion_traits<T>::equal(expected,actual) ) // lazy toString conversion...
{
@@ -143,10 +143,11 @@ void CPPUNIT_API assertDoubleEquals( double expected,
* The last two requirements (serialization and comparison) can be
* removed by specializing the CppUnit::assertion_traits.
*/
-#define CPPUNIT_ASSERT_EQUAL(expected,actual) \
+#define CPPUNIT_ASSERT_EQUAL(expected,actual) \
( CPPUNIT_NS::assertEquals( (expected), \
(actual), \
- CPPUNIT_SOURCELINE() ) )
+ CPPUNIT_SOURCELINE(), \
+ "" ) )
/** Asserts that two values are equals, provides additional messafe on failure.
* \ingroup Assertions
diff --git a/include/cppunit/plugin/Makefile.am b/include/cppunit/plugin/Makefile.am
index 3fdff64..5221a66 100644
--- a/include/cppunit/plugin/Makefile.am
+++ b/include/cppunit/plugin/Makefile.am
@@ -6,4 +6,4 @@ libcppunitinclude_HEADERS = \
TestPlugIn.h \
TestPlugInDefaultImpl.h \
PlugInManager.h \
- Parameters.h
+ PlugInParameters.h
diff --git a/include/cppunit/plugin/PlugInManager.h b/include/cppunit/plugin/PlugInManager.h
index 585ac89..6baaa2b 100644
--- a/include/cppunit/plugin/PlugInManager.h
+++ b/include/cppunit/plugin/PlugInManager.h
@@ -10,7 +10,7 @@
#pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z
#endif
-#include <cppunit/plugin/Parameters.h>
+#include <cppunit/plugin/PlugInParameters.h>
struct CppUnitTestPlugIn;
CPPUNIT_NS_BEGIN
@@ -44,7 +44,7 @@ public:
* \exception DynamicLibraryManager is thrown if an error occurs during loading.
*/
void load( const std::string &libraryFileName,
- const Parameters &parameters = Parameters() );
+ const PlugInParameters &parameters = PlugInParameters() );
/*! Unloads the specified plug-in.
* \param libraryFileName Name of the file that contains the TestPlugIn passed
diff --git a/include/cppunit/plugin/Parameters.h b/include/cppunit/plugin/PlugInParameters.h
index e914f3f..9a6f075 100644
--- a/include/cppunit/plugin/Parameters.h
+++ b/include/cppunit/plugin/PlugInParameters.h
@@ -11,7 +11,18 @@
CPPUNIT_NS_BEGIN
-typedef CppUnitDeque<std::string> Parameters;
+class CPPUNIT_API PlugInParameters
+{
+public:
+ PlugInParameters( const std::string &commandLine = "" );
+
+ virtual ~PlugInParameters();
+
+ std::string getCommandLine() const;
+
+private:
+ std::string m_commandLine;
+};
CPPUNIT_NS_END
diff --git a/include/cppunit/plugin/TestPlugIn.h b/include/cppunit/plugin/TestPlugIn.h
index 06e0888..2f3fdde 100644
--- a/include/cppunit/plugin/TestPlugIn.h
+++ b/include/cppunit/plugin/TestPlugIn.h
@@ -5,7 +5,7 @@
#if !defined(CPPUNIT_NO_TESTPLUGIN)
-#include <cppunit/plugin/Parameters.h>
+#include <cppunit/plugin/PlugInParameters.h>
CPPUNIT_NS_BEGIN
@@ -56,7 +56,7 @@ struct CppUnitTestPlugIn
* not yet support plug-in parameter.
*/
virtual void initialize( CPPUNIT_NS::TestFactoryRegistry *registry,
- const CPPUNIT_NS::Parameters &parameters ) =0;
+ const CPPUNIT_NS::PlugInParameters &parameters ) =0;
/*! Gives a chance to the plug-in to register TestListener.
*
diff --git a/include/cppunit/plugin/TestPlugInDefaultImpl.h b/include/cppunit/plugin/TestPlugInDefaultImpl.h
index f1efd81..f22d781 100644
--- a/include/cppunit/plugin/TestPlugInDefaultImpl.h
+++ b/include/cppunit/plugin/TestPlugInDefaultImpl.h
@@ -31,7 +31,7 @@ public:
virtual ~TestPlugInDefaultImpl();
void initialize( TestFactoryRegistry *registry,
- const Parameters &parameters );
+ const PlugInParameters &parameters );
void addListener( TestResult *eventManager );