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

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

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

Modified Files:
	mockhelper.h remoteinterfacestest.cpp 
Log Message:
- synchronized with lastest jsoncpp.

Index: mockhelper.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/opentesttest/mockhelper.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mockhelper.h	8 Nov 2005 20:25:50 -0000	1.3
--- mockhelper.h	5 Jun 2006 13:22:58 -0000	1.4
***************
*** 104,113 ****
                          const Json::Value &> comparator;
     CppUT::RefStringizer<const Json::Value &> stringizer;
!    CppUT::checkCustomHeterogeneousSequenceEqual( expectations_.enumValues(), 
!                                                  actuals_.enumValues(),
!                                                  stringizer,
!                                                  stringizer,
!                                                  comparator,
!                                                  message );
     clearEvents();
     recordExpectedEvents();
--- 104,115 ----
                          const Json::Value &> comparator;
     CppUT::RefStringizer<const Json::Value &> stringizer;
!    
!    CppUT::checkCustomHeterogeneousSequenceEqual( 
!       CppTL::Enum::range( expectations_.begin(), expectations_.end(), CppTL::Type<const Json::Value &>() ), 
!       CppTL::Enum::range( actuals_.begin(), actuals_.end(), CppTL::Type<const Json::Value &>() ), 
!       stringizer,
!       stringizer,
!       comparator,
!       message );
     clearEvents();
     recordExpectedEvents();

Index: remoteinterfacestest.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/opentesttest/remoteinterfacestest.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** remoteinterfacestest.cpp	11 Dec 2005 17:16:09 -0000	1.4
--- remoteinterfacestest.cpp	5 Jun 2006 13:22:58 -0000	1.5
***************
*** 40,44 ****
     virtual void runTests( const OpenTest::TestPlans &plan )
     {
!       logEvent( OpenTest::String("runTests( " + CppTL::toString( plan.testPlans_.size() ) + ")") );
     }
  
--- 40,44 ----
     virtual void runTests( const OpenTest::TestPlans &plan )
     {
!       logEvent( OpenTest::String("runTests( " + CppTL::toString( plan.testPlans_.size() ) + ")").c_str() );
     }