2007-08-08 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	MessageDigestHelper is introduced in order to simplify the use
	of message digest. Removed repeated code.
	The message digest algorithm is now specified by string, like 
"sha1",
	"md5".
	* src/messageDigest.{h, cc}
	* src/MessageDigestHelper.{h, cc}: New class.
	* src/DefaultPieceStorage.cc
	* src/DefaultBtContext.{h, cc}
	(computeFastSet): New function.
	(setInfoHash): Added for unit testing.
	(setNumPieces): Added for unit testing.
	* src/DefaultBtInteractive.cc
	* src/BtPieceMessage.cc
	* src/Peer.cc
	* src/Checksum.h
	* src/message.h
	* src/IteratableChecksumValidator.h
	* src/ChunkChecksumValidator.{h, cc}: Use 
IteratableChecksumValidator
	inside it.
	* src/SegmentMan.{h, cc}
	(checkIntegrity): Removed.
	* src/IteratableChunkChecksumValidator.{h, cc}
	* src/Util.h
	(sha1Sum): Removed.
	(simpleMessageDigest): Removed.
	(fileChecksum): Removed.
	(computeFastSet): Removed.
	* src/ShaVisitor.cc
	* src/ChunkChecksum.h
	* src/DownloadCommand.cc

	Removed messageDigest virtual functions.
	* src/MultiDiskAdaptor.{h, cc}
	* src/DiskAdaptor.h
	* src/ByteArrayDiskWriter.h
	* src/DiskWriter.h
	* src/DiskAdaptorWriter.h
	* src/AbstractSingleDiskAdaptor.{h, cc}
	* src/AbstractDiskWriter.{h, cc}
	
	Fixed comilation error when message digest is disabled.
	* src/MetalinkEntry.{h, cc}
	* src/MetalinkRequestInfo.cc
	
	Removed srandom and random.
	* src/SimpleRandomizer.h

	Added size() virtual function to DiskAdaptor
	* src/MultiDiskAdaptor.h

	Fixed the bug that causes that files are not opened correctly in
	multi-file torrent.
	* src/TorrentRequestInfo.cc
	* src/MultiDiskAdaptor.cc
	
	Added SHA256 support
	* src/messageDigest.cc
	* src/Xml2MetalinkProcessor.cc

	Show supported message digest algorithms
	* src/main.cc

	Updated contact info.
	* src/main.cc

1 files changed, 13 insertions, 10 deletions

diff --git a/test/TrackerWatcherCommandTest.cc b/test/TrackerWatcherCommandTest.cc
index 93c8bad1..d3f6a3e1 100644
--- a/test/TrackerWatcherCommandTest.cc
+++ b/test/TrackerWatcherCommandTest.cc
@@ -22,20 +22,21 @@ class TrackerWatcherCommandTest:public CppUnit::TestFixture {
   CPPUNIT_TEST(testCreateCommand);
   CPPUNIT_TEST_SUITE_END();
 private:
-  Option* op;
+  Option op;
 public:
-  TrackerWatcherCommandTest():op(new Option())
+  TrackerWatcherCommandTest()
   {
-    op->put(PREF_TRACKER_MAX_TRIES, "10");
-    RequestFactoryHandle requestFactory = new RequestFactory();
-    requestFactory->setOption(op);
-    RequestFactorySingletonHolder::instance(requestFactory);
   }
 
   void setUp() 
   {
     CUIDCounterHandle counter = new CUIDCounter();
     CUIDCounterSingletonHolder::instance(counter);
+
+    op.put(PREF_TRACKER_MAX_TRIES, "10");
+    RequestFactoryHandle requestFactory = new RequestFactory();
+    requestFactory->setOption(&op);
+    RequestFactorySingletonHolder::instance(requestFactory);
   }
 
   void testCreateCommand();
@@ -53,22 +54,24 @@ void TrackerWatcherCommandTest::testCreateCommand() {
     BtRuntimeHandle btRuntime;
     BtRegistry::registerBtRuntime(btContext->getInfoHashAsString(), btRuntime);
     
-    PieceStorageHandle pieceStorage(new DefaultPieceStorage(btContext, op));
+    PieceStorageHandle pieceStorage(new DefaultPieceStorage(btContext, &op));
     BtRegistry::registerPieceStorage(btContext->getInfoHashAsString(),
 				     pieceStorage);
 
-    PeerStorageHandle peerStorage(new DefaultPeerStorage(btContext, op));
+    PeerStorageHandle peerStorage(new DefaultPeerStorage(btContext, &op));
     BtRegistry::registerPeerStorage(btContext->getInfoHashAsString(),
 				    peerStorage);
 
-    BtAnnounceHandle btAnnounce(new DefaultBtAnnounce(btContext, op));
+    BtAnnounceHandle btAnnounce(new DefaultBtAnnounce(btContext, &op));
     BtRegistry::registerBtAnnounce(btContext->getInfoHashAsString(), btAnnounce);
     TorrentConsoleDownloadEngine* te = new TorrentConsoleDownloadEngine();
-    te->option = op;
+    te->option = &op;
     te->_requestGroupMan = new RequestGroupMan();
 
     TrackerWatcherCommand command(1, te, btContext);
 
+    RequestFactorySingletonHolder::instance()->createHttpAuthResolver();
+
     CPPUNIT_ASSERT(dynamic_cast<HttpInitiateConnectionCommand*>(command.createCommand()));
     //cerr << btAnnounce->getAnnounceUrl() << endl;