[Cppunit-cvs] cppunit2/src/cpput lighttestrunner.cpp,1.9,1.10 testinfo.cpp,1.16,1.17

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

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

Modified Files:
	lighttestrunner.cpp testinfo.cpp 
Log Message:
* replaced include/opentest/properties.h with include/json/value.h
* replaced all occurrences of OpenTest::Value and OpenTest::Properties with Json::Value.

Index: lighttestrunner.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/lighttestrunner.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** lighttestrunner.cpp	7 Nov 2005 22:43:08 -0000	1.9
--- lighttestrunner.cpp	8 Nov 2005 20:25:49 -0000	1.10
***************
*** 104,108 ****
  
  void 
! LightTestRunner::addResultLog( const OpenTest::Value &log )
  {
     ResultElement element;
--- 104,108 ----
  
  void 
! LightTestRunner::addResultLog( const Json::Value &log )
  {
     ResultElement element;
***************
*** 153,157 ****
     if ( !failure.testDataType().empty() )
     {
!       const OpenTest::Properties &testData = failure.testData();
        report_ += "Test data type: " + failure.testDataType() + "\n";
        report_ += testData.toStyledString() + "\n";
--- 153,157 ----
     if ( !failure.testDataType().empty() )
     {
!       const Json::Value &testData = failure.testData();
        report_ += "Test data type: " + failure.testDataType() + "\n";
        report_ += testData.toStyledString() + "\n";
***************
*** 162,166 ****
  
  void 
! LightTestRunner::reportLog( const OpenTest::Value &log )
  {
     report_ += "Log:\n";
--- 162,166 ----
  
  void 
! LightTestRunner::reportLog( const Json::Value &log )
  {
     report_ += "Log:\n";

Index: testinfo.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/testinfo.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** testinfo.cpp	7 Nov 2005 22:43:08 -0000	1.16
--- testinfo.cpp	8 Nov 2005 20:25:49 -0000	1.17
***************
*** 77,81 ****
  void 
  Assertion::setTestData( const CppTL::ConstString &name,
!                         const OpenTest::Value &value,
                          const CppTL::ConstString &type )
  {
--- 77,81 ----
  void 
  Assertion::setTestData( const CppTL::ConstString &name,
!                         const Json::Value &value,
                          const CppTL::ConstString &type )
  {
***************
*** 85,89 ****
  
  
! const OpenTest::Properties &
  Assertion::testData() const
  {
--- 85,89 ----
  
  
! const Json::Value &
  Assertion::testData() const
  {
***************
*** 150,154 ****
  void 
  TestStatus::setStatistics( const CppTL::ConstString &name,
!                            const OpenTest::Value &value )
  {
     statistics_[name] = value;
--- 150,154 ----
  void 
  TestStatus::setStatistics( const CppTL::ConstString &name,
!                            const Json::Value &value )
  {
     statistics_[name] = value;
***************
*** 156,160 ****
  
  
! //OpenTest::Value 
  //TestStatus::getStatistics( const CppTL::ConstString &name )
  //{
--- 156,160 ----
  
  
! //Json::Value 
  //TestStatus::getStatistics( const CppTL::ConstString &name )
  //{
***************
*** 163,167 ****
  void 
  TestStatus::addSpecific( const CppTL::ConstString &type,
!                          const OpenTest::Value &value )
  {
     specifics_[type] = value;
--- 163,167 ----
  void 
  TestStatus::addSpecific( const CppTL::ConstString &type,
!                          const Json::Value &value )
  {
     specifics_[type] = value;
***************
*** 278,282 ****
  
  void 
! TestInfo::log( const OpenTest::Value &log )
  {
     if ( updater_ )
--- 278,282 ----
  
  void 
! TestInfo::log( const Json::Value &log )
  {
     if ( updater_ )
***************
*** 332,336 ****
  
  
! void log( const OpenTest::Value &log )
  {
     TestInfo::threadInstance().log( log );
--- 332,336 ----
  
  
! void log( const Json::Value &log )
  {
     TestInfo::threadInstance().log( log );