[Cppunit-cvs] cppunit2/src/cpput SConscript,1.6,1.7 cpput.vcproj,1.34,1.35 lighttestrunner.cpp,1.1,1.2 testrunner.cpp,1.10,1.11

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

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

Modified Files:
	SConscript cpput.vcproj lighttestrunner.cpp testrunner.cpp 
Log Message:
* fixed bug in lighttestrunner: called AbstractTestCase::run instead of runTest().
* fixed usage of incomplete SharedPtr in TestRunner.


Index: SConscript
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/SConscript,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SConscript	6 Mar 2005 18:48:23 -0000	1.6
--- SConscript	4 Jul 2005 08:11:25 -0000	1.7
***************
*** 4,8 ****
      assert.cpp 
      assertstring.cpp 
!     exceptionguard.cpp 
      properties.cpp 
      registry.cpp 
--- 4,9 ----
      assert.cpp 
      assertstring.cpp 
!     exceptionguard.cpp
!     lighttestrunner.cpp
      properties.cpp 
      registry.cpp 

Index: lighttestrunner.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/lighttestrunner.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lighttestrunner.cpp	2 Jul 2005 20:27:36 -0000	1.1
--- lighttestrunner.cpp	4 Jul 2005 08:11:26 -0000	1.2
***************
*** 64,73 ****
     printf( "Testing %s : ", getTestPath().c_str() );
     TestInfo::startNewTest();
-    testCase->run();
- 
     ++testRun_;
!    OpenTest::PropertiesAccessor status = result_.accessor()["result"]["status"];
!    bool succeeded = status.getValue( "success", false ).asBool();
!    CppTL::ConstString statusInfo;
     printf( "%s\n", succeeded ? "OK" : "FAIL" );
     if ( !succeeded )
--- 64,70 ----
     printf( "Testing %s : ", getTestPath().c_str() );
     TestInfo::startNewTest();
     ++testRun_;
!    bool succeeded = testCase->runTest();
! 
     printf( "%s\n", succeeded ? "OK" : "FAIL" );
     if ( !succeeded )
***************
*** 75,83 ****
        ++testFailed_;
  
!       CppTL::ConstString resultType = status.getValue( "type", "" ).asString();
!       if ( !resultType.empty() )
!          statusInfo += " (" + resultType + ")";
  
!       report_ += "-> " + getTestPath() + statusInfo + "\n";
  
        OpenTest::PropertiesAccessor info = result_.accessor();
--- 72,79 ----
        ++testFailed_;
  
!       printf( "Result tree: %s\n", result_.toString().c_str() );
  
!       CppTL::ConstString resultType = TestInfo::faultCount() ? "fault" : "assertion";
!       report_ += "-> " + getTestPath() + " : " + resultType + "\n";
  
        OpenTest::PropertiesAccessor info = result_.accessor();
***************
*** 108,112 ****
  void 
  LightTestRunner::mergeInResult( const OpenTest::PropertyPath &path,
!                             const OpenTest::Value &value )
  {
     result_[path] = value;
--- 104,108 ----
  void 
  LightTestRunner::mergeInResult( const OpenTest::PropertyPath &path,
!                                 const OpenTest::Value &value )
  {
     result_[path] = value;
***************
*** 116,120 ****
  void 
  LightTestRunner::appendToResult( const OpenTest::PropertyPath &path,
!                              const OpenTest::Value &value )
  {
     result_[path].append( value );
--- 112,116 ----
  void 
  LightTestRunner::appendToResult( const OpenTest::PropertyPath &path,
!                                  const OpenTest::Value &value )
  {
     result_[path].append( value );

Index: testrunner.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/testrunner.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** testrunner.cpp	2 Jul 2005 20:27:36 -0000	1.10
--- testrunner.cpp	4 Jul 2005 08:11:26 -0000	1.11
***************
*** 5,8 ****
--- 5,9 ----
  #include <cpput/testsuite.h>
  #include <cpput/testvisitor.h>
+ #include <cpptl/scopedptr.h>
  #include <opentest/properties.h>
  #include <opentest/testplan.h>
***************
*** 125,129 ****
  {
     tracker.startTestRun();
!    TestResultUpdaterImplPtr resultUpdater( new TestResultUpdaterImpl( tracker ) );
     TestInfo::setTestResultUpdater( *resultUpdater );
  
--- 126,131 ----
  {
     tracker.startTestRun();
!    CppTL::ScopedPtr<TestResultUpdaterImpl> resultUpdater( 
!       new TestResultUpdaterImpl( tracker ) );
     TestInfo::setTestResultUpdater( *resultUpdater );
  

Index: cpput.vcproj
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/cpput.vcproj,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** cpput.vcproj	2 Jul 2005 20:27:36 -0000	1.34
--- cpput.vcproj	4 Jul 2005 08:11:25 -0000	1.35
***************
*** 229,232 ****
--- 229,235 ----
  			</File>
  			<File
+ 				RelativePath="..\..\include\cpptl\scopedptr.h">
+ 			</File>
+ 			<File
  				RelativePath="..\..\include\cpptl\sharedptr.h">
  			</File>