1 files changed, 14 insertions, 14 deletions

diff --git a/test/BtRequestMessageTest.cc b/test/BtRequestMessageTest.cc
index 42a1f89b..3331a099 100644
--- a/test/BtRequestMessageTest.cc
+++ b/test/BtRequestMessageTest.cc
@@ -53,11 +53,11 @@ public:
   class MockBtMessage2 : public MockBtMessage {
   public:
     string type;
-    uint32_t index;
-    uint32_t begin;
+    int32_t index;
+    int32_t begin;
     uint32_t length;
   public:
-    MockBtMessage2(string type, uint32_t index, uint32_t begin, uint32_t length):type(type), index(index), begin(begin), length(length) {}
+    MockBtMessage2(string type, int32_t index, int32_t begin, uint32_t length):type(type), index(index), begin(begin), length(length) {}
   };
 
   typedef SharedHandle<MockBtMessage2> MockBtMessage2Handle;
@@ -65,13 +65,13 @@ public:
   class MockBtMessageFactory2 : public MockBtMessageFactory {
   public:
     virtual BtMessageHandle
-    createPieceMessage(uint32_t index, uint32_t begin, uint32_t length) {
+    createPieceMessage(int32_t index, int32_t begin, uint32_t length) {
       MockBtMessage2Handle btMsg = new MockBtMessage2("piece", index, begin, length);
       return btMsg;
     }
 
     virtual BtMessageHandle
-    createRejectMessage(uint32_t index, uint32_t begin, uint32_t length) {
+    createRejectMessage(int32_t index, int32_t begin, uint32_t length) {
       MockBtMessage2Handle btMsg = new MockBtMessage2("reject", index, begin, length);
       return btMsg;
     }
@@ -129,9 +129,9 @@ void BtRequestMessageTest::testCreate() {
   PeerMessageUtil::setIntParam(&msg[9], 256);
   PeerMessageUtil::setIntParam(&msg[13], 1024);
   BtRequestMessageHandle pm = BtRequestMessage::create(&msg[4], 13);
-  CPPUNIT_ASSERT_EQUAL(6, pm->getId());
-  CPPUNIT_ASSERT_EQUAL((uint32_t)12345, pm->getIndex());
-  CPPUNIT_ASSERT_EQUAL((uint32_t)256, pm->getBegin());
+  CPPUNIT_ASSERT_EQUAL((uint8_t)6, pm->getId());
+  CPPUNIT_ASSERT_EQUAL(12345, pm->getIndex());
+  CPPUNIT_ASSERT_EQUAL(256, pm->getBegin());
   CPPUNIT_ASSERT_EQUAL((uint32_t)1024, pm->getLength());
 
   // case: payload size is wrong
@@ -172,8 +172,8 @@ void BtRequestMessageTest::testDoReceivedAction_hasPieceAndAmNotChoking() {
   CPPUNIT_ASSERT_EQUAL((size_t)1, dispatcher->messageQueue.size());
   MockBtMessage2* pieceMsg = (MockBtMessage2*)dispatcher->messageQueue.front().get();
   CPPUNIT_ASSERT_EQUAL(string("piece"), pieceMsg->type);
-  CPPUNIT_ASSERT_EQUAL((uint32_t)1, pieceMsg->index);
-  CPPUNIT_ASSERT_EQUAL((uint32_t)16, pieceMsg->begin);
+  CPPUNIT_ASSERT_EQUAL(1, pieceMsg->index);
+  CPPUNIT_ASSERT_EQUAL(16, pieceMsg->begin);
   CPPUNIT_ASSERT_EQUAL((uint32_t)32, pieceMsg->length);
 }
 
@@ -185,8 +185,8 @@ void BtRequestMessageTest::testDoReceivedAction_hasPieceAndAmChokingAndFastExten
   CPPUNIT_ASSERT_EQUAL((size_t)1, dispatcher->messageQueue.size());
   MockBtMessage2* pieceMsg = (MockBtMessage2*)dispatcher->messageQueue.front().get();
   CPPUNIT_ASSERT_EQUAL(string("reject"), pieceMsg->type);
-  CPPUNIT_ASSERT_EQUAL((uint32_t)1, pieceMsg->index);
-  CPPUNIT_ASSERT_EQUAL((uint32_t)16, pieceMsg->begin);
+  CPPUNIT_ASSERT_EQUAL(1, pieceMsg->index);
+  CPPUNIT_ASSERT_EQUAL(16, pieceMsg->begin);
   CPPUNIT_ASSERT_EQUAL((uint32_t)32, pieceMsg->length);
 }
 
@@ -206,8 +206,8 @@ void BtRequestMessageTest::testDoReceivedAction_doesntHavePieceAndFastExtensionE
   CPPUNIT_ASSERT_EQUAL((size_t)1, dispatcher->messageQueue.size());
   MockBtMessage2* pieceMsg = (MockBtMessage2*)dispatcher->messageQueue.front().get();
   CPPUNIT_ASSERT_EQUAL(string("reject"), pieceMsg->type);
-  CPPUNIT_ASSERT_EQUAL((uint32_t)2, pieceMsg->index);
-  CPPUNIT_ASSERT_EQUAL((uint32_t)16, pieceMsg->begin);
+  CPPUNIT_ASSERT_EQUAL(2, pieceMsg->index);
+  CPPUNIT_ASSERT_EQUAL(16, pieceMsg->begin);
   CPPUNIT_ASSERT_EQUAL((uint32_t)32, pieceMsg->length);
 }