cppunit-cvs

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

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

Modified Files:
	testinfo.cpp testrunner.cpp 
Log Message:
* modified TestRunner/TestDriver protocol to allow incremental result properties update.

Index: testrunner.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/testrunner.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** testrunner.cpp	17 Nov 2004 21:47:10 -0000	1.2
--- testrunner.cpp	19 Nov 2004 21:39:14 -0000	1.3
***************
*** 90,94 ****
        }
  
!       tracker_.addTestInfo( *testEntry_, openResult );
     }
  
--- 90,94 ----
        }
  
!       tracker_.mergeInTestResult( *testEntry_, openResult );
     }
  
***************
*** 156,160 ****
           openResult["result"]["status"]["success"] = false;
           openResult["result"]["status"]["type"] = "skip";
!          tracker.addTestInfo( entry, openResult );
        }
        else
--- 156,160 ----
           openResult["result"]["status"]["success"] = false;
           openResult["result"]["status"]["type"] = "skip";
!          tracker.mergeInTestResult( entry, openResult );
        }
        else
***************
*** 167,171 ****
              openResult["result"]["status"]["type"] = "skip";
              openResult["result"]["status"]["message"] = "Can not run test suite.";
!             tracker.addTestInfo( entry, openResult );
           }
           else
--- 167,171 ----
              openResult["result"]["status"]["type"] = "skip";
              openResult["result"]["status"]["message"] = "Can not run test suite.";
!             tracker.mergeInTestResult( entry, openResult );
           }
           else

Index: testinfo.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/testinfo.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** testinfo.cpp	18 Nov 2004 09:20:33 -0000	1.1
--- testinfo.cpp	19 Nov 2004 21:39:14 -0000	1.2
***************
*** 119,123 ****
     }
  
!    void mergeInResult( const std::string &path,
                         const OpenTest::Value &value )
     {
--- 119,131 ----
     }
  
!    void mergeInResult( const OpenTest::Properties &result )
!    {
!       data().result_.mergeReplacingExisting( result );
!       if ( data().updater_ )
!          data().updater_->mergeInResult( result );
!    }
! 
! 
!    void mergeInResult( const OpenTest::PropertyPath &path,
                         const OpenTest::Value &value )
     {
***************
*** 127,131 ****
     }
  
!    void appendToResult( const std::string &path,
                          const OpenTest::Value &value )
     {
--- 135,139 ----
     }
  
!    void appendToResult( const OpenTest::PropertyPath &path,
                          const OpenTest::Value &value )
     {