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

	* src/FileAllocationCommand.cc: Derived from RealtimeCommand.
	* src/CheckIntegrityCommand.cc: Derived from RealtimeCommand.
	
	* src/MetalinkEntry.h
	(checksum): Changed to ChecksumHandle
	* src/MetalinkRequestInfo.cc
	(checksum): Changed to ChecksumHandle

	* src/File.cc
	(mkdirs): OPEN_MODE -> DIR_OPEN_MODE
	* src/common.h
	(DIR_OPEN_MODE): New definition

	* src/RequestGroup.cc
	(prepareForNextAction): Added an argument.

	* src/message.h
	(MSG_GOOD_CHECKSUM): New definition
	(MSG_BAD_CHECKSUM): New definition

	* src/HttpResponseCommand.cc
	(handleDefaultEncoding): Continue download sequence in new
	non-segmented download.

	* src/FileAllocationEntry.h
	(_nextDownloadCommand): New variable.

	* src/DownloadCommand.cc
	(prepareForNextSegment): Create ChecksumCommand if checksum is
	available.	

	* src/RealtimeCommand.h, src/RealtimeCommand.cc: New class.

	* src/IteratableChecksumValidator.h,
	src/IteratableChecksumValidator.cc: New class.

	* src/ChecksumCommand.h, src/ChecksumCommand.cc: New class.

1 files changed, 9 insertions, 7 deletions

diff --git a/test/TrackerWatcherCommandTest.cc b/test/TrackerWatcherCommandTest.cc
index 9352cb6a..93c8bad1 100644
--- a/test/TrackerWatcherCommandTest.cc
+++ b/test/TrackerWatcherCommandTest.cc
@@ -11,6 +11,7 @@
 #include "DefaultPeerStorage.h"
 #include "BtRegistry.h"
 #include "RequestFactory.h"
+#include "CUIDCounter.h"
 #include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;
@@ -31,7 +32,11 @@ public:
     RequestFactorySingletonHolder::instance(requestFactory);
   }
 
-  void setUp() {}
+  void setUp() 
+  {
+    CUIDCounterHandle counter = new CUIDCounter();
+    CUIDCounterSingletonHolder::instance(counter);
+  }
 
   void testCreateCommand();
 };
@@ -60,10 +65,7 @@ void TrackerWatcherCommandTest::testCreateCommand() {
     BtRegistry::registerBtAnnounce(btContext->getInfoHashAsString(), btAnnounce);
     TorrentConsoleDownloadEngine* te = new TorrentConsoleDownloadEngine();
     te->option = op;
-    te->segmentMan = new SegmentMan();
-    te->segmentMan->option = op;
-    ByteArrayDiskWriter* byteArrayDiskWriter = new ByteArrayDiskWriter();
-    te->segmentMan->diskWriter = byteArrayDiskWriter;
+    te->_requestGroupMan = new RequestGroupMan();
 
     TrackerWatcherCommand command(1, te, btContext);
 
@@ -72,7 +74,7 @@ void TrackerWatcherCommandTest::testCreateCommand() {
     
     btAnnounce->announceSuccess();
     btAnnounce->resetAnnounce();
-    te->segmentMan->init();
+    te->_requestGroupMan = new RequestGroupMan();
     
     btRuntime->setHalt(true);
     
@@ -81,7 +83,7 @@ void TrackerWatcherCommandTest::testCreateCommand() {
     
     btAnnounce->announceSuccess();
     btAnnounce->resetAnnounce();
-    te->segmentMan->init();
+    te->_requestGroupMan = new RequestGroupMan();
     
     CPPUNIT_ASSERT(btAnnounce->noMoreAnnounce());