2008-03-09 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	type cleanup for allmost all remaining files.

1 files changed, 17 insertions, 17 deletions

diff --git a/test/BtPieceMessageTest.cc b/test/BtPieceMessageTest.cc
index 19cc95f7..219cf67b 100644
--- a/test/BtPieceMessageTest.cc
+++ b/test/BtPieceMessageTest.cc
@@ -56,20 +56,20 @@ public:
 
   class MockBtMessage2 : public MockBtMessage {
   public:
-    int32_t index;
-    int32_t begin;
-    int32_t length;
+    size_t index;
+    uint32_t begin;
+    size_t length;
   public:
-    MockBtMessage2(int32_t index, int32_t begin, int32_t length):index(index), begin(begin), length(length) {}
+    MockBtMessage2(size_t index, uint32_t begin, size_t length):index(index), begin(begin), length(length) {}
 
   };
 
   class MockBtMessageFactory2 : public MockBtMessageFactory {
   public:
     virtual SharedHandle<BtMessage>
-    createRejectMessage(int32_t index,
-			int32_t begin,
-			int32_t length) {
+    createRejectMessage(size_t index,
+			uint32_t begin,
+			size_t length) {
       SharedHandle<MockBtMessage2> msg = new MockBtMessage2(index, begin, length);
       return msg;
     }
@@ -120,11 +120,11 @@ void BtPieceMessageTest::testCreate() {
   PeerMessageUtil::setIntParam(&msg[9], 256);
   memcpy(&msg[13], data, sizeof(data));
   SharedHandle<BtPieceMessage> pm = BtPieceMessage::create(&msg[4], 11);
-  CPPUNIT_ASSERT_EQUAL((int8_t)7, pm->getId());
-  CPPUNIT_ASSERT_EQUAL((int32_t)12345, pm->getIndex());
-  CPPUNIT_ASSERT_EQUAL((int32_t)256, pm->getBegin());
+  CPPUNIT_ASSERT_EQUAL((uint8_t)7, pm->getId());
+  CPPUNIT_ASSERT_EQUAL((size_t)12345, pm->getIndex());
+  CPPUNIT_ASSERT_EQUAL((uint32_t)256, pm->getBegin());
   CPPUNIT_ASSERT(memcmp(data, pm->getBlock(), sizeof(data)) == 0);
-  CPPUNIT_ASSERT_EQUAL((int32_t)2, pm->getBlockLength());
+  CPPUNIT_ASSERT_EQUAL((size_t)2, pm->getBlockLength());
 
   // case: payload size is wrong
   try {
@@ -181,9 +181,9 @@ void BtPieceMessageTest::testChokingEvent_allowedFastEnabled() {
   CPPUNIT_ASSERT(msg->isInvalidate());  
   CPPUNIT_ASSERT_EQUAL((size_t)1, btMessageDispatcher->messageQueue.size());
   MockBtMessage2* rej = (MockBtMessage2*)btMessageDispatcher->messageQueue.front().get();
-  CPPUNIT_ASSERT_EQUAL((int32_t)1, rej->index);
-  CPPUNIT_ASSERT_EQUAL((int32_t)1024, rej->begin);
-  CPPUNIT_ASSERT_EQUAL((int32_t)16*1024, rej->length);
+  CPPUNIT_ASSERT_EQUAL((size_t)1, rej->index);
+  CPPUNIT_ASSERT_EQUAL((uint32_t)1024, rej->begin);
+  CPPUNIT_ASSERT_EQUAL((size_t)16*1024, rej->length);
 }
 
 void BtPieceMessageTest::testChokingEvent_inAmAllowedIndexSet() {
@@ -266,9 +266,9 @@ void BtPieceMessageTest::testCancelSendingPieceEvent_allowedFastEnabled() {
   CPPUNIT_ASSERT(msg->isInvalidate());
   CPPUNIT_ASSERT_EQUAL((size_t)1, btMessageDispatcher->messageQueue.size());
   MockBtMessage2* rej = (MockBtMessage2*)btMessageDispatcher->messageQueue.front().get();
-  CPPUNIT_ASSERT_EQUAL((int32_t)1, rej->index);
-  CPPUNIT_ASSERT_EQUAL((int32_t)1024, rej->begin);
-  CPPUNIT_ASSERT_EQUAL((int32_t)16*1024, rej->length);
+  CPPUNIT_ASSERT_EQUAL((size_t)1, rej->index);
+  CPPUNIT_ASSERT_EQUAL((uint32_t)1024, rej->begin);
+  CPPUNIT_ASSERT_EQUAL((size_t)16*1024, rej->length);
 }
 
 void BtPieceMessageTest::testCancelSendingPieceEvent_invalidate() {