Update of /cvsroot/cpptool/CppParser/examples/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20897/examples/parser
Modified Files:
main.cpp parser.vcproj
Log Message:
* upgraded to current cppunit 2 cvs
Index: parser.vcproj
===================================================================
RCS file: /cvsroot/cpptool/CppParser/examples/parser/parser.vcproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** parser.vcproj 20 Jun 2004 15:53:41 -0000 1.4
--- parser.vcproj 5 Aug 2004 20:52:41 -0000 1.5
***************
*** 366,369 ****
--- 366,372 ----
</File>
<File
+ RelativePath="node.cpp">
+ </File>
+ <File
RelativePath="node.h">
</File>
***************
*** 482,488 ****
</File>
<File
- RelativePath="node.cpp">
- </File>
- <File
RelativePath=".\nodeprocessor.cpp">
</File>
--- 485,488 ----
Index: main.cpp
===================================================================
RCS file: /cvsroot/cpptool/CppParser/examples/parser/main.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** main.cpp 8 Jun 2004 20:23:14 -0000 1.1.1.1
--- main.cpp 5 Aug 2004 20:52:40 -0000 1.2
***************
*** 1,4 ****
#include <cpput/registry.h>
! #include <cpput/result.h>
#include <cpput/test.h>
#include <cpput/testcontext.h>
--- 1,5 ----
#include <cpput/registry.h>
! #include <cpput/progresslistener.h>
! #include <cpput/testrunresult.h>
#include <cpput/test.h>
#include <cpput/testcontext.h>
***************
*** 7,19 ****
- static std::string makeTestPath( const CppUT::Test &test )
- {
- if ( test.parentTest() )
- return makeTestPath( *test.parentTest() ) + "/" + test.name();
- return test.name();
- }
-
static void dumpFailures( const CppUT::TestSuite &allSuite,
! const CppUT::Result &result )
{
if ( result.successful() )
--- 8,13 ----
static void dumpFailures( const CppUT::TestSuite &allSuite,
! const CppUT::TestRunResult &result )
{
if ( result.successful() )
***************
*** 25,29 ****
for ( int index =0; index < result.failureCount(); ++index )
{
! const CppUT::TestFailure &failure = result.failureAt( index );
if ( failure.location().isValid() )
--- 19,23 ----
for ( int index =0; index < result.failureCount(); ++index )
{
! const CppUT::TestResult &failure = result.failureAt( index );
if ( failure.location().isValid() )
***************
*** 31,35 ****
else
std::cout << "Unknown failure location: ";
! std::cout << makeTestPath( failure.failedTest() ) << std::endl;
std::cout << failure.message().toString() << std::endl;
}
--- 25,29 ----
else
std::cout << "Unknown failure location: ";
! std::cout << CppUT::path( failure.test() ) << std::endl;
std::cout << failure.message().toString() << std::endl;
}
***************
*** 41,76 ****
- class ShowProgress : public CppUT::TestListener
- {
- public:
- void testFailed( const CppUT::TestFailure &failure,
- CppUT::TestContext &context )
- {
- testFailed_ = true;
- }
-
- void enterTest( CppUT::Test &test, CppUT::TestContext &context )
- {
- testFailed_ = false;
- std::cout << "Testing '" << makeTestPath( test ) << "' : ";
- std::cout.flush();
- }
-
- void exitTest( CppUT::Test &test, CppUT::TestContext &context )
- {
- std::cout << (testFailed_ ? "FAILURE" : "OK") << std::endl;
- }
-
- bool testFailed_;
- };
-
-
int main( int argc, char *argv[] )
{
CppUT::TestSuitePtr allSuite = CppUT::Registry::instance().createDefaultTests();
CppUT::TestContext context;
! CppUT::Result result;
context.add( result );
! ShowProgress progress;
context.add( progress );
allSuite->run( context );
--- 35,45 ----
int main( int argc, char *argv[] )
{
CppUT::TestSuitePtr allSuite = CppUT::Registry::instance().createDefaultTests();
CppUT::TestContext context;
! CppUT::TestRunResult result;
context.add( result );
! CppUT::BriefProgressListener progress;
context.add( progress );
allSuite->run( context );
|
