cppunit-cvs

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

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

Modified Files:
	properties.h texttestdriver.h 
Log Message:
* TestContext: no longer rely on exception to retrieve failure
* TestContext: removed TestListener support since everything is handled by TestInfo
* TestFailureGuard: modified to report fault using TestInfo instead of exception
* TestListener, TestResult, TestRunResult: removed, replaced by TestInfo
* TextTestDriver: fixed bug in result merging (not prefixed with "/result"). Still need work to handle assertion and fault reporting.

Index: texttestdriver.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/opentest/texttestdriver.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** texttestdriver.h	19 Nov 2004 21:39:13 -0000	1.3
--- texttestdriver.h	20 Nov 2004 15:07:00 -0000	1.4
***************
*** 389,393 ****
                                     const Properties &result )
  {
!    results_.back().result().mergeReplacingExisting( result );
  }
  
--- 389,393 ----
                                     const Properties &result )
  {
!    results_.back().result()["result"].asProperties().mergeReplacingExisting( result );
  }
  
***************
*** 398,402 ****
                                     const Value &value )
  {
!    results_.back().result()[path] = value;
  }
  
--- 398,402 ----
                                     const Value &value )
  {
!    results_.back().result()["result"][path] = value;
  }
  
***************
*** 407,411 ****
                                      const Value &value )
  {
!    results_.back().result()[path].append( value );
  }
  
--- 407,411 ----
                                      const Value &value )
  {
!    results_.back().result()["result"][path].append( value );
  }
  
***************
*** 429,432 ****
--- 429,433 ----
     std::cout << statusInfo << std::endl;
     std::cout.flush();
+ //   std::cout << result.toString() << std::endl;
  }
  
***************
*** 465,472 ****
     }
  
- 
     TestResultIndexes::const_iterator failuresIt = failures_.begin();
     for ( ; failuresIt != failures_.end(); ++failuresIt )
     {
        const TestResult &testResult = results_.at( *failuresIt );
        PropertiesAccessor info = testResult.result().accessor();
--- 466,473 ----
     }
  
     TestResultIndexes::const_iterator failuresIt = failures_.begin();
     for ( ; failuresIt != failures_.end(); ++failuresIt )
     {
+       // @todo update to new result properties structure
        const TestResult &testResult = results_.at( *failuresIt );
        PropertiesAccessor info = testResult.result().accessor();

Index: properties.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/opentest/properties.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** properties.h	20 Nov 2004 12:12:01 -0000	1.6
--- properties.h	20 Nov 2004 15:06:59 -0000	1.7
***************
*** 253,256 ****
--- 253,260 ----
               const Value &defaultValue ) const;
  
+    unsigned int listSize() const;
+ 
+    bool hasList() const;
+ 
  private:
     const Properties *properties_;