cppunit-cvs

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

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

Modified Files:
	serializer.cpp sharedmemorytransport.cpp 
Log Message:
* started adding unit tests for opentest
* added serializer unit test squeleton
* fixed some bug in serializer
* added opentesttest project to VS solution.

Index: serializer.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/opentest/serializer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** serializer.cpp	30 Jun 2005 21:49:26 -0000	1.3
--- serializer.cpp	1 Jul 2005 08:19:36 -0000	1.4
***************
*** 95,99 ****
  
  void 
! Packets::endMessage()
  {
     CPPTL_ASSERT_MESSAGE( !messages_.empty()  &&  messages_.back().length_ == 0, 
--- 95,99 ----
  
  void 
! Packets::endExternalMessage()
  {
     CPPTL_ASSERT_MESSAGE( !messages_.empty()  &&  messages_.back().length_ == 0, 
***************
*** 103,106 ****
--- 103,115 ----
  
  
+ void 
+ Packets::endSerializeMessage()
+ {
+    CPPTL_ASSERT_MESSAGE( !messages_.empty()  &&  messages_.back().length_ == 0, 
+                          "No message started." );
+    messages_.back().length_ = distance( messages_.back().position_, serializePos_ );
+ }
+ 
+ 
  bool 
  Packets::hasPendingMessage() const
***************
*** 176,181 ****
  
  void 
! Packets::serializationWrite( unsigned char byte )
  {
  }
  
--- 185,194 ----
  
  void 
! Packets::serializationWrite( Byte byte )
  {
+    if ( serializePos_  &&  serializePos_.currentData_ != serializePos_.packet_->end_ )
+       *serializePos_.currentData_++ = byte;
+    else
+       write( serializePos_, &byte, 1 );
  }
  
***************
*** 388,392 ****
                              LargestUnsignedInt value )
  {
!    unsigned char buffer[ (sizeof(value) + ccIntegerBaseShift - 1) / ccIntegerBaseShift ];
     unsigned char *current = buffer + sizeof(buffer);
     do
--- 401,405 ----
                              LargestUnsignedInt value )
  {
!    unsigned char buffer[ (sizeof(value)*8 + ccIntegerBaseShift - 1) / ccIntegerBaseShift ];
     unsigned char *current = buffer + sizeof(buffer);
     do
***************
*** 477,481 ****
     value = 0;
     unsigned char digit;
!    while ( (digit = readNextByte()) < ccIntegerZero )
     {
        // if ( value >= maxInt )   // should we detect overflow ?
--- 490,494 ----
     value = 0;
     unsigned char digit;
!    while ( (digit = readNextByte()) >= ccIntegerZero )
     {
        // if ( value >= maxInt )   // should we detect overflow ?
***************
*** 504,508 ****
  }
  
! #ifdef CPPTL_NO_INT64
  Stream &
  Stream::operator >>( int &value )
--- 517,521 ----
  }
  
! #ifndef CPPTL_NO_INT64
  Stream &
  Stream::operator >>( int &value )

Index: sharedmemorytransport.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/opentest/sharedmemorytransport.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sharedmemorytransport.cpp	30 Jun 2005 21:48:09 -0000	1.2
--- sharedmemorytransport.cpp	1 Jul 2005 08:19:36 -0000	1.3
***************
*** 617,621 ****
        buffer.stream_.packets().beginMessage();
        buffer.stream_ << messages.front();
!       buffer.stream_.packets().endMessage();
        messages.pop_front();
     }
--- 617,621 ----
        buffer.stream_.packets().beginMessage();
        buffer.stream_ << messages.front();
!       buffer.stream_.packets().endSerializeMessage();
        messages.pop_front();
     }
***************
*** 676,680 ****
              {
                 log( "read: message completly received" );
!                buffer.stream_.packets().endMessage();
                 buffer.state_ = bsSize;
                 buffer.processedLength_ = 0;
--- 676,680 ----
              {
                 log( "read: message completly received" );
!                buffer.stream_.packets().endExternalMessage();
                 buffer.state_ = bsSize;
                 buffer.processedLength_ = 0;