cppunit-cvs

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

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

Modified Files:
	lighttestrunner.h message.h test.h testinfo.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: testinfo.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpput/testinfo.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** testinfo.h	11 Aug 2005 07:18:24 -0000	1.14
--- testinfo.h	8 Nov 2005 20:25:49 -0000	1.15
***************
*** 5,9 ****
  # include <cpput/message.h>
  # include <cpptl/intrusiveptr.h>
! # include <opentest/properties.h>
  
  /// @todo find a away to integrate context with multiple thread.
--- 5,9 ----
  # include <cpput/message.h>
  # include <cpptl/intrusiveptr.h>
! # include <json/value.h>
  
  /// @todo find a away to integrate context with multiple thread.
***************
*** 74,81 ****
  
        void setTestData( const CppTL::ConstString &name,
!                         const OpenTest::Value &value,
                          const CppTL::ConstString &type = "basic" );
  
!       const OpenTest::Properties &testData() const;
  
        CppTL::ConstString toString() const;
--- 74,81 ----
  
        void setTestData( const CppTL::ConstString &name,
!                         const Json::Value &value,
                          const CppTL::ConstString &type = "basic" );
  
!       const Json::Value &testData() const;
  
        CppTL::ConstString toString() const;
***************
*** 83,87 ****
     private:
        Message messages_;
!       OpenTest::Properties testData_;
        CppTL::ConstString testDataType_;
        SourceLocation location_;
--- 83,87 ----
     private:
        Message messages_;
!       Json::Value testData_;
        CppTL::ConstString testDataType_;
        SourceLocation location_;
***************
*** 110,121 ****
  
        void setStatistics( const CppTL::ConstString &name,
!                           const OpenTest::Value &value );
!       //OpenTest::Value getStatistics( const CppTL::ConstString &name );
  
        void addSpecific( const CppTL::ConstString &type,
!                         const OpenTest::Value &value );
     private:
!       OpenTest::Properties statistics_;
!       OpenTest::Properties specifics_;
        Status status_;
     };
--- 110,121 ----
  
        void setStatistics( const CppTL::ConstString &name,
!                           const Json::Value &value );
!       //Json::Value getStatistics( const CppTL::ConstString &name );
  
        void addSpecific( const CppTL::ConstString &type,
!                         const Json::Value &value );
     private:
!       Json::Value statistics_;
!       Json::Value specifics_;
        Status status_;
     };
***************
*** 130,134 ****
        }
  
!       virtual void addResultLog( const OpenTest::Value &log ) = 0;
  
        virtual void addResultAssertion( const Assertion &assertion ) = 0;
--- 130,134 ----
        }
  
!       virtual void addResultLog( const Json::Value &log ) = 0;
  
        virtual void addResultAssertion( const Assertion &assertion ) = 0;
***************
*** 185,189 ****
        void setAbortingAssertionMode( AbortingAssertionMode mode );
  
!       void log( const OpenTest::Value &log );
  
     private:
--- 185,189 ----
        void setAbortingAssertionMode( AbortingAssertionMode mode );
  
!       void log( const Json::Value &log );
  
     private:
***************
*** 211,215 ****
     void CPPUT_API realizeAssertion();
  
!    void CPPUT_API log( const OpenTest::Value &log );
  
     // This overload allows usage of StringConcatenator...
--- 211,215 ----
     void CPPUT_API realizeAssertion();
  
!    void CPPUT_API log( const Json::Value &log );
  
     // This overload allows usage of StringConcatenator...

Index: test.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpput/test.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** test.h	7 Nov 2005 22:43:07 -0000	1.8
--- test.h	8 Nov 2005 20:25:49 -0000	1.9
***************
*** 3,7 ****
  
  # include <cpput/forwards.h>
! # include <opentest/properties.h>
  # include <cpptl/intrusiveptr.h>
  # include <string>
--- 3,8 ----
  
  # include <cpput/forwards.h>
! # include <json/value.h>
! # include <cpptl/conststring.h>
  # include <cpptl/intrusiveptr.h>
  # include <string>
***************
*** 62,66 ****
     /// @warning You must never change the name of the test after
     /// registering the test or scheduling it for running.
!    //OpenTest::Properties &info()
     //{
     //   return info_;
--- 63,67 ----
     /// @warning You must never change the name of the test after
     /// registering the test or scheduling it for running.
!    //Json::Value &info()
     //{
     //   return info_;
***************
*** 90,94 ****
  
  private:
!    OpenTest::Properties info_;
  };
  
--- 91,95 ----
  
  private:
!    Json::Value info_;
  };
  

Index: message.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpput/message.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** message.h	8 Aug 2005 22:10:20 -0000	1.9
--- message.h	8 Nov 2005 20:25:49 -0000	1.10
***************
*** 4,8 ****
  # include <cpput/config.h>
  # include <cpptl/conststring.h>
! # include <opentest/properties.h>
  # include <vector>
  
--- 4,8 ----
  # include <cpput/config.h>
  # include <cpptl/conststring.h>
! //# include <opentest/properties.h>
  # include <vector>
  
***************
*** 104,108 ****
        return message;
     }
! 
     OpenTest::Properties asProperties() const
     {
--- 104,108 ----
        return message;
     }
! /*
     OpenTest::Properties asProperties() const
     {
***************
*** 112,116 ****
        return messages;
     }
! 
  private:
     typedef std::vector<CppTL::ConstString> Details;
--- 112,116 ----
        return messages;
     }
! */
  private:
     typedef std::vector<CppTL::ConstString> Details;

Index: lighttestrunner.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpput/lighttestrunner.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** lighttestrunner.h	11 Aug 2005 07:18:24 -0000	1.4
--- lighttestrunner.h	8 Nov 2005 20:25:49 -0000	1.5
***************
*** 24,28 ****
  
     private: // overridden from TestResultUpdater
!       virtual void addResultLog( const OpenTest::Value &log );
  
        virtual void addResultAssertion( const Assertion &assertion );
--- 24,28 ----
  
     private: // overridden from TestResultUpdater
!       virtual void addResultLog( const Json::Value &log );
  
        virtual void addResultAssertion( const Assertion &assertion );
***************
*** 34,38 ****
        CppTL::ConstString getTestPath() const;
        void reportFailure( const Assertion &failure );
!       void reportLog( const OpenTest::Value &log );
  
        struct ResultElement
--- 34,38 ----
        CppTL::ConstString getTestPath() const;
        void reportFailure( const Assertion &failure );
!       void reportLog( const Json::Value &log );
  
        struct ResultElement
***************
*** 47,51 ****
        TestPath testPath_;
        CppTL::StringBuffer report_;
!       typedef std::deque<OpenTest::Value> Logs;
        Logs logs_;
        typedef std::deque<Assertion> Assertions;
--- 47,51 ----
        TestPath testPath_;
        CppTL::StringBuffer report_;
!       typedef std::deque<Json::Value> Logs;
        Logs logs_;
        typedef std::deque<Assertion> Assertions;