[Cppunit-cvs] cppunit2/src/cpputtest assertstringtest.cpp,1.4,1.5 main.cpp,1.22,1.23 testfixturetest
Brought to you by:
blep
From: Baptiste L. <bl...@us...> - 2005-09-06 07:31:52
|
Update of /cvsroot/cppunit/cppunit2/src/cpputtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16321/src/cpputtest Modified Files: assertstringtest.cpp main.cpp testfixturetest.cpp Log Message: * fixed compilation without RTTI * revised stringize implementation to allow an additional customization point by overloading toString(). * added test and corrected bug in serialization/packets implementation. Index: testfixturetest.cpp =================================================================== RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/testfixturetest.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** testfixturetest.cpp 6 Aug 2005 22:24:54 -0000 1.6 --- testfixturetest.cpp 6 Sep 2005 07:31:42 -0000 1.7 *************** *** 242,247 **** { CppUT::TestPtr suite = TestFixtureWithSpecific::suite(); ! CPPUT_ASSERT_EQUAL( 1, dynamic_cast<CppUT::TestSuite &>( *suite ).testCount() ); ! CppUT::TestPtr test = dynamic_cast<CppUT::TestSuite &>( *suite ).testAt(0); CPPUT_ASSERT_EQUAL( "Forced test failure", test->description() ); CPPUT_ASSERT_EQUAL( 30.0, test->timeOut() ); --- 242,247 ---- { CppUT::TestPtr suite = TestFixtureWithSpecific::suite(); ! CPPUT_ASSERT_EQUAL( 1, static_cast<CppUT::TestSuite &>( *suite ).testCount() ); ! CppUT::TestPtr test = static_cast<CppUT::TestSuite &>( *suite ).testAt(0); CPPUT_ASSERT_EQUAL( "Forced test failure", test->description() ); CPPUT_ASSERT_EQUAL( 30.0, test->timeOut() ); Index: main.cpp =================================================================== RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/main.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** main.cpp 7 Aug 2005 08:42:15 -0000 1.22 --- main.cpp 6 Sep 2005 07:31:42 -0000 1.23 *************** *** 8,11 **** --- 8,12 ---- #include "testfixturetest.h" #include "reflectiontest.h" + #include "formattest.h" #include <cpput/lighttestrunner.h> *************** *** 106,109 **** --- 107,111 ---- allSuite->add( AssertEnumTest::suite() ); allSuite->add( ReflectionTest::suite() ); + allSuite->add( FormatTest::suite() ); // allSuite->add( CommandLineOptionsTest::suite() ); Index: assertstringtest.cpp =================================================================== RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/assertstringtest.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** assertstringtest.cpp 23 Feb 2005 23:09:29 -0000 1.4 --- assertstringtest.cpp 6 Sep 2005 07:31:42 -0000 1.5 *************** *** 28,32 **** // Specialize convertToStringImpl function to handle StringWrapper type. ! inline std::string convertToString( const StringWrapper &str ) { return str.str(); --- 28,33 ---- // Specialize convertToStringImpl function to handle StringWrapper type. ! // @todo Does this work on VC6 without putting it in CppUT namespace ! inline std::string getStdString( const StringWrapper &str ) { return str.str(); |