[Cppunit-cvs] cppunit2/include/opentest testrunner.h,1.2,1.3 texttestdriver.h,1.2,1.3

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

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

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

Index: testrunner.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/opentest/testrunner.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** testrunner.h	16 Nov 2004 22:46:44 -0000	1.2
--- testrunner.h	19 Nov 2004 21:39:13 -0000	1.3
***************
*** 55,60 ****
     virtual void startTest( const TestPlanEntry &testEntry ) = 0;
  
!    virtual void addTestInfo( const TestPlanEntry &testEntry,
!                              const Properties &data ) = 0;
  
     virtual void endTest( const TestPlanEntry &testEntry ) = 0;
--- 55,68 ----
     virtual void startTest( const TestPlanEntry &testEntry ) = 0;
  
!    virtual void mergeInTestResult( const TestPlanEntry &testEntry,
!                                    const OpenTest::Properties &result ) = 0;
! 
!    virtual void mergeInTestResult( const TestPlanEntry &testEntry,
!                                    const PropertyPath &path,
!                                    const Value &value ) = 0;
! 
!    virtual void appendToTestResult( const TestPlanEntry &testEntry,
!                                     const PropertyPath &path,
!                                     const Value &value ) = 0;
  
     virtual void endTest( const TestPlanEntry &testEntry ) = 0;

Index: texttestdriver.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/opentest/texttestdriver.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** texttestdriver.h	16 Nov 2004 22:46:44 -0000	1.2
--- texttestdriver.h	19 Nov 2004 21:39:13 -0000	1.3
***************
*** 31,36 ****
     TestResult( TestPlanEntryId id, TestId test );
  
-    void addTestResultInfo( const Properties &result );
- 
     TestPlanEntryId id() const;
  
--- 31,34 ----
***************
*** 96,101 ****
     void startTest( const TestPlanEntry &testEntry );
  
!    void addTestInfo( const TestPlanEntry &testEntry,
!                      const Properties &data );
  
     void endTest( const TestPlanEntry &testEntry );
--- 94,107 ----
     void startTest( const TestPlanEntry &testEntry );
  
!    void mergeInTestResult( const TestPlanEntry &testEntry,
!                            const Properties &result );
! 
!    void mergeInTestResult( const TestPlanEntry &testEntry,
!                            const PropertyPath &path,
!                            const Value &value );
! 
!    void appendToTestResult( const TestPlanEntry &testEntry,
!                             const PropertyPath &path,
!                             const Value &value );
  
     void endTest( const TestPlanEntry &testEntry );
***************
*** 201,211 ****
  
  
- inline void 
- TestResult::addTestResultInfo( const Properties &result )
- {
-    result_.mergeReplacingExisting( result );
- }
- 
- 
  inline TestPlanEntryId 
  TestResult::id() const
--- 207,210 ----
***************
*** 376,380 ****
                        testEntry.test() );
     // should add descriptive test data first
!    result.addTestResultInfo( testEntry.configuration() );
     results_.push_back( result );
  
--- 375,379 ----
                        testEntry.test() );
     // should add descriptive test data first
!    result.result().mergeReplacingExisting( testEntry.configuration() );
     results_.push_back( result );
  
***************
*** 387,394 ****
  
  inline void 
! TextTestDriver::addTestInfo( const TestPlanEntry &testEntry,
!                              const Properties &data )
  {
!    results_.back().addTestResultInfo( data );
  }
  
--- 386,411 ----
  
  inline void 
! TextTestDriver::mergeInTestResult( const TestPlanEntry &testEntry,
!                                    const Properties &result )
  {
!    results_.back().result().mergeReplacingExisting( result );
! }
! 
! 
! inline void 
! TextTestDriver::mergeInTestResult( const TestPlanEntry &testEntry,
!                                    const PropertyPath &path,
!                                    const Value &value )
! {
!    results_.back().result()[path] = value;
! }
! 
! 
! inline void 
! TextTestDriver::appendToTestResult( const TestPlanEntry &testEntry,
!                                     const PropertyPath &path,
!                                     const Value &value )
! {
!    results_.back().result()[path].append( value );
  }