[Cppunit-cvs] cppunit2/src/opentesttest packetstest.cpp,1.6,1.7 packetstest.h,1.1,1.2

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

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

Modified Files:
	packetstest.cpp packetstest.h 
Log Message:
* added unit test for Packets::discardFirstMessage() and fixed bug in Packets.

Index: packetstest.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/opentesttest/packetstest.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** packetstest.h	4 Jul 2005 08:12:34 -0000	1.1
--- packetstest.h	10 Mar 2006 21:28:38 -0000	1.2
***************
*** 11,14 ****
--- 11,15 ----
     CPPUT_TEST( testDefaultConstructor );
     CPPUT_TEST( testSerializeMessage );
+    CPPUT_TEST( testDiscardFirstMessage );
     CPPUT_TESTSUITE_END();
  
***************
*** 23,26 ****
--- 24,28 ----
     void testDefaultConstructor();
     void testSerializeMessage();
+    void testDiscardFirstMessage();
  
  private:

Index: packetstest.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/opentesttest/packetstest.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** packetstest.cpp	13 Nov 2005 10:12:01 -0000	1.6
--- packetstest.cpp	10 Mar 2006 21:28:38 -0000	1.7
***************
*** 100,101 ****
--- 100,156 ----
     }
  }
+ 
+ 
+ void 
+ PacketsTest::testDiscardFirstMessage()
+ {
+    // Notes: could have use a loop but loop unrolling makes thing easier for debugging.
+    static const char *testData = "12345";
+    const int testDataLength1 = 3;
+    const int testDataLength2 = 4;
+    const int testDataLength3 = 5;
+    packets_->beginWriteMessage();
+    packets_->write( testData, testDataLength1 );
+    packets_->endWriteMessage();
+ 
+    packets_->beginWriteMessage();
+    packets_->write( testData, testDataLength2 );
+    packets_->endWriteMessage();
+ 
+    packets_->beginWriteMessage();
+    packets_->write( testData, testDataLength3 );
+    packets_->endWriteMessage();
+ 
+    char buffer1[testDataLength1+1];
+    buffer1[testDataLength1] = 0;
+    CppUT::log( "Reading message 123" );
+    CPPUT_ASSERT_EXPR( packets_->hasPendingMessage() );
+    CPPUT_ASSERT_EQUAL( testDataLength1, packets_->getFirstMessageLength() );
+    CPPUT_ASSERT_EQUAL( testDataLength1,
+                        packets_->read( buffer1, testDataLength1 ) );
+    CPPUT_ASSERT_EQUAL( BinaryData( testData, testDataLength1 ),
+                        BinaryData( buffer1, testDataLength1 ) );
+    packets_->discardFirstMessage();
+ 
+    char buffer2[testDataLength2+1];
+    buffer2[testDataLength2] = 0;
+    CppUT::log( "Reading message 1234" );
+    CPPUT_ASSERT_EXPR( packets_->hasPendingMessage() );
+    CPPUT_ASSERT_EQUAL( testDataLength2, packets_->getFirstMessageLength() );
+    CPPUT_ASSERT_EQUAL( testDataLength2,
+                        packets_->read( buffer2, testDataLength2 ) );
+    CPPUT_ASSERT_EQUAL( BinaryData( testData, testDataLength2 ),
+                        BinaryData( buffer2, testDataLength2 ) );
+    packets_->discardFirstMessage();
+ 
+    char buffer3[testDataLength3+1];
+    buffer3[testDataLength3] = 0;
+    CppUT::log( "Reading message 123" );
+    CPPUT_ASSERT_EXPR( packets_->hasPendingMessage() );
+    CPPUT_ASSERT_EQUAL( testDataLength3, packets_->getFirstMessageLength() );
+    CPPUT_ASSERT_EQUAL( testDataLength3,
+                        packets_->read( buffer3, testDataLength3 ) );
+    CPPUT_ASSERT_EQUAL( BinaryData( testData, testDataLength3 ),
+                        BinaryData( buffer3, testDataLength3 ) );
+    packets_->discardFirstMessage();
+ }