[Cppunit-cvs] cppunit2/include/opentest interfaces.h,1.4,1.5 serializer.h,1.8,1.9 properties.h,1.14,NONE

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

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

Modified Files:
	interfaces.h serializer.h 
Removed Files:
	properties.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: serializer.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/opentest/serializer.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** serializer.h	7 Nov 2005 22:43:07 -0000	1.8
--- serializer.h	8 Nov 2005 20:25:49 -0000	1.9
***************
*** 3,7 ****
  
  # include <opentest/forwards.h>
! # include <opentest/properties.h>
  # include <map>
  # include <deque>
--- 3,8 ----
  
  # include <opentest/forwards.h>
! # include <json/value.h>
! # include <cpptl/conststring.h>
  # include <map>
  # include <deque>
***************
*** 193,197 ****
     Stream &operator <<( double value );
     Stream &operator <<( const String &str );
!    Stream &operator <<( const Properties &properties );
  
     Stream &operator >>( bool &value );
--- 194,198 ----
     Stream &operator <<( double value );
     Stream &operator <<( const String &str );
!    Stream &operator <<( const Json::Value &properties );
  
     Stream &operator >>( bool &value );
***************
*** 204,208 ****
     Stream &operator >>( double &value );
     Stream &operator >>( String &str );
!    Stream &operator >>( Properties &properties );
  
     bool inError() const;
--- 205,209 ----
     Stream &operator >>( double &value );
     Stream &operator >>( String &str );
!    Stream &operator >>( Json::Value &properties );
  
     bool inError() const;

--- properties.h DELETED ---

Index: interfaces.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/opentest/interfaces.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** interfaces.h	7 Nov 2005 22:43:07 -0000	1.4
--- interfaces.h	8 Nov 2005 20:25:49 -0000	1.5
***************
*** 3,7 ****
  
  # include <opentest/forwards.h>
! # include <opentest/properties.h>
  # include <map>
  # include <deque>
--- 3,8 ----
  
  # include <opentest/forwards.h>
! # include <json/value.h>
! # include <cpptl/conststring.h>
  # include <map>
  # include <deque>
***************
*** 60,64 ****
     String name_;
     String description_;
!    Properties descriptionSpecific_;
  
     Stream &serialize( Stream &stream ) const;
--- 61,65 ----
     String name_;
     String description_;
!    Json::Value descriptionSpecific_;
  
     Stream &serialize( Stream &stream ) const;
***************
*** 71,77 ****
  public:
     String inputFormatName_;
!    Properties inputFormat_;
     String outputFormatName_;
!    Properties outputFormat_;
  
     Stream &serialize( Stream &stream ) const;
--- 72,78 ----
  public:
     String inputFormatName_;
!    Json::Value inputFormat_;
     String outputFormatName_;
!    Json::Value outputFormat_;
  
     Stream &serialize( Stream &stream ) const;
***************
*** 105,110 ****
  public:
     TestId testCase_;
!    Properties input_;
!    Properties expectedOutput_;
  
     Stream &serialize( Stream &stream ) const;
--- 106,111 ----
  public:
     TestId testCase_;
!    Json::Value input_;
!    Json::Value expectedOutput_;
  
     Stream &serialize( Stream &stream ) const;
***************
*** 127,131 ****
  public:
     String log_;
!    Properties logSpecific_;
  
     Stream &serialize( Stream &stream ) const;
--- 128,132 ----
  public:
     String log_;
!    Json::Value logSpecific_;
  
     Stream &serialize( Stream &stream ) const;
***************
*** 139,144 ****
     String assertionFormat_;
     String message_;
!    Properties expectedSpecific_;
!    Properties actualSpecific_;
  
     Stream &serialize( Stream &stream ) const;
--- 140,145 ----
     String assertionFormat_;
     String message_;
!    Json::Value expectedSpecific_;
!    Json::Value actualSpecific_;
  
     Stream &serialize( Stream &stream ) const;
***************
*** 151,157 ****
     String inputFormat_;
     String outputFormat_;
!    Properties input_;
!    Properties expected_;
!    Properties actual_;
  
     Stream &serialize( Stream &stream ) const;
--- 152,158 ----
     String inputFormat_;
     String outputFormat_;
!    Json::Value input_;
!    Json::Value expected_;
!    Json::Value actual_;
  
     Stream &serialize( Stream &stream ) const;
***************
*** 164,169 ****
     String status_;
     String subStatus_;
!    Properties statusSpecific_;
!    Properties statistics_;
  
     Stream &serialize( Stream &stream ) const;
--- 165,170 ----
     String status_;
     String subStatus_;
!    Json::Value statusSpecific_;
!    Json::Value statistics_;
  
     Stream &serialize( Stream &stream ) const;