[Cppunit-cvs] cppunit2/src/opentesttest mockhelper.h,1.1,1.2 remoteinterfacestest.cpp,1.1,1.2 serializertest.cpp,1.4,1.5

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

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

Modified Files:
	mockhelper.h remoteinterfacestest.cpp serializertest.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: mockhelper.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/opentesttest/mockhelper.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mockhelper.h	6 Sep 2005 07:43:48 -0000	1.1
--- mockhelper.h	7 Nov 2005 22:43:08 -0000	1.2
***************
*** 101,107 ****
  MockHelper::verify( const CppUT::Message &message )
  {
!    CppUT::checkSequenceEqual( expectations_.asProperties().listValues(), 
!                               actuals_.asProperties().listValues(),
!                               message );
     clearEvents();
     recordExpectedEvents();
--- 101,113 ----
  MockHelper::verify( const CppUT::Message &message )
  {
!    CppUT::RefComparator<const OpenTest::Value &,
!                         const OpenTest::Value &> comparator;
!    CppUT::RefStringizer<const OpenTest::Value &> stringizer;
!    CppUT::checkCustomHeterogeneousSequenceEqual( expectations_.enumValues(), 
!                                                  actuals_.enumValues(),
!                                                  stringizer,
!                                                  stringizer,
!                                                  comparator,
!                                                  message );
     clearEvents();
     recordExpectedEvents();

Index: serializertest.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/opentesttest/serializertest.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** serializertest.cpp	6 Sep 2005 07:31:42 -0000	1.4
--- serializertest.cpp	7 Nov 2005 22:43:08 -0000	1.5
***************
*** 6,17 ****
  namespace CppUT {
  // converter for assert equal
- inline std::string toString( const OpenTest::Properties &value )
- {
-    return value.toString().c_str();
- }
- 
  inline std::string toString( const OpenTest::Value &value )
  {
!    return value.toString().c_str();
  }
  
--- 6,12 ----
  namespace CppUT {
  // converter for assert equal
  inline std::string toString( const OpenTest::Value &value )
  {
!    return value.toStyledString();
  }
  
***************
*** 140,151 ****
  {
     OpenTest::Value vEmpty;
!    OpenTest::Value vUInt( 323456789 );
     OpenTest::Value vInt( -123456789 );
     OpenTest::Value vDouble( 1.2345678 );
     OpenTest::Value vString( "abcdefghijklmnopqrstuvwxyz" );
!    streamOut_ << vEmpty << vUInt << vInt << vDouble << vString;
     prepareUnserialize();
     OpenTest::Value v1, v2, v3, v4, v5;
!    streamIn_ >> v1 >> v2 >> v3 >> v4 >> v5;
     CPPUT_ASSERT_EQUAL( vEmpty, v1 );
     CPPUT_ASSERT_EQUAL( vUInt, v2 );
--- 135,148 ----
  {
     OpenTest::Value vEmpty;
!    OpenTest::Value vUInt( (unsigned int)323456789 );
     OpenTest::Value vInt( -123456789 );
     OpenTest::Value vDouble( 1.2345678 );
     OpenTest::Value vString( "abcdefghijklmnopqrstuvwxyz" );
!    streamOut_ << vEmpty << vUInt << vInt << vDouble;
!    streamOut_ << vString;
     prepareUnserialize();
     OpenTest::Value v1, v2, v3, v4, v5;
!    streamIn_ >> v1 >> v2 >> v3 >> v4;
!    streamIn_ >> v5;
     CPPUT_ASSERT_EQUAL( vEmpty, v1 );
     CPPUT_ASSERT_EQUAL( vUInt, v2 );
***************
*** 159,185 ****
  SerializerTest::testBasicProperty()
  {
!    OpenTest::Properties emptyProperties;
!    OpenTest::Properties properties;
     OpenTest::Value vEmpty;
!    OpenTest::Value vUInt( 323456789 );
     OpenTest::Value vInt( -123456789 );
     OpenTest::Value vDouble( 1.2345678 );
     OpenTest::Value vString( "abcdefghijklmnopqrstuvwxyz" );
!    properties.append( vEmpty );
!    properties.append( vUInt );
!    properties.append( vInt );
!    properties.append( vDouble );
!    properties.append( vString );
!    properties["v1"] = vEmpty;
!    properties["v2"] = vUInt;
!    properties["v3"] = vInt;
!    properties["v4"] = vDouble;
!    properties["v5"] = vString;
  
!    streamOut_ << emptyProperties << properties;
     prepareUnserialize();
!    OpenTest::Properties p1, p2;
!    streamIn_ >> p1 >> p2;
!    CPPUT_ASSERT_EQUAL( emptyProperties, p1 );
!    CPPUT_ASSERT_EQUAL( properties, p2 );
  }
--- 156,184 ----
  SerializerTest::testBasicProperty()
  {
!    OpenTest::Properties emptyValue;
!    OpenTest::Properties arrayValue;
!    OpenTest::Properties objectValue;
     OpenTest::Value vEmpty;
!    OpenTest::Value vUInt( (unsigned int)323456789 );
     OpenTest::Value vInt( -123456789 );
     OpenTest::Value vDouble( 1.2345678 );
     OpenTest::Value vString( "abcdefghijklmnopqrstuvwxyz" );
!    arrayValue.append( vEmpty );
!    arrayValue.append( vUInt );
!    arrayValue.append( vInt );
!    arrayValue.append( vDouble );
!    arrayValue.append( vString );
!    objectValue["v1"] = vEmpty;
!    objectValue["v2"] = vUInt;
!    objectValue["v3"] = vInt;
!    objectValue["v4"] = vDouble;
!    objectValue["v5"] = vString;
  
!    streamOut_ << emptyValue << arrayValue << objectValue;
     prepareUnserialize();
!    OpenTest::Properties p1, p2, p3;
!    streamIn_ >> p1 >> p2 >> p3;
!    CPPUT_ASSERT_EQUAL( emptyValue, p1 );
!    CPPUT_ASSERT_EQUAL( arrayValue, p2 );
!    CPPUT_ASSERT_EQUAL( objectValue, p3 );
  }

Index: remoteinterfacestest.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/opentesttest/remoteinterfacestest.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** remoteinterfacestest.cpp	6 Sep 2005 07:43:48 -0000	1.1
--- remoteinterfacestest.cpp	7 Nov 2005 22:43:08 -0000	1.2
***************
*** 8,19 ****
  namespace CppUT {
  // converter for assert equal
- inline std::string toString( const OpenTest::Properties &value )
- {
-    return value.toString().c_str();
- }
- 
  inline std::string toString( const OpenTest::Value &value )
  {
!    return value.toString().c_str();
  }
  
--- 8,14 ----
  namespace CppUT {
  // converter for assert equal
  inline std::string toString( const OpenTest::Value &value )
  {
!    return value.toStyledString().c_str();
  }