cppunit-cvs

[Baptiste L. <bl...@us...>]

Update of /cvsroot/cppunit/cppunit2/src/cpputtest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28959/src/cpputtest

Modified Files:
	cpputtest.vcproj registrytest.cpp 
Added Files:
	minitestrunner.h 
Log Message:
* extracted MiniTestRunner from registry test.

Index: registrytest.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/registrytest.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** registrytest.cpp	27 Feb 2005 15:27:09 -0000	1.3
--- registrytest.cpp	27 Feb 2005 15:47:38 -0000	1.4
***************
*** 1,5 ****
  #include "registrytest.h"
! #include <cpput/testcase.h>
! #include <cpput/testsuite.h>
  
  
--- 1,4 ----
  #include "registrytest.h"
! #include "minitestrunner.h"
  
  
***************
*** 95,106 ****
  RegistryTest::runTestSuite( CppUT::TestSuitePtr suite )
  {
!    for ( int index =0; index < suite->testCount(); ++index )
!    {
!       CppUT::TestPtr test = suite->testAt(index);
!       if ( test->isTestSuite() )
!          runTestSuite( CppTL::staticPointerCast<CppUT::TestSuite>( test ) );
!       else
!          CppTL::staticPointerCast<CppUT::AbstractTestCase>( test )->runTest();
!    }
  }
  
--- 94,99 ----
  RegistryTest::runTestSuite( CppUT::TestSuitePtr suite )
  {
!    MiniTestRunner runner;
!    runner.run( suite );
  }
  

--- NEW FILE: minitestrunner.h ---
#ifndef CPPUTTEST_MINITESTRUNNER_H_INCLUDED
# define CPPUTTEST_MINITESTRUNNER_H_INCLUDED

# include <cpput/testcase.h>
# include <cpput/testsuite.h>

class MiniTestRunner
{
public:
   MiniTestRunner()
   {
      reset();
   }

   void run( CppUT::TestPtr test )
   {
      if ( test->isTestSuite() )
         run( CppTL::staticPointerCast<CppUT::TestSuite>( test ) );
      else
         run( CppTL::staticPointerCast<CppUT::AbstractTestCase>( test ) );
   }

   void run( CppUT::AbstractTestCasePtr test )
   {
      ++tested_;
      if ( test->runTest() )
         ++passed_;
      else
         ++failed_;
   }

   void run( CppUT::TestSuitePtr suite )
   {
      ++suite_;
      for ( int index =0; index < suite->testCount(); ++index )
         run( suite->testAt( index ) );
   }

   void reset()
   {
      suite_ = 0;
      tested_ = 0;
      passed_ = 0;
      failed_ = 0;
   }

   int suite_;
   int tested_;
   int passed_;
   int failed_;
};

#endif // CPPUTTEST_MINITESTRUNNER_H_INCLUDED

Index: cpputtest.vcproj
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/cpputtest.vcproj,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** cpputtest.vcproj	27 Feb 2005 15:27:09 -0000	1.13
--- cpputtest.vcproj	27 Feb 2005 15:47:38 -0000	1.14
***************
*** 185,188 ****
--- 185,191 ----
  		</File>
  		<File
+ 			RelativePath=".\minitestrunner.h">
+ 		</File>
+ 		<File
  			RelativePath=".\mocktestlistener.h">
  		</File>