2007-01-28 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	* src/Xml2MetalinkProcessor.h
	(xpathExists): New function.
	* src/Xml2MetalinkProcessor.cc
	(xpathExists): New function.

	Not to send HEAD request if filename and size are available in 
Metalink
	file:
	* src/UrlRequestInfo.h
	(filename): New variable.
	(totalLength): New variable.
	(setTotalLength): New function.
	(setFilename): New function.
	* src/MetalinkRequestInfo.cc
	(execute): Set filename and size to UrlRequestInfo.
	* src/MetalinkEntry.cc
	(MetalinkEntry): Initialize size with 0.
	* src/UrlRequestInfo.cc
	(execute): Set filename and size to SegmentMan.
	
	Not to download rest of the files after selected files are 
downloaded
	in BitTorrent:
	* src/PieceStorage.h
	(allDownloadFinished): New function.
	* src/DefaultBtAnnounce.cc
	(isCompleteAnnounceReady): Use allDownloadFinished instead of
	downloadFinished.
	(getAnnounceUrl): Use allDownloadFinished instead of 
downloadFinished.
	* src/DefaultPieceStorage.cc
	(completePiece): Use allDownloadFinished instead of 
downloadFinished.
	Commented out the call to finishSelectiveDownloadingMode().
	(downloadFinished): Call isFilteredAllBitSet() instead of
	isAllBitSet().
	(allDownloadFinished): New function.
	* src/DefaultBtInteractive.cc
	(addBitfieldMessageToQueue): Call allDownloadFinished() instead 
of
	downloadFinished().
	(checkHave): Call allDownloadFinished() instead of 
downloadFinished().
	* src/TorrentDownloadEngine.cc
	(onEndOfRun): Call allDownloadFinished() instead of 
downloadFinished().
	* src/BitfieldMan.h
	(isFilteredAllBitSet): New function.
	* src/ShareRatioSeedCriteria.h
	(PieceStorage.h): New include.
	(pieceStorage): New variable.
	(evaluate):
	btContext->getTotalLength() -> 
pieceStorage->getCompletedLength()
	* src/BitfieldMan.cc
	(isFilteredAllBitSet): New function.
	(isAllBitSet): Filter is not took into account.
	
	Rename --force-truncate as --allow-overwrite:
	* src/TorrentRequestInfo.cc
	(execute): PREF_FORCE_TRUNCATE -> PREF_ALLOW_OVERWRITE
	* src/main.cc
	(showUsage): --force-truncate -> --allow-overwrite
	* src/message.h
	(EX_FILE_ALREADY_EXISTS): --force-truncate -> --allow-overwrite
	* src/prefs.h
	(PREF_FORCE_TRUNCATE): Removed.
	(PREF_ALLOW_OVERWRITE): New definition.
	* src/SegmentMan.cc
	(shouldCancelDownloadForSafety): --force-truncate -> 
--allow-overwrite
	
	* src/MetalinkRequestInfo.cc
	(execute): Queueing message are now logged in info level.

	* src/common.h
	(LONG_LONG_MAX): Removed.
	(LONG_LONG_MIN): Removed.
	* src/HttpResponseCommand.cc
	(handleDefaultEncoding): LONG_LONG_MAX -> INT64_MAX
	* src/FtpNegotiateCommand.cc
	(recvSize): LONG_LONG_MAX -> INT64_MAX
	
	* src/main.cc
	(showUsage): Added --check-integiry and 
--realtime-chunk-checksum
	command-line option.
	(main): Added --check-integiry and --realtime-chunk-checksum
	command-line option.
	--force-truncate -> --allow-overwrite
	Set initial value of --check-integrity option to false.
	Don't show usage when error occurs while persing command-line 
options.
	Removed deprecated --upload-limit option.

30 files changed, 120 insertions, 100 deletions

diff --git a/test/BitfieldManTest.cc b/test/BitfieldManTest.cc
index 479ffef3..814175b7 100644
--- a/test/BitfieldManTest.cc
+++ b/test/BitfieldManTest.cc
@@ -42,12 +42,12 @@ CPPUNIT_TEST_SUITE_REGISTRATION( BitfieldManTest );
 
 void BitfieldManTest::testGetBlockSize() {
   BitfieldMan bt1(1024, 1024*10);
-  CPPUNIT_ASSERT_EQUAL((uint32_t)1024, bt1.getBlockLength(9));
+  CPPUNIT_ASSERT_EQUAL(1024, bt1.getBlockLength(9));
 
   BitfieldMan bt2(1024, 1024*10+1);
-  CPPUNIT_ASSERT_EQUAL((uint32_t)1024, bt2.getBlockLength(9));
-  CPPUNIT_ASSERT_EQUAL((uint32_t)1, bt2.getBlockLength(10));
-  CPPUNIT_ASSERT_EQUAL((uint32_t)0, bt2.getBlockLength(11));
+  CPPUNIT_ASSERT_EQUAL(1024, bt2.getBlockLength(9));
+  CPPUNIT_ASSERT_EQUAL(1, bt2.getBlockLength(10));
+  CPPUNIT_ASSERT_EQUAL(0, bt2.getBlockLength(11));
 }
 
 void BitfieldManTest::testGetFirstMissingUnusedIndex() {
@@ -84,7 +84,7 @@ void BitfieldManTest::testIsAllBitSet() {
   }
   CPPUNIT_ASSERT(!bt1.isAllBitSet());
 
-  for(uint32_t i = 0; i < bt1.countBlock(); i++) {
+  for(int32_t i = 0; i < bt1.countBlock(); i++) {
     CPPUNIT_ASSERT(bt1.setBit(i));
   }
   CPPUNIT_ASSERT(bt1.isAllBitSet());
@@ -122,7 +122,7 @@ void BitfieldManTest::testFilter() {
   index = btman.getMissingUnusedIndex(peerBt, sizeof(peerBt));
   btman.setUseBit(index);
   CPPUNIT_ASSERT_EQUAL(-1, index);
-  CPPUNIT_ASSERT_EQUAL((uint64_t)12, btman.getFilteredTotalLength());
+  CPPUNIT_ASSERT_EQUAL((int64_t)12, btman.getFilteredTotalLength());
 
   // test offset=5, length=2
   btman.clearAllBit();
@@ -141,13 +141,13 @@ void BitfieldManTest::testFilter() {
   index = btman.getMissingUnusedIndex(peerBt, sizeof(peerBt));
   btman.setUseBit(index);
   CPPUNIT_ASSERT_EQUAL(-1, index);
-  CPPUNIT_ASSERT_EQUAL((uint64_t)4, btman.getFilteredTotalLength());
-  CPPUNIT_ASSERT(btman.isAllBitSet());
+  CPPUNIT_ASSERT_EQUAL((int64_t)4, btman.getFilteredTotalLength());
+  CPPUNIT_ASSERT(btman.isFilteredAllBitSet());
 
   BitfieldMan btman2(2, 31);
   btman2.addFilter(0, 31);
   btman2.enableFilter();
-  CPPUNIT_ASSERT_EQUAL((uint64_t)31, btman2.getFilteredTotalLength());
+  CPPUNIT_ASSERT_EQUAL((int64_t)31, btman2.getFilteredTotalLength());
 
 }
 
diff --git a/test/BtAllowedFastMessageTest.cc b/test/BtAllowedFastMessageTest.cc
index abf787fd..2ea830c2 100644
--- a/test/BtAllowedFastMessageTest.cc
+++ b/test/BtAllowedFastMessageTest.cc
@@ -35,7 +35,7 @@ void BtAllowedFastMessageTest::testCreate() {
   PeerMessageUtil::createPeerMessageString(msg, sizeof(msg), 5, 17);
   PeerMessageUtil::setIntParam(&msg[5], 12345);
   BtAllowedFastMessageHandle pm = BtAllowedFastMessage::create(&msg[4], 5);
-  CPPUNIT_ASSERT_EQUAL((uint8_t)17, pm->getId());
+  CPPUNIT_ASSERT_EQUAL((int8_t)17, pm->getId());
   CPPUNIT_ASSERT_EQUAL(12345, pm->getIndex());
 
   // case: payload size is wrong
diff --git a/test/BtBitfieldMessageTest.cc b/test/BtBitfieldMessageTest.cc
index 91002702..0e018cd7 100644
--- a/test/BtBitfieldMessageTest.cc
+++ b/test/BtBitfieldMessageTest.cc
@@ -35,9 +35,9 @@ void BtBitfieldMessageTest::testCreate() {
   memset(bitfield, 0xff, sizeof(bitfield));
   memcpy(&msg[5], bitfield, sizeof(bitfield));
   BtBitfieldMessageHandle pm = BtBitfieldMessage::create(&msg[4], 3);
-  CPPUNIT_ASSERT_EQUAL((uint8_t)5, pm->getId());
+  CPPUNIT_ASSERT_EQUAL((int8_t)5, pm->getId());
   CPPUNIT_ASSERT(memcmp(bitfield, pm->getBitfield(), sizeof(bitfield)) == 0);
-  CPPUNIT_ASSERT_EQUAL((uint32_t)2, pm->getBitfieldLength());
+  CPPUNIT_ASSERT_EQUAL(2, pm->getBitfieldLength());
   // case: payload size is wrong
   try {
     unsigned char msg[5];
diff --git a/test/BtCancelMessageTest.cc b/test/BtCancelMessageTest.cc
index 5ecaf984..21acaf96 100644
--- a/test/BtCancelMessageTest.cc
+++ b/test/BtCancelMessageTest.cc
@@ -39,13 +39,13 @@ public:
   public:
     int32_t index;
     int32_t begin;
-    uint32_t length;
+    int32_t length;
   public:
     MockBtMessageDispatcher2():index(0),
 			       begin(0),
 			       length(0) {}
 
-    virtual void doCancelSendingPieceAction(int32_t index, int32_t begin, uint32_t length) {
+    virtual void doCancelSendingPieceAction(int32_t index, int32_t begin, int32_t length) {
       this->index = index;
       this->begin = begin;
       this->length = length;
@@ -65,10 +65,10 @@ void BtCancelMessageTest::testCreate() {
   PeerMessageUtil::setIntParam(&msg[9], 256);
   PeerMessageUtil::setIntParam(&msg[13], 1024);
   BtCancelMessageHandle pm = BtCancelMessage::create(&msg[4], 13);
-  CPPUNIT_ASSERT_EQUAL((uint8_t)8, pm->getId());
+  CPPUNIT_ASSERT_EQUAL((int8_t)8, pm->getId());
   CPPUNIT_ASSERT_EQUAL(12345, pm->getIndex());
   CPPUNIT_ASSERT_EQUAL(256, pm->getBegin());
-  CPPUNIT_ASSERT_EQUAL((uint32_t)1024, pm->getLength());
+  CPPUNIT_ASSERT_EQUAL(1024, pm->getLength());
 
   // case: payload size is wrong
   try {
diff --git a/test/BtChokeMessageTest.cc b/test/BtChokeMessageTest.cc
index bc4df245..4f8d1697 100644
--- a/test/BtChokeMessageTest.cc
+++ b/test/BtChokeMessageTest.cc
@@ -79,7 +79,7 @@ void BtChokeMessageTest::testCreate() {
   unsigned char msg[5];
   PeerMessageUtil::createPeerMessageString(msg, sizeof(msg), 1, 0);
   BtChokeMessageHandle pm = BtChokeMessage::create(&msg[4], 1);
-  CPPUNIT_ASSERT_EQUAL((uint8_t)0, pm->getId());
+  CPPUNIT_ASSERT_EQUAL((int8_t)0, pm->getId());
 
   // case: payload size is wrong
   try {
diff --git a/test/BtHandshakeMessageTest.cc b/test/BtHandshakeMessageTest.cc
index 918542b6..6e4f07ad 100644
--- a/test/BtHandshakeMessageTest.cc
+++ b/test/BtHandshakeMessageTest.cc
@@ -52,8 +52,8 @@ void BtHandshakeMessageTest::testCreate() {
   unsigned char msg[68];
   createHandshakeMessageData(msg);
   BtHandshakeMessageHandle message = BtHandshakeMessage::create(&msg[0], sizeof(msg));
-  CPPUNIT_ASSERT_EQUAL((uint8_t)UINT8_MAX, message->getId());
-  CPPUNIT_ASSERT_EQUAL((uint8_t)19, message->getPstrlen());
+  CPPUNIT_ASSERT_EQUAL((int8_t)INT8_MAX, message->getId());
+  CPPUNIT_ASSERT_EQUAL((int8_t)19, message->getPstrlen());
   CPPUNIT_ASSERT_EQUAL(Util::toHex((const unsigned char*)BTPSTR.c_str(), BTPSTR.size()),
 		       Util::toHex(message->getPstr(), BtHandshakeMessage::PSTR_LENGTH));
   CPPUNIT_ASSERT_EQUAL(string("0000000000000004"),
diff --git a/test/BtHaveAllMessageTest.cc b/test/BtHaveAllMessageTest.cc
index b9cec34b..72a33dc4 100644
--- a/test/BtHaveAllMessageTest.cc
+++ b/test/BtHaveAllMessageTest.cc
@@ -29,7 +29,7 @@ void BtHaveAllMessageTest::testCreate() {
   unsigned char msg[5];
   PeerMessageUtil::createPeerMessageString(msg, sizeof(msg), 1, 14);
   BtHaveAllMessageHandle pm = BtHaveAllMessage::create(&msg[4], 1);
-  CPPUNIT_ASSERT_EQUAL((uint8_t)14, pm->getId());
+  CPPUNIT_ASSERT_EQUAL((int8_t)14, pm->getId());
 
   // case: payload size is wrong
   try {
diff --git a/test/BtHaveMessageTest.cc b/test/BtHaveMessageTest.cc
index 46494b12..548e2fcf 100644
--- a/test/BtHaveMessageTest.cc
+++ b/test/BtHaveMessageTest.cc
@@ -32,7 +32,7 @@ void BtHaveMessageTest::testCreate() {
   PeerMessageUtil::createPeerMessageString(msg, sizeof(msg), 5, 4);
   PeerMessageUtil::setIntParam(&msg[5], 12345);
   BtHaveMessageHandle pm = BtHaveMessage::create(&msg[4], 5);
-  CPPUNIT_ASSERT_EQUAL((uint8_t)4, pm->getId());
+  CPPUNIT_ASSERT_EQUAL((int8_t)4, pm->getId());
   CPPUNIT_ASSERT_EQUAL(12345, pm->getIndex());
 
   // case: payload size is wrong
diff --git a/test/BtHaveNoneMessageTest.cc b/test/BtHaveNoneMessageTest.cc
index c4da9e58..6d03d955 100644
--- a/test/BtHaveNoneMessageTest.cc
+++ b/test/BtHaveNoneMessageTest.cc
@@ -31,7 +31,7 @@ void BtHaveNoneMessageTest::testCreate() {
   unsigned char msg[5];
   PeerMessageUtil::createPeerMessageString(msg, sizeof(msg), 1, 15);
   BtHaveNoneMessageHandle pm = BtHaveNoneMessage::create(&msg[4], 1);
-  CPPUNIT_ASSERT_EQUAL((uint8_t)15, pm->getId());
+  CPPUNIT_ASSERT_EQUAL((int8_t)15, pm->getId());
 
   // case: payload size is wrong
   try {
diff --git a/test/BtInterestedMessageTest.cc b/test/BtInterestedMessageTest.cc
index 8937b906..5f32ed91 100644
--- a/test/BtInterestedMessageTest.cc
+++ b/test/BtInterestedMessageTest.cc
@@ -33,7 +33,7 @@ void BtInterestedMessageTest::testCreate() {
   unsigned char msg[5];
   PeerMessageUtil::createPeerMessageString(msg, sizeof(msg), 1, 2);
   BtInterestedMessageHandle pm = BtInterestedMessage::create(&msg[4], 1);
-  CPPUNIT_ASSERT_EQUAL((uint8_t)2, pm->getId());
+  CPPUNIT_ASSERT_EQUAL((int8_t)2, pm->getId());
 
   // case: payload size is wrong
   try {
diff --git a/test/BtKeepAliveMessageTest.cc b/test/BtKeepAliveMessageTest.cc
index 8f2a5715..b120cf08 100644
--- a/test/BtKeepAliveMessageTest.cc
+++ b/test/BtKeepAliveMessageTest.cc
@@ -25,7 +25,8 @@ void BtKeepAliveMessageTest::testGetMessage() {
   char msg[4];
   memset(msg, 0, sizeof(msg));
   BtKeepAliveMessage message;
-  CPPUNIT_ASSERT_EQUAL((uint32_t)4, message.getMessageLength());
+  CPPUNIT_ASSERT_EQUAL((int8_t)99, message.getId());
+  CPPUNIT_ASSERT_EQUAL(4, message.getMessageLength());
   CPPUNIT_ASSERT(memcmp(msg, message.getMessage(), 4) == 0);
 }
 
diff --git a/test/BtNotInterestedMessageTest.cc b/test/BtNotInterestedMessageTest.cc
index 4b45917e..636280c2 100644
--- a/test/BtNotInterestedMessageTest.cc
+++ b/test/BtNotInterestedMessageTest.cc
@@ -33,7 +33,7 @@ void BtNotInterestedMessageTest::testCreate() {
   unsigned char msg[5];
   PeerMessageUtil::createPeerMessageString(msg, sizeof(msg), 1, 3);
   BtNotInterestedMessageHandle pm = BtNotInterestedMessage::create(&msg[4], 1);
-  CPPUNIT_ASSERT_EQUAL((uint8_t)3, pm->getId());
+  CPPUNIT_ASSERT_EQUAL((int8_t)3, pm->getId());
 
   // case: payload size is wrong
   try {
diff --git a/test/BtPieceMessageTest.cc b/test/BtPieceMessageTest.cc
index 39de49a2..dfe7b551 100644
--- a/test/BtPieceMessageTest.cc
+++ b/test/BtPieceMessageTest.cc
@@ -48,9 +48,9 @@ public:
   public:
     int32_t index;
     int32_t begin;
-    uint32_t length;
+    int32_t length;
   public:
-    MockBtMessage2(int32_t index, int32_t begin, uint32_t length):index(index), begin(begin), length(length) {}
+    MockBtMessage2(int32_t index, int32_t begin, int32_t length):index(index), begin(begin), length(length) {}
 
   };
 
@@ -60,7 +60,7 @@ public:
   public:
     virtual BtMessageHandle createRejectMessage(int32_t index,
 						int32_t begin,
-						uint32_t length) {
+						int32_t length) {
       MockBtMessage2Handle msg = new MockBtMessage2(index, begin, length);
       return msg;
     }
@@ -111,11 +111,11 @@ void BtPieceMessageTest::testCreate() {
   PeerMessageUtil::setIntParam(&msg[9], 256);
   memcpy(&msg[13], data, sizeof(data));
   BtPieceMessageHandle pm = BtPieceMessage::create(&msg[4], 11);
-  CPPUNIT_ASSERT_EQUAL((uint8_t)7, pm->getId());
+  CPPUNIT_ASSERT_EQUAL((int8_t)7, pm->getId());
   CPPUNIT_ASSERT_EQUAL(12345, pm->getIndex());
   CPPUNIT_ASSERT_EQUAL(256, pm->getBegin());
   CPPUNIT_ASSERT(memcmp(data, pm->getBlock(), sizeof(data)) == 0);
-  CPPUNIT_ASSERT_EQUAL((uint32_t)2, pm->getBlockLength());
+  CPPUNIT_ASSERT_EQUAL(2, pm->getBlockLength());
 
   // case: payload size is wrong
   try {
@@ -174,7 +174,7 @@ void BtPieceMessageTest::testChokingEvent_allowedFastEnabled() {
   MockBtMessage2* rej = (MockBtMessage2*)btMessageDispatcher->messageQueue.front().get();
   CPPUNIT_ASSERT_EQUAL(1, rej->index);
   CPPUNIT_ASSERT_EQUAL(1024, rej->begin);
-  CPPUNIT_ASSERT_EQUAL((uint32_t)16*1024, rej->length);
+  CPPUNIT_ASSERT_EQUAL(16*1024, rej->length);
 }
 
 void BtPieceMessageTest::testChokingEvent_inAmAllowedIndexSet() {
@@ -259,7 +259,7 @@ void BtPieceMessageTest::testCancelSendingPieceEvent_allowedFastEnabled() {
   MockBtMessage2* rej = (MockBtMessage2*)btMessageDispatcher->messageQueue.front().get();
   CPPUNIT_ASSERT_EQUAL(1, rej->index);
   CPPUNIT_ASSERT_EQUAL(1024, rej->begin);
-  CPPUNIT_ASSERT_EQUAL((uint32_t)16*1024, rej->length);
+  CPPUNIT_ASSERT_EQUAL(16*1024, rej->length);
 }
 
 void BtPieceMessageTest::testCancelSendingPieceEvent_invalidate() {
diff --git a/test/BtPortMessageTest.cc b/test/BtPortMessageTest.cc
index 5e1d66c4..fe3b1e9d 100644
--- a/test/BtPortMessageTest.cc
+++ b/test/BtPortMessageTest.cc
@@ -29,8 +29,8 @@ void BtPortMessageTest::testCreate() {
   PeerMessageUtil::createPeerMessageString(msg, sizeof(msg), 3, 9);
   PeerMessageUtil::setShortIntParam(&msg[5], 12345);
   BtPortMessageHandle pm = BtPortMessage::create(&msg[4], 3);
-  CPPUNIT_ASSERT_EQUAL((uint8_t)9, pm->getId());
-  CPPUNIT_ASSERT_EQUAL((uint16_t)12345, pm->getPort());
+  CPPUNIT_ASSERT_EQUAL((int8_t)9, pm->getId());
+  CPPUNIT_ASSERT_EQUAL((int16_t)12345, pm->getPort());
 
   // case: payload size is wrong
   try {
diff --git a/test/BtRejectMessageTest.cc b/test/BtRejectMessageTest.cc
index bb626e49..467879b9 100644
--- a/test/BtRejectMessageTest.cc
+++ b/test/BtRejectMessageTest.cc
@@ -38,7 +38,7 @@ public:
     }
 
     virtual RequestSlot getOutstandingRequest(int32_t index, int32_t begin,
-					      uint32_t length) {
+					      int32_t length) {
       if(slot.getIndex() == index && slot.getBegin() == begin &&
 	 slot.getLength() == length) {
 	return slot;
@@ -97,10 +97,10 @@ void BtRejectMessageTest::testCreate() {
   PeerMessageUtil::setIntParam(&msg[9], 256);
   PeerMessageUtil::setIntParam(&msg[13], 1024);
   BtRejectMessageHandle pm = BtRejectMessage::create(&msg[4], 13);
-  CPPUNIT_ASSERT_EQUAL((uint8_t)16, pm->getId());
+  CPPUNIT_ASSERT_EQUAL((int8_t)16, pm->getId());
   CPPUNIT_ASSERT_EQUAL(12345, pm->getIndex());
   CPPUNIT_ASSERT_EQUAL(256, pm->getBegin());
-  CPPUNIT_ASSERT_EQUAL((uint32_t)1024, pm->getLength());
+  CPPUNIT_ASSERT_EQUAL(1024, pm->getLength());
 
   // case: payload size is wrong
   try {
diff --git a/test/BtRequestMessageTest.cc b/test/BtRequestMessageTest.cc
index 5c55d72b..fb2daebb 100644
--- a/test/BtRequestMessageTest.cc
+++ b/test/BtRequestMessageTest.cc
@@ -55,9 +55,9 @@ public:
     string type;
     int32_t index;
     int32_t begin;
-    uint32_t length;
+    int32_t length;
   public:
-    MockBtMessage2(string type, int32_t index, int32_t begin, uint32_t length):type(type), index(index), begin(begin), length(length) {}
+    MockBtMessage2(string type, int32_t index, int32_t begin, int32_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(int32_t index, int32_t begin, uint32_t length) {
+    createPieceMessage(int32_t index, int32_t begin, int32_t length) {
       MockBtMessage2Handle btMsg = new MockBtMessage2("piece", index, begin, length);
       return btMsg;
     }
 
     virtual BtMessageHandle
-    createRejectMessage(int32_t index, int32_t begin, uint32_t length) {
+    createRejectMessage(int32_t index, int32_t begin, int32_t length) {
       MockBtMessage2Handle btMsg = new MockBtMessage2("reject", index, begin, length);
       return btMsg;
     }
@@ -131,10 +131,10 @@ void BtRequestMessageTest::testCreate() {
   PeerMessageUtil::setIntParam(&msg[9], 256);
   PeerMessageUtil::setIntParam(&msg[13], 1024);
   BtRequestMessageHandle pm = BtRequestMessage::create(&msg[4], 13);
-  CPPUNIT_ASSERT_EQUAL((uint8_t)6, pm->getId());
+  CPPUNIT_ASSERT_EQUAL((int8_t)6, pm->getId());
   CPPUNIT_ASSERT_EQUAL(12345, pm->getIndex());
   CPPUNIT_ASSERT_EQUAL(256, pm->getBegin());
-  CPPUNIT_ASSERT_EQUAL((uint32_t)1024, pm->getLength());
+  CPPUNIT_ASSERT_EQUAL(1024, pm->getLength());
 
   // case: payload size is wrong
   try {
@@ -176,7 +176,7 @@ void BtRequestMessageTest::testDoReceivedAction_hasPieceAndAmNotChoking() {
   CPPUNIT_ASSERT_EQUAL(string("piece"), pieceMsg->type);
   CPPUNIT_ASSERT_EQUAL(1, pieceMsg->index);
   CPPUNIT_ASSERT_EQUAL(16, pieceMsg->begin);
-  CPPUNIT_ASSERT_EQUAL((uint32_t)32, pieceMsg->length);
+  CPPUNIT_ASSERT_EQUAL(32, pieceMsg->length);
 }
 
 void BtRequestMessageTest::testDoReceivedAction_hasPieceAndAmChokingAndFastExtensionEnabled() {
@@ -189,7 +189,7 @@ void BtRequestMessageTest::testDoReceivedAction_hasPieceAndAmChokingAndFastExten
   CPPUNIT_ASSERT_EQUAL(string("reject"), pieceMsg->type);
   CPPUNIT_ASSERT_EQUAL(1, pieceMsg->index);
   CPPUNIT_ASSERT_EQUAL(16, pieceMsg->begin);
-  CPPUNIT_ASSERT_EQUAL((uint32_t)32, pieceMsg->length);
+  CPPUNIT_ASSERT_EQUAL(32, pieceMsg->length);
 }
 
 void BtRequestMessageTest::testDoReceivedAction_hasPieceAndAmChokingAndFastExtensionDisabled() {
@@ -210,7 +210,7 @@ void BtRequestMessageTest::testDoReceivedAction_doesntHavePieceAndFastExtensionE
   CPPUNIT_ASSERT_EQUAL(string("reject"), pieceMsg->type);
   CPPUNIT_ASSERT_EQUAL(2, pieceMsg->index);
   CPPUNIT_ASSERT_EQUAL(16, pieceMsg->begin);
-  CPPUNIT_ASSERT_EQUAL((uint32_t)32, pieceMsg->length);
+  CPPUNIT_ASSERT_EQUAL(32, pieceMsg->length);
 }
 
 void BtRequestMessageTest::testDoReceivedAction_doesntHavePieceAndFastExtensionDisabled() {
diff --git a/test/BtSuggestPieceMessageTest.cc b/test/BtSuggestPieceMessageTest.cc
index 2eba021a..83583bef 100644
--- a/test/BtSuggestPieceMessageTest.cc
+++ b/test/BtSuggestPieceMessageTest.cc
@@ -30,7 +30,7 @@ void BtSuggestPieceMessageTest::testCreate() {
   PeerMessageUtil::createPeerMessageString(msg, sizeof(msg), 5, 13);
   PeerMessageUtil::setIntParam(&msg[5], 12345);
   BtSuggestPieceMessageHandle pm = BtSuggestPieceMessage::create(&msg[4], 5);
-  CPPUNIT_ASSERT_EQUAL((uint8_t)13, pm->getId());
+  CPPUNIT_ASSERT_EQUAL((int8_t)13, pm->getId());
   CPPUNIT_ASSERT_EQUAL(12345, pm->getIndex());
 
   // case: payload size is wrong
diff --git a/test/BtUnchokeMessageTest.cc b/test/BtUnchokeMessageTest.cc
index 3134b1e8..cd69e430 100644
--- a/test/BtUnchokeMessageTest.cc
+++ b/test/BtUnchokeMessageTest.cc
@@ -32,7 +32,7 @@ void BtUnchokeMessageTest::testCreate() {
   unsigned char msg[5];
   PeerMessageUtil::createPeerMessageString(msg, sizeof(msg), 1, 1);
   BtUnchokeMessageHandle pm = BtUnchokeMessage::create(&msg[4], 1);
-  CPPUNIT_ASSERT_EQUAL((uint8_t)1, pm->getId());
+  CPPUNIT_ASSERT_EQUAL((int8_t)1, pm->getId());
 
   // case: payload size is wrong
   try {
diff --git a/test/ConsoleFileAllocationMonitorTest.cc b/test/ConsoleFileAllocationMonitorTest.cc
index caaa87bc..4d3f1340 100644
--- a/test/ConsoleFileAllocationMonitorTest.cc
+++ b/test/ConsoleFileAllocationMonitorTest.cc
@@ -28,7 +28,7 @@ void ConsoleFileAllocationMonitorTest::testShowProgress() {
   monitor.setCurrentValue(0);
 
   cout << endl;
-  for(uint64_t i = monitor.getMinValue(); i <= monitor.getMaxValue(); i += 1234343) {
+  for(int64_t i = monitor.getMinValue(); i <= monitor.getMaxValue(); i += 1234343) {
     monitor.setCurrentValue(i);
     monitor.showProgress();
   }
diff --git a/test/DefaultBtMessageDispatcherTest.cc b/test/DefaultBtMessageDispatcherTest.cc
index 8461d7c9..0791b05a 100644
--- a/test/DefaultBtMessageDispatcherTest.cc
+++ b/test/DefaultBtMessageDispatcherTest.cc
@@ -119,7 +119,7 @@ public:
   class MockBtMessageFactory2 : public MockBtMessageFactory {
   public:
     virtual BtMessageHandle
-    createCancelMessage(int32_t index, int32_t begin, uint32_t length) {
+    createCancelMessage(int32_t index, int32_t begin, int32_t length) {
       MockBtMessage2Handle btMsg = new MockBtMessage2();
       btMsg->type = "cancel";
       return btMsg;
@@ -370,7 +370,7 @@ void DefaultBtMessageDispatcherTest::testIsSendingInProgress() {
 void DefaultBtMessageDispatcherTest::testCountOutstandingRequest() {
   RequestSlot slot(0, 0, MY_PIECE_LENGTH, 0);
   btMessageDispatcher->addOutstandingRequest(slot);
-  CPPUNIT_ASSERT_EQUAL((uint32_t)1, btMessageDispatcher->countOutstandingRequest());
+  CPPUNIT_ASSERT_EQUAL(1, btMessageDispatcher->countOutstandingRequest());
 }
 
 void DefaultBtMessageDispatcherTest::testIsOutstandingRequest() {
diff --git a/test/MockBtContext.h b/test/MockBtContext.h
index eaadabf6..3965f1f8 100644
--- a/test/MockBtContext.h
+++ b/test/MockBtContext.h
@@ -8,11 +8,11 @@ class MockBtContext : public BtContext  {
 private:
   unsigned char infoHash[20];
   Strings pieceHashes;
-  long long int totalLength;
+  int64_t totalLength;
   FILE_MODE fileMode;
   string name;
-  int pieceLength;
-  int numPieces;
+  int32_t pieceLength;
+  int32_t numPieces;
   unsigned char peerId[20];
   FileEntries fileEntries;
   AnnounceTiers announceTiers;
@@ -31,7 +31,7 @@ public:
     memcpy(this->infoHash, infoHash, sizeof(this->infoHash));
   }
 
-  virtual int getInfoHashLength() const {
+  virtual int32_t getInfoHashLength() const {
     return sizeof(infoHash);
   }
 
@@ -39,7 +39,7 @@ public:
     return Util::toHex(infoHash, sizeof(infoHash));
   }
 
-  virtual string getPieceHash(int index) const {
+  virtual string getPieceHash(int32_t index) const {
     return pieceHashes.at(index);
   }
   
@@ -51,11 +51,11 @@ public:
     pieceHashes.push_back(pieceHash);
   }
 
-  virtual long long int getTotalLength() const {
+  virtual int64_t getTotalLength() const {
     return totalLength;
   }
 
-  void setTotalLength(long long int length) {
+  void setTotalLength(int64_t length) {
     this->totalLength = length;
   }
 
@@ -93,19 +93,19 @@ public:
     this->name = name;
   }
   
-  virtual int getPieceLength() const {
+  virtual int32_t getPieceLength() const {
     return pieceLength;
   }
 
-  void setPieceLength(int pieceLength) {
+  void setPieceLength(int32_t pieceLength) {
     this->pieceLength = pieceLength;
   }
 
-  virtual int getNumPieces() const {
+  virtual int32_t getNumPieces() const {
     return numPieces;
   }
 
-  void setNumPieces(int numPieces) {
+  void setNumPieces(int32_t numPieces) {
     this->numPieces = numPieces;
   }
 
diff --git a/test/MockBtMessage.h b/test/MockBtMessage.h
index 8550f558..c33e0824 100644
--- a/test/MockBtMessage.h
+++ b/test/MockBtMessage.h
@@ -42,7 +42,7 @@ private:
   bool sendingInProgress;
   bool invalidate;
   bool uploading;
-  uint8_t id;
+  int8_t id;
 public:
   MockBtMessage() {}
 
@@ -72,11 +72,11 @@ public:
     this->uploading = flag;
   }
   
-  virtual uint8_t getId() {
+  virtual int8_t getId() {
     return id;
   }
 
-  void setId(uint8_t id) {
+  void setId(int8_t id) {
     this->id = id;
   }
 
diff --git a/test/MockBtMessageDispatcher.h b/test/MockBtMessageDispatcher.h
index f46f3684..291bd84e 100644
--- a/test/MockBtMessageDispatcher.h
+++ b/test/MockBtMessageDispatcher.h
@@ -19,7 +19,7 @@ public:
 
   virtual void sendMessages() {}
 
-  virtual void doCancelSendingPieceAction(int32_t index, int32_t begin, uint32_t length) {}
+  virtual void doCancelSendingPieceAction(int32_t index, int32_t begin, int32_t length) {}
 
   virtual void doCancelSendingPieceAction(const PieceHandle& piece) {}
 
@@ -35,11 +35,11 @@ public:
     return false;
   }
 
-  virtual uint32_t countMessageInQueue() {
+  virtual int32_t countMessageInQueue() {
     return messageQueue.size();
   }
 
-  virtual uint32_t countOutstandingRequest() {
+  virtual int32_t countOutstandingRequest() {
     return 0;
   }
 
@@ -47,7 +47,7 @@ public:
     return false;
   }
 
-  virtual RequestSlot getOutstandingRequest(int32_t index, int32_t begin, uint32_t length) {
+  virtual RequestSlot getOutstandingRequest(int32_t index, int32_t begin, int32_t length) {
     return RequestSlot::nullSlot;
   }
 
diff --git a/test/MockBtMessageFactory.h b/test/MockBtMessageFactory.h
index 3348f88b..bcfd1d08 100644
--- a/test/MockBtMessageFactory.h
+++ b/test/MockBtMessageFactory.h
@@ -10,12 +10,12 @@ public:
   virtual ~MockBtMessageFactory() {}
 
   virtual BtMessageHandle
-  createBtMessage(const unsigned char* msg, uint32_t msgLength) {
+  createBtMessage(const unsigned char* msg, int32_t msgLength) {
     return BtMessageHandle(0);
   };
 
   virtual BtMessageHandle
-  createHandshakeMessage(const unsigned char* msg, uint32_t msgLength) {
+  createHandshakeMessage(const unsigned char* msg, int32_t msgLength) {
     return BtMessageHandle(0);
   }
 
@@ -31,12 +31,12 @@ public:
   }
 
   virtual BtMessageHandle
-  createCancelMessage(int32_t index, int32_t begin, uint32_t length) {
+  createCancelMessage(int32_t index, int32_t begin, int32_t length) {
     return BtMessageHandle(0);
   }
 
   virtual BtMessageHandle
-  createPieceMessage(int32_t index, int32_t begin, uint32_t length) {
+  createPieceMessage(int32_t index, int32_t begin, int32_t length) {
     return BtMessageHandle(0);
   }
 
@@ -77,7 +77,7 @@ public:
   }
 
   virtual BtMessageHandle
-  createRejectMessage(int32_t index, int32_t begin, uint32_t length) {
+  createRejectMessage(int32_t index, int32_t begin, int32_t length) {
     return BtMessageHandle(0);
   }
 
diff --git a/test/MockBtRequestFactory.h b/test/MockBtRequestFactory.h
index b87b6155..7331c40a 100644
--- a/test/MockBtRequestFactory.h
+++ b/test/MockBtRequestFactory.h
@@ -19,9 +19,9 @@ public:
 
   virtual void doChokedAction() {}
 
-  virtual BtMessages createRequestMessages(uint32_t max) { return BtMessages(); }
+  virtual BtMessages createRequestMessages(int32_t max) { return BtMessages(); }
 
-  virtual BtMessages createRequestMessagesOnEndGame(uint32_t max) { return BtMessages(); }
+  virtual BtMessages createRequestMessagesOnEndGame(int32_t max) { return BtMessages(); }
 };
 
 typedef SharedHandle<MockBtRequestFactory> MockBtRequestFactoryHandle;
diff --git a/test/MockPieceStorage.h b/test/MockPieceStorage.h
index 5c818bac..e53c3d60 100644
--- a/test/MockPieceStorage.h
+++ b/test/MockPieceStorage.h
@@ -6,10 +6,10 @@
 
 class MockPieceStorage : public PieceStorage {
 private:
-  long long int totalLength;
-  long long int filteredTotalLength;
-  long long int completedLength;
-  long long int filteredCompletedLength;
+  int64_t totalLength;
+  int64_t filteredTotalLength;
+  int64_t completedLength;
+  int64_t filteredCompletedLength;
   BitfieldMan* bitfieldMan;
   bool selectiveDownloadingMode;
   bool endGame;
@@ -43,35 +43,35 @@ public:
     return false;
   }
 
-  virtual long long int getTotalLength() {
+  virtual int64_t getTotalLength() {
     return totalLength;
   }
 
-  void setTotalLength(long long int totalLength) {
+  void setTotalLength(int64_t totalLength) {
     this->totalLength = totalLength;
   }
 
-  virtual long long int getFilteredTotalLength() {
+  virtual int64_t getFilteredTotalLength() {
     return filteredTotalLength;
   }
 
-  void setFilteredTotalLength(long long int totalLength) {
+  void setFilteredTotalLength(int64_t totalLength) {
     this->filteredTotalLength = totalLength;
   }
 
-  virtual long long int getCompletedLength() {
+  virtual int64_t getCompletedLength() {
     return completedLength;
   }
 
-  void setCompletedLength(long long int completedLength) {
+  void setCompletedLength(int64_t completedLength) {
     this->completedLength = completedLength;
   }
 
-  virtual long long int getFilteredCompletedLength() {
+  virtual int64_t getFilteredCompletedLength() {
     return filteredCompletedLength;
   }
 
-  void setFilteredCompletedLength(long long int completedLength) {
+  void setFilteredCompletedLength(int64_t completedLength) {
     this->filteredCompletedLength = completedLength;
   }
   
@@ -85,6 +85,10 @@ public:
     return false;
   }
 
+  virtual bool allDownloadFinished() {
+    return false;
+  }
+
   virtual void initStorage() {}
 
   virtual const unsigned char* getBitfield() {
@@ -92,11 +96,11 @@ public:
   }
 
   virtual void setBitfield(const unsigned char* bitfield,
-			   int bitfieldLength) {
+			   int32_t bitfieldLength) {
     bitfieldMan->setBitfield(bitfield, bitfieldLength);
   }
   
-  virtual int getBitfieldLength() {
+  virtual int32_t getBitfieldLength() {
     return bitfieldMan->getBitfieldLength();
   }
 
@@ -130,22 +134,22 @@ public:
     this->diskAdaptor = adaptor;
   }
   
-  virtual int getPieceLength(int index) {
+  virtual int32_t getPieceLength(int32_t index) {
     return pieceLengthList.at(index);
   }
 
-  void addPieceLengthList(int length) {
+  void addPieceLengthList(int32_t length) {
     pieceLengthList.push_back(length);
   }
 
-  virtual void advertisePiece(int cuid, int index) {}
+  virtual void advertisePiece(int32_t cuid, int32_t index) {}
 
-  virtual Integers getAdvertisedPieceIndexes(int myCuid,
+  virtual Integers getAdvertisedPieceIndexes(int32_t myCuid,
 					     const Time& lastCheckTime) {
     return Integers();
   }
 
-  virtual void removeAdvertisedPiece(int elapsed) {}
+  virtual void removeAdvertisedPiece(int32_t elapsed) {}
 
   virtual void markAllPiecesDone() {}
 
diff --git a/test/ShareRatioSeedCriteriaTest.cc b/test/ShareRatioSeedCriteriaTest.cc
index 88d55237..995dd05a 100644
--- a/test/ShareRatioSeedCriteriaTest.cc
+++ b/test/ShareRatioSeedCriteriaTest.cc
@@ -1,6 +1,7 @@
 #include "ShareRatioSeedCriteria.h"
 #include "MockBtContext.h"
 #include "MockPeerStorage.h"
+#include "MockPieceStorage.h"
 #include <cppunit/extensions/HelperMacros.h>
 
 class ShareRatioSeedCriteriaTest:public CppUnit::TestFixture {
@@ -36,6 +37,10 @@ void ShareRatioSeedCriteriaTest::testEvaluate() {
   PeerStorageHandle peerStorage(mockPeerStorage);
   BtRegistry::registerPeerStorage(infoHashString, peerStorage);
 
+  MockPieceStorage* mockPieceStorage = new MockPieceStorage();
+  mockPieceStorage->setCompletedLength(1000000);
+  BtRegistry::registerPieceStorage(infoHashString, PieceStorageHandle(mockPieceStorage));
+
   ShareRatioSeedCriteria cri(1.0, btContext);
   CPPUNIT_ASSERT(cri.evaluate());
   
diff --git a/test/UtilTest.cc b/test/UtilTest.cc
index 73fdff29..c70fa6c5 100644
--- a/test/UtilTest.cc
+++ b/test/UtilTest.cc
@@ -21,6 +21,7 @@ class UtilTest:public CppUnit::TestFixture {
   CPPUNIT_TEST(testToUpper);
   CPPUNIT_TEST(testToLower);
   CPPUNIT_TEST(testUrldecode);
+  CPPUNIT_TEST(testCountBit);
   CPPUNIT_TEST_SUITE_END();
 private:
 
@@ -42,6 +43,7 @@ public:
   void testToUpper();
   void testToLower();
   void testUrldecode();
+  void testCountBit();
 };
 
 
@@ -282,3 +284,8 @@ void UtilTest::testUrldecode() {
   string src6 = "%2f";
   CPPUNIT_ASSERT_EQUAL(string("/"), Util::urldecode(src6));
 }
+
+void UtilTest::testCountBit() {
+  CPPUNIT_ASSERT_EQUAL(32, Util::countBit(UINT32_MAX));
+  CPPUNIT_ASSERT_EQUAL(8, Util::countBit(255));
+}
diff --git a/test/Xml2MetalinkProcessorTest.cc b/test/Xml2MetalinkProcessorTest.cc
index c4b60c64..c758e6e2 100644
--- a/test/Xml2MetalinkProcessorTest.cc
+++ b/test/Xml2MetalinkProcessorTest.cc
@@ -32,6 +32,8 @@ void Xml2MetalinkProcessorTest::testParseFile() {
 
   MetalinkEntries::iterator entryItr = metalinker->entries.begin();
   MetalinkEntryHandle entry1 = *entryItr;
+  CPPUNIT_ASSERT_EQUAL(string("aria2-0.5.2.tar.bz2"), entry1->filename);
+  CPPUNIT_ASSERT_EQUAL((int64_t)0, entry1->size);
   CPPUNIT_ASSERT_EQUAL(string("0.5.2"), entry1->version);
   CPPUNIT_ASSERT_EQUAL(string("en-US"), entry1->language);
   CPPUNIT_ASSERT_EQUAL(string("Linux-x86"), entry1->os);
@@ -57,14 +59,15 @@ void Xml2MetalinkProcessorTest::testParseFile() {
   entryItr++;
 
   MetalinkEntryHandle entry2 = *entryItr;
-  CPPUNIT_ASSERT_EQUAL((uint64_t)345689, entry2->size);
+  CPPUNIT_ASSERT_EQUAL(string("aria2-0.5.1.tar.bz2"), entry2->filename);
+  CPPUNIT_ASSERT_EQUAL((int64_t)345689, entry2->size);
   CPPUNIT_ASSERT_EQUAL(string("0.5.1"), entry2->version);
   CPPUNIT_ASSERT_EQUAL(string("ja-JP"), entry2->language);
   CPPUNIT_ASSERT_EQUAL(string("Linux-m68k"), entry2->os);
   CPPUNIT_ASSERT_EQUAL(string("4c255b0ed130f5ea880f0aa061c3da0487e251cc"),
 		       entry2->checksum.getMessageDigest());
   CPPUNIT_ASSERT_EQUAL((size_t)2, entry2->chunkChecksum->pieceHashes.size());
-  CPPUNIT_ASSERT_EQUAL((uint32_t)266144, entry2->chunkChecksum->pieceLength);
+  CPPUNIT_ASSERT_EQUAL(262144, entry2->chunkChecksum->pieceLength);
   CPPUNIT_ASSERT_EQUAL(string("179463a88d79cbf0b1923991708aead914f26142"),
 		       entry2->chunkChecksum->pieceHashes.at(0));
   CPPUNIT_ASSERT_EQUAL(string("fecf8bc9a1647505fe16746f94e97a477597dbf3"),
@@ -72,7 +75,7 @@ void Xml2MetalinkProcessorTest::testParseFile() {
 
   CPPUNIT_ASSERT(DIGEST_ALGO_SHA1 == entry2->checksum.getDigestAlgo());
   } catch(Exception* e) {
-    cerr << e->getMsg() << endl;
+    CPPUNIT_FAIL(e->getMsg());
     delete e;
   }
 }
diff --git a/test/test.xml b/test/test.xml
index 58cb04d3..e63572d0 100644
--- a/test/test.xml
+++ b/test/test.xml
@@ -28,8 +28,8 @@
         <hash type="md5">92296e19c406d77d21bda0bb944eac46</hash>
         <hash type="sha1">4c255b0ed130f5ea880f0aa061c3da0487e251cc</hash>
 	<pieces length="262144" type="sha1">
-	  <hash pieces="0">179463a88d79cbf0b1923991708aead914f26142</hash>
-	  <hash pieces="1">fecf8bc9a1647505fe16746f94e97a477597dbf3</hash>
+	  <hash piece="0">179463a88d79cbf0b1923991708aead914f26142</hash>
+	  <hash piece="1">fecf8bc9a1647505fe16746f94e97a477597dbf3</hash>
 	</pieces>
       </verification>
       <resources>