[Cppunit-cvs] cppunit2/src/opentest interfaces.cpp,1.2,1.3 remoteinterfaces.cpp,1.3,1.4

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

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

Modified Files:
	interfaces.cpp remoteinterfaces.cpp 
Log Message:
* rough sketch of a working OpenTest driver with CppUT adaptor for TestRunner.


Index: remoteinterfaces.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/opentest/remoteinterfaces.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** remoteinterfaces.cpp	6 Sep 2005 07:31:42 -0000	1.3
--- remoteinterfaces.cpp	11 Dec 2005 17:16:09 -0000	1.4
***************
*** 307,318 ****
  
  void  
! TestDriverProxy::setDefaultTestPlan( const TestPlan &plan )
  {
     sendMessage( makeSimpleRemoteMessage( driverMessageSetDefaultTestPlan,
!                                          plan ) );
  }
  
  void  
! TestDriverProxy::startTesting( TestId testPlan )
  {
     sendMessage( makeSimpleRemoteMessage( driverMessageStartTesting,
--- 307,318 ----
  
  void  
! TestDriverProxy::setDefaultTestPlan( const TestPlans &plans )
  {
     sendMessage( makeSimpleRemoteMessage( driverMessageSetDefaultTestPlan,
!                                          plans ) );
  }
  
  void  
! TestDriverProxy::startTesting( TestPlanId testPlan )
  {
     sendMessage( makeSimpleRemoteMessage( driverMessageStartTesting,
***************
*** 322,326 ****
  
  void  
! TestDriverProxy::addResultLog( TestId testPlan, 
                                 const ResultLog &log )
  {
--- 322,326 ----
  
  void  
! TestDriverProxy::addResultLog( TestPlanId testPlan, 
                                 const ResultLog &log )
  {
***************
*** 331,335 ****
  
  void  
! TestDriverProxy::addResultAssertion( TestId testPlan, 
                                       const ResultAssertion &assertion )
  {
--- 331,335 ----
  
  void  
! TestDriverProxy::addResultAssertion( TestPlanId testPlan, 
                                       const ResultAssertion &assertion )
  {
***************
*** 340,344 ****
  
  void  
! TestDriverProxy::setResultInputActualOutput( TestId testPlan, 
                                               const ResultInputOutput &output )
  {
--- 340,344 ----
  
  void  
! TestDriverProxy::setResultInputActualOutput( TestPlanId testPlan, 
                                               const ResultInputOutput &output )
  {
***************
*** 349,353 ****
  
  void  
! TestDriverProxy::setTestResult( TestId testPlan, 
                                  const ResultStatus &status )
  {
--- 349,353 ----
  
  void  
! TestDriverProxy::setTestResult( TestPlanId testPlan, 
                                  const ResultStatus &status )
  {
***************
*** 380,384 ****
        break;
     case driverMessageSetDefaultTestPlan:
!       dispatchSimpleRemoteCall( message, impl_, &TestDriverInterface::setDefaultTestPlan );
        break;
     case driverMessageStartTesting:
--- 380,384 ----
        break;
     case driverMessageSetDefaultTestPlan:
!       dispatchSimpleRemoteCall( message, impl_, &TestDriverInterface::setDefaultTestPlans );
        break;
     case driverMessageStartTesting:

Index: interfaces.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/opentest/interfaces.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** interfaces.cpp	14 Nov 2005 21:28:09 -0000	1.2
--- interfaces.cpp	11 Dec 2005 17:16:09 -0000	1.3
***************
*** 8,13 ****
  TestDescriptionCommon::serialize( Stream &stream ) const
  {
!    return stream << id_ 
!                  << name_
                   << description_
                   << descriptionSpecific_;
--- 8,12 ----
  TestDescriptionCommon::serialize( Stream &stream ) const
  {
!    return stream << name_
                   << description_
                   << descriptionSpecific_;
***************
*** 18,23 ****
  TestDescriptionCommon::unserialize( Stream &stream )
  {
!    return stream >> id_ 
!                  >> name_
                   >> description_
                   >> descriptionSpecific_;
--- 17,21 ----
  TestDescriptionCommon::unserialize( Stream &stream )
  {
!    return stream >> name_
                   >> description_
                   >> descriptionSpecific_;
***************
*** 65,70 ****
  TestDescriptions::serialize( Stream &stream ) const
  {
!    serializeSTLSequence( stream, testCases_ );
!    return serializeSTLSequence( stream, testSuites_ );
  }
  
--- 63,68 ----
  TestDescriptions::serialize( Stream &stream ) const
  {
!    serializeSTLMap( stream, testCases_ );
!    return serializeSTLMap( stream, testSuites_ );
  }
  
***************
*** 72,77 ****
  TestDescriptions::unserialize( Stream &stream )
  {
!    unserializeSTLSequence( stream, testCases_ );
!    return unserializeSTLSequence( stream, testSuites_ );
  }
  
--- 70,76 ----
  TestDescriptions::unserialize( Stream &stream )
  {
!    TestId key;
!    unserializeSTLMap( stream, testCases_, key );
!    return unserializeSTLMap( stream, testSuites_, key );
  }