cppunit-cvs Mailing List for CppUnit - C++ port of JUnit (Page 30)
Brought to you by:
blep
Menu
▾
▴
cppunit-cvs — cvs commits
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(94) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
(114) |
Mar
(80) |
Apr
|
May
|
Jun
(36) |
Jul
(67) |
Aug
(37) |
Sep
(33) |
Oct
(28) |
Nov
(91) |
Dec
(16) |
| 2006 |
Jan
(1) |
Feb
(7) |
Mar
(45) |
Apr
|
May
|
Jun
(36) |
Jul
(7) |
Aug
|
Sep
(32) |
Oct
(3) |
Nov
|
Dec
|
| 2007 |
Jan
(29) |
Feb
(11) |
Mar
(5) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(35) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
(14) |
Mar
|
Apr
|
May
|
Jun
(5) |
Jul
(13) |
Aug
|
Sep
|
Oct
(3) |
Nov
|
Dec
(15) |
|
From: Baptiste L. <bl...@us...> - 2005-02-24 07:11:24
|
Update of /cvsroot/cppunit/cppunit2/include/cpput In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22832/include/cpput Added Files: .cvsignore Log Message: * ignore dummy files --- NEW FILE: .cvsignore --- obsoleted |
|
From: Baptiste L. <bl...@us...> - 2005-02-24 07:11:24
|
Update of /cvsroot/cppunit/cppunit2/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22832/doc Added Files: .cvsignore Log Message: * ignore dummy files --- NEW FILE: .cvsignore --- cppunit2 *.html *.bat *.dic *.zip |
|
From: Baptiste L. <bl...@us...> - 2005-02-24 07:11:24
|
Update of /cvsroot/cppunit/cppunit2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22832 Modified Files: .cvsignore Log Message: * ignore dummy files Index: .cvsignore =================================================================== RCS file: /cvsroot/cppunit/cppunit2/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .cvsignore 23 Jun 2004 18:47:06 -0000 1.2 --- .cvsignore 24 Feb 2005 07:11:09 -0000 1.3 *************** *** 1,2 **** ! build scons-local* \ No newline at end of file --- 1,3 ---- ! scons.py sconsign.py scons-LICENSE scons-README scons-local* ! build buildscons scons-local* \ No newline at end of file |
|
From: Baptiste L. <bl...@us...> - 2005-02-24 07:11:24
|
Update of /cvsroot/cppunit/cppunit2/src/cpput In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22832/src/cpput Modified Files: .cvsignore Log Message: * ignore dummy files Index: .cvsignore =================================================================== RCS file: /cvsroot/cppunit/cppunit2/src/cpput/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 27 Jan 2004 23:37:22 -0000 1.1 --- .cvsignore 24 Feb 2005 07:11:11 -0000 1.2 *************** *** 1 **** --- 1,3 ---- *.vcproj.old + *.WW + *.old |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 23:15:43
|
Update of /cvsroot/cppunit/cppunit2/src/cpput In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31462/src/cpput Modified Files: cpput.vcproj Log Message: * removed include/cpput/enumerator.h which has been replaced by include/cpptl/enumerator.h * added explicit type passing to any*() generator functions. Index: cpput.vcproj =================================================================== RCS file: /cvsroot/cppunit/cppunit2/src/cpput/cpput.vcproj,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** cpput.vcproj 20 Nov 2004 15:26:38 -0000 1.24 --- cpput.vcproj 23 Feb 2005 23:15:34 -0000 1.25 *************** *** 198,201 **** --- 198,204 ---- </File> <File + RelativePath="..\..\include\cpptl\conststring.h"> + </File> + <File RelativePath="..\..\include\cpptl\enumerator.h"> </File> *************** *** 306,313 **** </File> </Filter> - <Filter - Name="obsolete by opentest" - Filter=""> - </Filter> <File RelativePath=".\assert.cpp"> --- 309,312 ---- *************** *** 332,339 **** </File> <File ! RelativePath="..\..\include\cpput\enumerator.h"> </File> <File ! RelativePath="..\..\include\cpput\equality.h"> </File> <File --- 331,347 ---- </File> <File ! RelativePath="..\..\include\cpput\equality.h"> </File> <File ! RelativePath=".\exceptionguard.cpp"> ! <FileConfiguration ! Name="Debug|Win32"> ! <Tool ! Name="VCCLCompilerTool" ! GeneratePreprocessedFile="0"/> ! </FileConfiguration> ! </File> ! <File ! RelativePath="..\..\include\cpput\exceptionguard.h"> </File> <File *************** *** 374,383 **** </File> <File - RelativePath=".\testfailureguard.cpp"> - </File> - <File - RelativePath="..\..\include\cpput\testfailureguard.h"> - </File> - <File RelativePath="..\..\include\cpput\testfixture.h"> </File> --- 382,385 ---- *************** *** 396,399 **** --- 398,407 ---- <File RelativePath=".\testsuite.cpp"> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + GeneratePreprocessedFile="0"/> + </FileConfiguration> </File> <File |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 23:13:42
|
Update of /cvsroot/cppunit/cppunit2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30755 Modified Files: sconstruct Log Message: * scons can be used to build cppunit 2 using mingw Index: sconstruct =================================================================== RCS file: /cvsroot/cppunit/cppunit2/sconstruct,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sconstruct 1 Feb 2004 10:18:01 -0000 1.1 --- sconstruct 23 Feb 2005 23:13:16 -0000 1.2 *************** *** 1,9 **** import sys ! base_env = Environment( CCFLAGS = '-GX -GR -nologo', ! CPPPATH = '#include', ! LIBPATH = '#libs' ) ! Export( 'base_env' ) SConscript( 'src/cpput/SConscript', build_dir='#buildscons/cpput', duplicate=0 ) --- 1,11 ---- import sys ! #env = Environment( CCFLAGS = '-GX -GR -nologo', ! env = Environment( CCFLAGS = '', ! CPPPATH = '#include', ! LIBPATH = '#libs', ! tools=['mingw'] ) ! Export( 'env' ) SConscript( 'src/cpput/SConscript', build_dir='#buildscons/cpput', duplicate=0 ) |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 23:11:32
|
Update of /cvsroot/cppunit/cppunit2/src/cpputtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30138/src/cpputtest Modified Files: SConscript Log Message: * scons can be used to build cppunit 2 using mingw Index: SConscript =================================================================== RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/SConscript,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SConscript 14 Jun 2004 23:30:12 -0000 1.2 --- SConscript 23 Feb 2005 23:11:23 -0000 1.3 *************** *** 1,28 **** # cpputtest build script ! Import( 'base_env' ) ! env = base_env.Copy( LIBPATH = '#libs' ) cpputtest_sources=""" ! assertenumtest.cpp ! assertstringtest.cpp ! enumeratortest.cpp ! main.cpp ! registrytest.cpp ! testbasicassertion.cpp ! testfixturetest.cpp ! testfunctor.cpp ! testresult.cpp ! testtestcase.cpp ! testtestcontext.cpp testtestsuite.cpp ! """ ! cpputtest_env = env.Copy(LIBS = ['cpput-vc6-rs']) #cpputtest_env = env.Copy(LIBS = ['cpput-vc6-rd']) #cpputtest_env.Append( CCFLAGS = ' -DCPPUT_DLL' ) cpputtest_exe = cpputtest_env.Program( target='cpputtest', ! source=Split(cpputtest_sources) ) #cpputtest_env.Depends( cpputtest_exe, '#libs/cpput-vc6-rd.lib' ) --- 1,24 ---- # cpputtest build script ! Import( 'env' ) ! env = env.Copy( LIBPATH = '#libs' ) cpputtest_sources=""" ! assertenumtest.cpp ! assertstringtest.cpp ! enumeratortest.cpp ! main.cpp ! testbasicassertion.cpp ! testfunctor.cpp ! testtestcase.cpp testtestsuite.cpp ! """.split() ! cpputtest_env = env.Copy(LIBS = ['cpput']) #cpputtest_env = env.Copy(LIBS = ['cpput-vc6-rd']) #cpputtest_env.Append( CCFLAGS = ' -DCPPUT_DLL' ) cpputtest_exe = cpputtest_env.Program( target='cpputtest', ! source=cpputtest_sources ) #cpputtest_env.Depends( cpputtest_exe, '#libs/cpput-vc6-rd.lib' ) |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 23:11:18
|
Update of /cvsroot/cppunit/cppunit2/src/cpput In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29968/src/cpput Modified Files: SConscript Log Message: * scons can be used to build cppunit 2 using mingw Index: SConscript =================================================================== RCS file: /cvsroot/cppunit/cppunit2/src/cpput/SConscript,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SConscript 14 Jun 2004 23:30:12 -0000 1.2 --- SConscript 23 Feb 2005 23:10:58 -0000 1.3 *************** *** 1,162 **** ! # cpput lib build script ! import os.path ! ! ##Release: ! ##/O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "_MBCS" ! ##/FD /EHsc /MT /GR /YX"stdafx.h" ! ##/Fp".\..\..\build\cpput\release/cpput.pch" ! ##/Fo".\..\..\build\cpput\release/" ! ##/Fd".\..\..\build\cpput\release/" /W3 /nologo /c ! ! ##/EHa : enable exception (any instructions can throw an exception) ! ##/MT: multithreaded ! ##/MTd: mutlithread & debug ! ##/MD: multithreaded dll ! ##/MDd: multithreaded dll & debug ! ##/ML: singlethreaded ! ##/MLd: singlethreaded & debug ! ##/GR: enable rtti (_CPPRTTI is defined) ! ##/GF: enable string-pooling as read-only ! ##/W3: warning level 3 ! ##/nologo: disable copyright message ! ##/Zi: produce PDB debug information ! ##/Oi: enable intrinsic function optimization ! ##/Za: disable language extension (compile in C++ conformant mode) ! ! ##/Fd: PDB filename (link?) ! ##/Gy: enable function level linking ! ! ##Debug: ! ##/Od: disable optimization ! ##/RTCc: smaller type check ! ##/RTC1: stack frame & uninitialized variable check ! ##/GS: buffer security check ! ! # variant options: ! # crtdll ! # nothread, threaded ! # release,debug ! # exception, noexception ! # rtti, nortti ! # ansi, extension ! # stl, stlport ! ! # crt/rtti ! ! class BadBuildFeatures(RuntimeError): ! def __init__( self, message ): ! RuntimeError.__init__( message ) ! ! class FeatureValidator: ! def validate( self, features ): ! pass ! ! def checkIncompatibility( self, features, feature_set, incompatible_feature_set ): ! feature_set = self._getActualFeatures( feature_set ) ! incompatible_feature_set = self._getActualFeatures( incompatible_feature_set ) ! for feature in feature_set: ! if feature in incompatible_feature_set: ! self.reportIncompatibleFeatures( feature_set, incompatible_feature_set ) ! ! def _getActualFeatures( self, wanted_features, actual_features ): ! if type(wanted_features) is str: ! wanted_features = [ wanted_features ] ! return filter( lambda feature: feature in actual_features ) ! ! def reportIncompatibleFeatures( self, features1, features2 ): ! raise BadBuildFeatures( 'Feature <%s> can not be used with %s.' % (','.join(feature1s),','.join(feature2)) ) ! ! class CRTFeatureValidator(FeatureValidator): ! def validate( self, features ): ! self.checkIncompatibility( features, 'crtldll thread'.split(), 'nothread' ) ! self.checkIncompatibility( features, 'release', 'debug' ) ! ! class OptionsFeatureValidator(CRTFeatureValidator): ! def validate( self, features ): ! CRTFeatureValidator.validate( self, features ) ! self.checkIncompatibility( 'rtti', 'nortti' ) ! self.checkIncompatibility( 'exception', 'noexception' ) ! self.checkIncompatibility( 'ansi', 'extension' ) ! ! msvc71_compiler_options = [ ! '__default__ : /W3 /nologo /GF', ! 'crtdll release : /MD', ! 'crtdll debug : /MDd', ! 'threaded release : /MT', ! 'threaded debug : MTd', ! 'nothread release : /ML', ! 'nothread debug : MLd', ! 'rtti : /GR', ! 'exception : /EHa', ! 'noexception : /GX-', ! 'ansi : /Za', ! 'extension : /Ze', ! 'release : /O2 /Oi', ! 'debug : /Od' ] ! ! preprocessor_options = [ ! '__default__ : win32', ! 'release : NDEBUG', ! 'debug : _DEBUG' ] ! ! def getCompilerOptions( features, options_map ): ! all_compiler_options = [] ! for option in options_map: ! splitted = option.split(':') ! option_features = splitted[0].split() ! compiler_options = splitted[1].strip() ! has_option_features = True ! for feature in option_features: ! if feature not in features: ! has_option_features = False ! break ! if has_option_features: ! all_compiler_options.append( compiler_options ) ! return ' '.join( all_compiler_options ) ! ! ! Import( 'base_env' ) ! env = base_env.Copy() ! ! ! class FilterTargetByExt: ! def __init__( self, ext ): ! self.ext = ext ! def __call__( self, target ): ! import os ! return os.path.splitext( str(target) )[1] == self.ext ! ! def FindDllNodeInNodes( targets ): ! return ! cpput_sources=""" ! assert.cpp ! assertstring.cpp ! atomiccounter.cpp ! registry.cpp ! testcase.cpp ! testcontext.cpp ! testfailureguard.cpp ! testsuite.cpp thread.cpp ! """ ! ! BuildDir ('#buildscons/cpput/static', '#src/cpput', duplicate=0) ! ! def prefix_list( list, prefix ): ! return map( lambda item: os.path.join( prefix, item ), list ) ! ! cpput_sources = prefix_list( Split(cpput_sources), '#buildscons/cpput/static' ) ! #print '\n'.join(cpput_sources) ! static_lib = env.StaticLibrary( target='cpput-vc6-rs', source=cpput_sources ) ! #BuildDir('#build/cpput/dll', '#src/cpput', duplicate=0) ! #env.Append( CCFLAGS=' -DCPPUT_DLL_BUILD' ) ! #shared_lib = env.SharedLibrary( target='cpput-vc6-rd', ! # source=Split(cpput_sources) ) libs_dir='#libs' --- 1,25 ---- ! Import( 'env' ) + env = env.Copy( LIBPATH = '#libs' ) cpput_sources=""" ! assert.cpp ! assertstring.cpp ! exceptionguard.cpp ! properties.cpp ! registry.cpp ! testcase.cpp ! testinfo.cpp ! testrunner.cpp ! testsuite.cpp thread.cpp ! """.split() ! static_lib = env.StaticLibrary( target='cpput', source=cpput_sources ) ! ! #shared_lib = env.SharedLibrary( target='cpput', ! # source=cpput_sources ) libs_dir='#libs' *************** *** 164,167 **** env.Install( libs_dir, static_lib ) - #env.Install( libs_dir, filter( FilterTargetByExt('.lib'), shared_lib ) ) - #env.Install( bin_dir, filter( FilterTargetByExt('.dll'), shared_lib ) ) --- 27,28 ---- |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 23:10:31
|
Update of /cvsroot/cppunit/cppunit2/src/cpputtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29661/src/cpputtest Modified Files: enumeratortest.cpp Log Message: * added missing EOL at EOF Index: enumeratortest.cpp =================================================================== RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/enumeratortest.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** enumeratortest.cpp 23 Feb 2005 08:54:05 -0000 1.6 --- enumeratortest.cpp 23 Feb 2005 23:10:22 -0000 1.7 *************** *** 548,550 **** } ! */ \ No newline at end of file --- 548,550 ---- } ! */ |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 23:09:38
|
Update of /cvsroot/cppunit/cppunit2/src/cpputtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29264/src/cpputtest Modified Files: assertenumtest.cpp assertstringtest.cpp testbasicassertion.cpp Log Message: * preprocessor portability fix: enclosed all CPPUT_ASSERT_ASSERTION... within double brace to ensure that the tested assertion is used as the first argument of the macro Index: assertenumtest.cpp =================================================================== RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/assertenumtest.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** assertenumtest.cpp 22 Oct 2004 06:20:06 -0000 1.2 --- assertenumtest.cpp 23 Feb 2005 23:09:29 -0000 1.3 *************** *** 40,62 **** AssertEnumTest::testAssertSequenceEqual() { ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( vEmpty_ ), ! CppTL::Enum::container( v123_ ) ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v123_ ), ! CppTL::Enum::container( v321_ ) ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v123_ ), ! CppTL::Enum::container( v122_ ) ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v123_ ), ! CppTL::Enum::container( v4321_ ) ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v123_ ), ! CppTL::Enum::container( v1234_ ) ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v1234_ ), ! CppTL::Enum::container( v123_ ) ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( vEmpty_ ), ! CppTL::Enum::container( vEmpty_ ) ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v122_ ), ! CppTL::Enum::container( v122_ ) ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v1234_ ), ! CppTL::Enum::container( v1234_ ) ) ); } --- 40,62 ---- AssertEnumTest::testAssertSequenceEqual() { ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( vEmpty_ ), ! CppTL::Enum::container( v123_ ) ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v123_ ), ! CppTL::Enum::container( v321_ ) ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v123_ ), ! CppTL::Enum::container( v122_ ) ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v123_ ), ! CppTL::Enum::container( v4321_ ) ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v123_ ), ! CppTL::Enum::container( v1234_ ) ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v1234_ ), ! CppTL::Enum::container( v123_ ) ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( vEmpty_ ), ! CppTL::Enum::container( vEmpty_ ) ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v122_ ), ! CppTL::Enum::container( v122_ ) ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_SEQUENCE_EQUAL( CppTL::Enum::container( v1234_ ), ! CppTL::Enum::container( v1234_ ) ) )); } *************** *** 65,80 **** AssertEnumTest::testAssertSetEqual() { ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( vEmpty_ ), ! CppTL::Enum::container( v123_ ) ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v123_ ), ! CppTL::Enum::container( vEmpty_ ) ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v123_ ), ! CppTL::Enum::container( v1234_ ) ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v123_ ), ! CppTL::Enum::container( v122_ ) ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v123_ ), ! CppTL::Enum::container( v321_ ) ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v4321_ ), ! CppTL::Enum::container( v1234_ ) ) ); } --- 65,80 ---- AssertEnumTest::testAssertSetEqual() { ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( vEmpty_ ), ! CppTL::Enum::container( v123_ ) ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v123_ ), ! CppTL::Enum::container( vEmpty_ ) ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v123_ ), ! CppTL::Enum::container( v1234_ ) ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v123_ ), ! CppTL::Enum::container( v122_ ) ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v123_ ), ! CppTL::Enum::container( v321_ ) ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_SET_EQUAL( CppTL::Enum::container( v4321_ ), ! CppTL::Enum::container( v1234_ ) ) )); } Index: assertstringtest.cpp =================================================================== RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/assertstringtest.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** assertstringtest.cpp 20 Nov 2004 15:07:00 -0000 1.3 --- assertstringtest.cpp 23 Feb 2005 23:09:29 -0000 1.4 *************** *** 50,59 **** AssertStringTest::testStringStartsWith() { ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_START( "abcdef", "bc" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_START( "abcdef", "AB" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_START( "abcdef", "ef" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_START( "abcdef", "ab" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_START( "abcdef", "abcdef" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_START( "abcdef", "" ) ); } --- 50,59 ---- AssertStringTest::testStringStartsWith() { ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_START( "abcdef", "bc" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_START( "abcdef", "AB" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_START( "abcdef", "ef" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_START( "abcdef", "ab" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_START( "abcdef", "abcdef" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_START( "abcdef", "" ) )); } *************** *** 62,71 **** AssertStringTest::testStringEndsWith() { ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_END( "abcdef", "de" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_END( "abcdef", "EF" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_END( "abcdef", "ab" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_END( "abcdef", "def" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_END( "abcdef", "abcdef" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_END( "abcdef", "" ) ); } --- 62,71 ---- AssertStringTest::testStringEndsWith() { ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_END( "abcdef", "de" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_END( "abcdef", "EF" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_END( "abcdef", "ab" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_END( "abcdef", "def" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_END( "abcdef", "abcdef" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_END( "abcdef", "" ) )); } *************** *** 74,86 **** AssertStringTest::testStringContains() { ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "fe" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "BC" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "abcdefg" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "0abcdef" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "ab" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "ef" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "cd" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "abcdef" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "" ) ); } --- 74,86 ---- AssertStringTest::testStringContains() { ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "fe" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "BC" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "abcdefg" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "0abcdef" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "ab" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "ef" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "cd" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "abcdef" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_CONTAIN( "abcdef", "" ) )); } *************** *** 95,109 **** // two 'char *' string are different pointers. ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_EQUAL( "abcdef", "ABCDEF" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_EQUAL( "ABCDEF", "abcdef" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_EQUAL( "abcdef", "abcde" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_EQUAL( "abcdef", "def" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_EQUAL( "abcdef", "" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_EQUAL( "", "abcdef" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_EQUAL( "abcdef", duplicate ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_EQUAL( "abcdef", abcdef ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_EQUAL( abcdef, "abcdef" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_EQUAL( "", std::string() ) ); } --- 95,109 ---- // two 'char *' string are different pointers. ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_EQUAL( "abcdef", "ABCDEF" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_EQUAL( "ABCDEF", "abcdef" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_EQUAL( "abcdef", "abcde" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_EQUAL( "abcdef", "def" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_EQUAL( "abcdef", "" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_EQUAL( "", "abcdef" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_EQUAL( "abcdef", duplicate ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_EQUAL( "abcdef", abcdef ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_EQUAL( abcdef, "abcdef" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_EQUAL( "", std::string() ) )); } *************** *** 115,129 **** std::string abcdef( "abcdef" ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_EQUAL( abcdefWrap, "def" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_EQUAL( abcdef, abcdefWrap ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_START( abcdefWrap, "ef" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_START( abcdefWrap, "ab" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_END( abcdefWrap, "ab" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_END( abcdefWrap, "def" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERTSTR_CONTAIN( abcdefWrap, "0abcdef" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERTSTR_CONTAIN( abcdefWrap, "ab" ) ); } --- 115,129 ---- std::string abcdef( "abcdef" ); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_EQUAL( abcdefWrap, "def" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_EQUAL( abcdef, abcdefWrap ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_START( abcdefWrap, "ef" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_START( abcdefWrap, "ab" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_END( abcdefWrap, "ab" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_END( abcdefWrap, "def" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERTSTR_CONTAIN( abcdefWrap, "0abcdef" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERTSTR_CONTAIN( abcdefWrap, "ab" ) )); } Index: testbasicassertion.cpp =================================================================== RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/testbasicassertion.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** testbasicassertion.cpp 23 Feb 2005 21:42:59 -0000 1.6 --- testbasicassertion.cpp 23 Feb 2005 23:09:29 -0000 1.7 *************** *** 81,114 **** { // CPPUT_ASSERT ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT( true ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT( false ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT( true, "should pass" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT( false, ! "should throw AbortingAssertionException" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_EXPR( true ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_EXPR( false ) ); // CPPUT_ASSERT_FALSE ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_FALSE( false ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_FALSE( true ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_FALSE( false, "should pass" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_FALSE( true, ! "should throw AbortingAssertionException" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_EXPR_FALSE( false ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_EXPR_FALSE( true ) ); // CPPUT_ASSERT_EQUAL ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_EQUAL( 1234567, 1234567 ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_EQUAL( 1234567, 456 ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_EQUAL( 1234567, 1234567, "should pass" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_EQUAL( 1234567, 456, "should fail" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_EQUAL( std::string("abc"), "abc" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_EQUAL( "def", std::string("abc") ) ); // @todo: should we support this? Stringize a type without linkage --- 81,114 ---- { // CPPUT_ASSERT ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT( true ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT( false ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT( true, "should pass" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT( false, ! "should throw AbortingAssertionException" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_EXPR( true ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_EXPR( false ) )); // CPPUT_ASSERT_FALSE ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_FALSE( false ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_FALSE( true ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_FALSE( false, "should pass" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_FALSE( true, ! "should throw AbortingAssertionException" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_EXPR_FALSE( false ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_EXPR_FALSE( true ) )); // CPPUT_ASSERT_EQUAL ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_EQUAL( 1234567, 1234567 ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_EQUAL( 1234567, 456 ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_EQUAL( 1234567, 1234567, "should pass" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_EQUAL( 1234567, 456, "should fail" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_EQUAL( std::string("abc"), "abc" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_EQUAL( "def", std::string("abc") ) )); // @todo: should we support this? Stringize a type without linkage *************** *** 117,128 **** // CPPUT_ASSERT_NOT_EQUAL ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_NOT_EQUAL( 1234567, 456 ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_NOT_EQUAL( 1234567, 1234567 ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_NOT_EQUAL( 1234567, 456, "should pass" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_NOT_EQUAL( 1234567, 1234567, "should fail" ) ); ! CPPUT_ASSERT_ASSERTION_PASS( CPPUT_ASSERT_NOT_EQUAL( std::string("abc"), "def" ) ); ! CPPUT_ASSERT_ASSERTION_FAIL( CPPUT_ASSERT_NOT_EQUAL( "abc", std::string("abc") ) ); } catch ( CppUT::AbortingAssertionException &e ) --- 117,128 ---- // CPPUT_ASSERT_NOT_EQUAL ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_NOT_EQUAL( 1234567, 456 ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_NOT_EQUAL( 1234567, 1234567 ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_NOT_EQUAL( 1234567, 456, "should pass" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_NOT_EQUAL( 1234567, 1234567, "should fail" ) )); ! CPPUT_ASSERT_ASSERTION_PASS(( CPPUT_ASSERT_NOT_EQUAL( std::string("abc"), "def" ) )); ! CPPUT_ASSERT_ASSERTION_FAIL(( CPPUT_ASSERT_NOT_EQUAL( "abc", std::string("abc") ) )); } catch ( CppUT::AbortingAssertionException &e ) |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 23:07:04
|
Update of /cvsroot/cppunit/cppunit2/src/cpputtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28167/src/cpputtest Modified Files: testtestcase.cpp Log Message: * fixed portability issue (std::exception does not have a const char * constructor). Index: testtestcase.cpp =================================================================== RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/testtestcase.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** testtestcase.cpp 21 Nov 2004 22:28:24 -0000 1.10 --- testtestcase.cpp 23 Feb 2005 23:06:50 -0000 1.11 *************** *** 2,5 **** --- 2,6 ---- #include <cpput/testcase.h> #include <iostream> + #include <stdexcept> #include "mocktestvisitor.h" *************** *** 70,74 **** { ++*flag; ! throw std::exception( "callback exception" ); } --- 71,75 ---- { ++*flag; ! throw std::runtime_error( "callback exception" ); } |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 23:04:49
|
Update of /cvsroot/cppunit/cppunit2/include/opentest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27178/include/opentest Modified Files: texttestdriver.h Log Message: * removed warning about negative unsigned Index: texttestdriver.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/opentest/texttestdriver.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** texttestdriver.h 21 Nov 2004 22:27:15 -0000 1.5 --- texttestdriver.h 23 Feb 2005 23:04:34 -0000 1.6 *************** *** 153,157 **** const Properties &data ); ! std::string getTestPath( TestId test, unsigned int maxParent = -1 ) const; void reportFailure( const TestResult &testResult, --- 153,157 ---- const Properties &data ); ! std::string getTestPath( TestId test, unsigned int maxParent = (unsigned int)-1 ) const; void reportFailure( const TestResult &testResult, |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 22:49:47
|
Update of /cvsroot/cppunit/cppunit2/include/cpputtools/configuration In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21404/include/cpputtools/configuration Modified Files: validator.h Log Message: * added missing typename Index: validator.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpputtools/configuration/validator.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** validator.h 23 Jun 2004 20:00:52 -0000 1.4 --- validator.h 23 Feb 2005 22:49:39 -0000 1.5 *************** *** 155,159 **** EnumerationValidator<OptionType>::inputHelp( const String &text ) const { ! Values::const_iterator it = values_.find( text ); if ( it == values_.end() ) return ""; --- 155,159 ---- EnumerationValidator<OptionType>::inputHelp( const String &text ) const { ! CPPTL_TYPENAME Values::const_iterator it = values_.find( text ); if ( it == values_.end() ) return ""; *************** *** 167,171 **** { String text = parameters.at(0); ! Values::const_iterator it = values_.find( text ); if ( it == values_.end() ) throw ValidatorError( ValidatorError::badParameterValue, "value must be..." ); --- 167,171 ---- { String text = parameters.at(0); ! CPPTL_TYPENAME Values::const_iterator it = values_.find( text ); if ( it == values_.end() ) throw ValidatorError( ValidatorError::badParameterValue, "value must be..." ); |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 22:49:04
|
Update of /cvsroot/cppunit/cppunit2/include/cpputtools/configuration In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21170/include/cpputtools/configuration Modified Files: errors.h Log Message: * added no throw destructor to subclass of std::exception Index: errors.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpputtools/configuration/errors.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** errors.h 23 Jun 2004 18:44:38 -0000 1.2 --- errors.h 23 Feb 2005 22:48:56 -0000 1.3 *************** *** 36,39 **** --- 36,43 ---- } + ~ValidatorError() throw() + { + } + void setOptionName( const String &name ) { *************** *** 101,104 **** --- 105,110 ---- const String &optionName ); + ~CommandLineParseError() throw(); + Cause cause() const; *************** *** 127,130 **** --- 133,141 ---- + inline CommandLineParseError::~CommandLineParseError() throw() + { + } + + inline CommandLineParseError::Cause CommandLineParseError::cause() const |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 22:46:05
|
Update of /cvsroot/cppunit/cppunit2/include/cpputtools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20053/include/cpputtools Modified Files: value.h Log Message: * added detection of gcc stdlib & of the presence of std::wstring Index: value.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpputtools/value.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** value.h 23 Feb 2005 21:40:13 -0000 1.9 --- value.h 23 Feb 2005 22:45:56 -0000 1.10 *************** *** 92,96 **** --- 92,98 ---- Value( long double value ); Value( const std::string &value ); + #if !defined(CPPTL_NO_STD_WSTRING) Value( const std::wstring &value ); + #endif Value( const Value &other ); *************** *** 193,201 **** } inline Value::Value( const std::wstring &value ) : holder_( new Impl::ValueHolderImpl<std::wstring>( value ) ) { } ! --- 195,204 ---- } + #if !defined(CPPTL_NO_STD_WSTRING) inline Value::Value( const std::wstring &value ) : holder_( new Impl::ValueHolderImpl<std::wstring>( value ) ) { } ! #endif *************** *** 270,274 **** const ValueType &newValue ) { ! return value = CppUTTools::Value( new Impl::ValueHolderImpl<ValueType>( newValue ) ); } --- 273,278 ---- const ValueType &newValue ) { ! value = CppUTTools::Value( new CppUTTools::Impl::ValueHolderImpl<ValueType>( newValue ) ); ! return value; } |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 22:46:05
|
Update of /cvsroot/cppunit/cppunit2/include/cpptl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20053/include/cpptl Modified Files: config.h Log Message: * added detection of gcc stdlib & of the presence of std::wstring Index: config.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/config.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** config.h 23 Feb 2005 21:35:18 -0000 1.6 --- config.h 23 Feb 2005 22:45:56 -0000 1.7 *************** *** 2,5 **** --- 2,7 ---- # define CPPTL_CONFIG_H_INCLUDED + // Need to include an STL header to detect STL type & version + #include <utility> *************** *** 37,41 **** # pragma warning( disable : 4180 ) // qualifier applied to function type has no meaning # endif ! #endif --- 39,52 ---- # pragma warning( disable : 4180 ) // qualifier applied to function type has no meaning # endif ! # endif ! ! ! // STL specifics ! /////////////////////////////////////////////////////////////////////////// ! # if defined(__GLIBCPP__) || defined(__GLIBCXX__) // GNU libstdc++ 3 ! # if !defined(_GLIBCPP_USE_WCHAR_T) && !defined(_GLIBCXX_USE_WCHAR_T) ! # define CPPTL_NO_STD_WSTRING 1 ! # endif ! # endif |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 22:08:54
|
Update of /cvsroot/cppunit/cppunit2/include/cpput In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6330/include/cpput Modified Files: assertenum.h Log Message: * removed warning about 'noDifference' * added missing typename Index: assertenum.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpput/assertenum.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** assertenum.h 21 Oct 2004 17:23:22 -0000 1.5 --- assertenum.h 23 Feb 2005 22:08:45 -0000 1.6 *************** *** 42,45 **** --- 42,47 ---- namespace Impl { + enum { noDifference = -1 }; + template<class ExpectedEnumType ,class ActualEnumType *************** *** 62,66 **** if ( actual.is_open() ) return diffIndex; ! return noDifference; } --- 64,68 ---- if ( actual.is_open() ) return diffIndex; ! return (unsigned int)noDifference; } *************** *** 84,91 **** CPPTL_TYPENAME ExpectedSetType::value_type expectedItem = expectedEnum.current(); bool found = false; ! ExtraneousSeqType::iterator it = extraneous.begin(); for ( ; it != extraneous.end(); ++it ) { ! const ExtraneousSeqType::value_type &actualItem = *it; if ( predicate( expectedItem, actualItem ) ) { --- 86,93 ---- CPPTL_TYPENAME ExpectedSetType::value_type expectedItem = expectedEnum.current(); bool found = false; ! CPPTL_TYPENAME ExtraneousSeqType::iterator it = extraneous.begin(); for ( ; it != extraneous.end(); ++it ) { ! const CPPTL_TYPENAME ExtraneousSeqType::value_type &actualItem = *it; if ( predicate( expectedItem, actualItem ) ) { *************** *** 103,108 **** } // namespace Impl - enum { noDifference = -1 }; - template<class ExpectedEnumerator ,class ActualEnumerator --- 105,108 ---- *************** *** 120,124 **** actual, comparator ); ! if ( diffIndex == noDifference ) return; --- 120,124 ---- actual, comparator ); ! if ( diffIndex == Impl::noDifference ) return; *************** *** 234,239 **** const Message &message ) { ! std::deque<ExpectedEnumerator::value_type> missing; ! std::deque<ActualEnumerator::value_type> extraneous; Impl::getSetDifference( expected, actual, missing, extraneous, --- 234,239 ---- const Message &message ) { ! std::deque<CPPTL_TYPENAME ExpectedEnumerator::value_type> missing; ! std::deque<CPPTL_TYPENAME ActualEnumerator::value_type> extraneous; Impl::getSetDifference( expected, actual, missing, extraneous, |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 22:07:47
|
Update of /cvsroot/cppunit/cppunit2/include/cpptl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5880/include/cpptl Modified Files: enumerator.h Log Message: * added missing typename Index: enumerator.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/enumerator.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** enumerator.h 23 Feb 2005 08:54:04 -0000 1.6 --- enumerator.h 23 Feb 2005 22:07:39 -0000 1.7 *************** *** 943,947 **** values( const ContainerType &container ) { ! typedef MapValuesEnumerator<ContainerType::const_iterator> EnumType; return EnumType( container.begin(), container.end() ); } --- 943,947 ---- values( const ContainerType &container ) { ! typedef MapValuesEnumerator<CPPTL_TYPENAME ContainerType::const_iterator> EnumType; return EnumType( container.begin(), container.end() ); } *************** *** 953,957 **** values( const ContainerType &container, ValueType ) { ! typedef MapValuesEnumerator< ContainerType::const_iterator , CPPTL_TYPENAME ValueType::type > EnumType; return EnumType( container.begin(), container.end() ); --- 953,957 ---- values( const ContainerType &container, ValueType ) { ! typedef MapValuesEnumerator< CPPTL_TYPENAME ContainerType::const_iterator , CPPTL_TYPENAME ValueType::type > EnumType; return EnumType( container.begin(), container.end() ); |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 22:06:59
|
Update of /cvsroot/cppunit/cppunit2/include/cpptl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5573/include/cpptl Modified Files: sharedptr.h Log Message: * fixed destructor (deleting void * instead of pointee) Index: sharedptr.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/sharedptr.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sharedptr.h 23 Feb 2005 21:36:24 -0000 1.2 --- sharedptr.h 23 Feb 2005 22:06:51 -0000 1.3 *************** *** 153,157 **** { if ( releaseCount() ) ! delete p_; } --- 153,157 ---- { if ( releaseCount() ) ! delete static_cast<PointeeType *>( p_ ); } |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 21:43:53
|
Update of /cvsroot/cppunit/cppunit2/include/cpput In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29937/include/cpput Modified Files: typehelper.h Log Message: * reindented Index: typehelper.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpput/typehelper.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** typehelper.h 15 Nov 2004 08:28:51 -0000 1.2 --- typehelper.h 23 Feb 2005 21:43:44 -0000 1.3 *************** *** 12,16 **** namespace Impl { inline std::string CPPUT_API extractTypeId( const std::type_info &type, ! const char *hint ) { // VC6 define the macro _CPPRTTI when RTTI is enabled. Is that standard & portable ? --- 12,16 ---- namespace Impl { inline std::string CPPUT_API extractTypeId( const std::type_info &type, ! const char *hint ) { // VC6 define the macro _CPPRTTI when RTTI is enabled. Is that standard & portable ? |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 21:43:08
|
Update of /cvsroot/cppunit/cppunit2/src/cpputtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29568/src/cpputtest Modified Files: testbasicassertion.cpp Log Message: * fixed portability issue (std::exception does not have a const char * constructor). Index: testbasicassertion.cpp =================================================================== RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/testbasicassertion.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** testbasicassertion.cpp 20 Nov 2004 15:07:00 -0000 1.5 --- testbasicassertion.cpp 23 Feb 2005 21:42:59 -0000 1.6 *************** *** 1,4 **** --- 1,5 ---- #include <cpput/assert.h> #include <iostream> + #include <stdexcept> *************** *** 8,12 **** try { ! CPPUT_ASSERT_THROW( throw std::exception( "dummy" ), std::exception ); } catch ( ... ) --- 9,13 ---- try { ! CPPUT_ASSERT_THROW( throw std::runtime_error( "dummy" ), std::runtime_error ); } catch ( ... ) *************** *** 49,53 **** try { ! CPPUT_ASSERT_NO_THROW( throw std::exception( "dummy" ) ); std::cout << "Test 4: expected AbortingAssertionException " "not thrown by CPPUT_ASSERT_THROW." << std::endl; --- 50,54 ---- try { ! CPPUT_ASSERT_NO_THROW( throw std::runtime_error( "dummy" ) ); std::cout << "Test 4: expected AbortingAssertionException " "not thrown by CPPUT_ASSERT_THROW." << std::endl; |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 21:42:02
|
Update of /cvsroot/cppunit/cppunit2/include/cpput In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29093/include/cpput Modified Files: message.h Log Message: * commented out properties stuff as it will likely be taken over by open test properties. Index: message.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpput/message.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** message.h 20 Nov 2004 12:12:38 -0000 1.4 --- message.h 23 Feb 2005 21:41:54 -0000 1.5 *************** *** 3,7 **** # include <cpput/config.h> ! # include <cpput/properties.h> # include <string> # include <vector> --- 3,7 ---- # include <cpput/config.h> ! //# include <opentest/properties.h> # include <string> # include <vector> *************** *** 95,125 **** } ! Properties &properties() ! { ! return properties_; ! } ! const Properties &properties() const ! { ! return properties_; ! } ! void setStatus( bool succeeded ) ! { ! properties().set( "cpput.status", succeeded ); ! } ! void setResultType( const std::string &resultType ) ! { ! properties().set( "cpput.result_type", resultType ); ! } ! bool hasResultType() const ! { ! return properties().has( "cpput.result_type" ); ! } private: ! Properties properties_; typedef std::vector<std::string> Details; --- 95,125 ---- } ! //Properties &properties() ! //{ ! // return properties_; ! //} ! //const Properties &properties() const ! //{ ! // return properties_; ! //} ! //void setStatus( bool succeeded ) ! //{ ! // properties().set( "cpput.status", succeeded ); ! //} ! //void setResultType( const std::string &resultType ) ! //{ ! // properties().set( "cpput.result_type", resultType ); ! //} ! //bool hasResultType() const ! //{ ! // return properties().has( "cpput.result_type" ); ! //} private: ! //Properties properties_; typedef std::vector<std::string> Details; |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 21:40:22
|
Update of /cvsroot/cppunit/cppunit2/include/opentest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28570/include/opentest Modified Files: properties.h Log Message: * fixed included for std::bad_cast * changed implementation (overridding what() instead of calling contructor as it was not portable). Index: properties.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/opentest/properties.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** properties.h 21 Nov 2004 22:26:32 -0000 1.9 --- properties.h 23 Feb 2005 21:40:13 -0000 1.10 *************** *** 17,24 **** class OPENTEST_API ValueBadCast : public std::bad_cast { ! public: ! ValueBadCast() ! : std::bad_cast( "Bad OpenTest::Value cast." ) { } }; --- 17,25 ---- class OPENTEST_API ValueBadCast : public std::bad_cast { ! public: // overriden from std::bad_cast ! const char * what() const throw() { + return "ValueBadCast: " + "Value can not be converted to the specified type."; } }; |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 21:40:21
|
Update of /cvsroot/cppunit/cppunit2/include/cpputtools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28570/include/cpputtools Modified Files: value.h Log Message: * fixed included for std::bad_cast * changed implementation (overridding what() instead of calling contructor as it was not portable). Index: value.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpputtools/value.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** value.h 15 Nov 2004 08:31:43 -0000 1.8 --- value.h 23 Feb 2005 21:40:13 -0000 1.9 *************** *** 3,7 **** # include "ctti.h" ! # include <stdexcept> /// @todo Implement broken on VC++ 6 because of linker bug: --- 3,8 ---- # include "ctti.h" ! # include <typeinfo> // std::bad_cast ! # include <string> /// @todo Implement broken on VC++ 6 because of linker bug: *************** *** 16,21 **** { public: ! ValueBadCast() : std::bad_cast( "CppUTTools::ValueBadCast" ) { } }; --- 17,24 ---- { public: ! const char * what() const throw() { + return "ValueBadCast: " + "Value can not be converted to the specified type."; } }; |
|
From: Baptiste L. <bl...@us...> - 2005-02-23 21:38:25
|
Update of /cvsroot/cppunit/cppunit2/include/cpptl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27767/include/cpptl Modified Files: stringtools.h Log Message: * worked around call ambiguity for std::string::insert() Index: stringtools.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/stringtools.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** stringtools.h 20 Nov 2004 09:15:00 -0000 1.2 --- stringtools.h 23 Feb 2005 21:38:16 -0000 1.3 *************** *** 22,26 **** while ( v != 0 ) { ! s.insert( 0, 1, digits[v % 10] ); v /= 10; } --- 22,28 ---- while ( v != 0 ) { ! // Thoses cast are necessary to resolve an ambiguity between insert( char *, unsigned, char ) ! // and insert( unsigned, unsigned, char) with Sun CC. ! s.insert( (unsigned int)0, (unsigned int)1, digits[v % 10] ); v /= 10; } |
