cppunit-cvs

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

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

Modified Files:
	SConscript lighttestrunner.cpp testinfo.cpp 
Log Message:
- replaced usage of OpenTest::Properties with Json::Value.
  Json::Value provides a simpler interface and a standard *simple* serialization
  format.
- jsoncpp has been inlined in CppTL to make deploy easier and remove 
  an external dependency.


Index: SConscript
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/SConscript,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SConscript	8 Aug 2005 22:10:21 -0000	1.9
--- SConscript	7 Nov 2005 22:43:08 -0000	1.10
***************
*** 7,11 ****
      extendeddata.cpp
      lighttestrunner.cpp
-     properties.cpp 
      registry.cpp 
      testcase.cpp 
--- 7,10 ----

Index: lighttestrunner.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/lighttestrunner.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** lighttestrunner.cpp	11 Aug 2005 07:18:24 -0000	1.8
--- lighttestrunner.cpp	7 Nov 2005 22:43:08 -0000	1.9
***************
*** 155,159 ****
        const OpenTest::Properties &testData = failure.testData();
        report_ += "Test data type: " + failure.testDataType() + "\n";
!       report_ += testData.toString() + "\n";
     }
     report_ += "\n";
--- 155,159 ----
        const OpenTest::Properties &testData = failure.testData();
        report_ += "Test data type: " + failure.testDataType() + "\n";
!       report_ += testData.toStyledString() + "\n";
     }
     report_ += "\n";
***************
*** 165,172 ****
  {
     report_ += "Log:\n";
!    if ( log.isConvertibleTo( OpenTest::Value::vtString ) )
        report_ += log.asString();
     else
!       report_ += log.toString();
     if ( report_[ report_.length() -1 ] != '\n' )
        report_ += "\n\n";
--- 165,172 ----
  {
     report_ += "Log:\n";
!    if ( log.isConvertibleTo( Json::stringValue ) )
        report_ += log.asString();
     else
!       report_ += log.toStyledString();
     if ( report_[ report_.length() -1 ] != '\n' )
        report_ += "\n\n";

Index: testinfo.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpput/testinfo.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** testinfo.cpp	11 Aug 2005 07:18:24 -0000	1.15
--- testinfo.cpp	7 Nov 2005 22:43:08 -0000	1.16
***************
*** 113,117 ****
     {
        buffer += "Test data type: " + testDataType() + "\n";
!       buffer += testData_.toString() + "\n";
     }
     return buffer;
--- 113,117 ----
     {
        buffer += "Test data type: " + testDataType() + "\n";
!       buffer += testData_.toStyledString() + "\n";
     }
     return buffer;