[Cppunit-cvs] cppunit2/src/opentesttest mockhelper.h,1.2,1.3

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

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

Modified Files:
	mockhelper.h 
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: mockhelper.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/opentesttest/mockhelper.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mockhelper.h	7 Nov 2005 22:43:08 -0000	1.2
--- mockhelper.h	8 Nov 2005 20:25:50 -0000	1.3
***************
*** 2,6 ****
  # define OPENTTEST_MOCKHELPER_H_INCLUDED
  
! # include <opentest/properties.h>
  # include <cpput/assertenum.h>
  
--- 2,6 ----
  # define OPENTTEST_MOCKHELPER_H_INCLUDED
  
! # include <json/value.h>
  # include <cpput/assertenum.h>
  
***************
*** 32,43 ****
     void verify( const CppUT::Message &message = CppUT::Message( "Actual events do not match expected events." ) );
  
!    void logEvent( const OpenTest::Value &value );
  
!    const OpenTest::Value &expectedEvents() const;
!    const OpenTest::Value &actualEvents() const;
  
  private:
!    OpenTest::Value expectations_;
!    OpenTest::Value actuals_;
     bool recordExpectations_;
  };
--- 32,43 ----
     void verify( const CppUT::Message &message = CppUT::Message( "Actual events do not match expected events." ) );
  
!    void logEvent( const Json::Value &value );
  
!    const Json::Value &expectedEvents() const;
!    const Json::Value &actualEvents() const;
  
  private:
!    Json::Value expectations_;
!    Json::Value actuals_;
     bool recordExpectations_;
  };
***************
*** 65,70 ****
  MockHelper::MockHelper()
     : recordExpectations_( true )
!    , expectations_( OpenTest::Properties() )
!    , actuals_( OpenTest::Properties() )
  {
  }
--- 65,70 ----
  MockHelper::MockHelper()
     : recordExpectations_( true )
!    , expectations_( Json::Value() )
!    , actuals_( Json::Value() )
  {
  }
***************
*** 74,79 ****
  MockHelper::clearEvents()
  {
!    expectations_ = OpenTest::Value();
!    actuals_ = OpenTest::Value();
  }
  
--- 74,79 ----
  MockHelper::clearEvents()
  {
!    expectations_ = Json::Value();
!    actuals_ = Json::Value();
  }
  
***************
*** 101,107 ****
  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(),
--- 101,107 ----
  MockHelper::verify( const CppUT::Message &message )
  {
!    CppUT::RefComparator<const Json::Value &,
!                         const Json::Value &> comparator;
!    CppUT::RefStringizer<const Json::Value &> stringizer;
     CppUT::checkCustomHeterogeneousSequenceEqual( expectations_.enumValues(), 
                                                   actuals_.enumValues(),
***************
*** 115,119 ****
  
  inline void 
! MockHelper::logEvent( const OpenTest::Value &value )
  {
     if ( recordExpectations_ )
--- 115,119 ----
  
  inline void 
! MockHelper::logEvent( const Json::Value &value )
  {
     if ( recordExpectations_ )
***************
*** 124,128 ****
  
  
! inline const OpenTest::Value &
  MockHelper::expectedEvents() const
  {
--- 124,128 ----
  
  
! inline const Json::Value &
  MockHelper::expectedEvents() const
  {
***************
*** 131,135 ****
  
  
! inline const OpenTest::Value &
  MockHelper::actualEvents() const
  {
--- 131,135 ----
  
  
! inline const Json::Value &
  MockHelper::actualEvents() const
  {