aria2/test/UtilTest.cc
Tatsuhiro Tsujikawa ec642ad294 2006-11-05 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
To divide TorrentMan into 6 classes: BtContext, BtRuntime,
	PeerStorage, PieceStorage, BtAnnounce and BtProgressInfoFile

	* src/TrackerWatcherComand.h: Made subclass of 
BtContextAwareCommand.
	* src/SeedCheckCommand.cc: Use pieceStorage, btRuntime
	* src/PeerAbstractCommand.h: Made subclass of 
BtContextAwareCommand.
	* src/PeerAbstractCommand.cc: Use btRuntime.
	* src/BtContextAwareCommand.h: New class.
	* src/FileEntry.h: Added accessor methods for following 
variables.
	(path): Made private.
	(length): Made private.
	(offset): Made private.
	(extracted): Made private.
	(requested): Made private.
	(FileEntries): New definition.
	(FileEntryHandle): New definition.
	* src/FileEntry.cc: New file.
	* src/HaveEraseCommand.h: Made subclass of 
BtContextAwareCommand.
	* src/HaveEraseCommand.cc: Use btRuntime, pieceStorage.
	* src/PeerChokeCommand.h: Made subclass of 
BtContextAwareCommand.
	* src/PeerChokeCommand.cc: Use btRuntime, peerStorage, 
pieceStorage.
	* src/PieceStorage.h: New file.
	* src/PeerInteractionCommand.h: Use btContext.
	* src/PeerInteractionCommand.cc: Use pieceStorage, peerStorage,
	btRuntime.
	* src/DefaultBtProgressInfoFile.h: New file.
	* src/DefaultBtProgressInfoFile.cc: New file.
	* src/File.cc
	(Util.h): New include.
	(mkdirs): New function.
	* src/MultiDiskAdaptor.h
	(mkdir): New function.
	* src/PeerListProcessor.h
	(Peers): Removed.
	* src/PeerInteraction.h
	(torrentMan): Removed.
	(btContext): New variable.
	(peerStorage): New variable.
	(pieceStorage): New variable.
	(btAnnounce): New variable.
	(getTorrentMan): Removed.
	(getBtContext): New function.
	* src/PeerInteraction.cc: Use btContext, peerStorage, 
pieceStorage,
	btAnnounce.
	* src/HandshakeMessage.h
	(TorrentMan.h): Removed.
	* src/HandshakeMessage.cc: Use btContext.
	* src/DefaultBtAnnounce.cc: New file.
	* src/MultiDiskWriter.cc: Use the accessor methods of FileEntry.
	* src/DefaultPieceStorage.cc: New file.
	* src/DefaultBtContext.h: New file.
	* src/TorrentRequestInfo.cc: Use btContext, pieceStorage.
	Use the accessor methods of FileEntry.
	* src/CookieBox.cc: Updated to use Util::slice().
	* src/PieceMessage.cc: Use btContext, pieceStorage.
	* src/common.h (SharedHandle.h): New include.
	* src/PeerMessage.cc (PeerMessage): Added btContext, 
peerStorage,
	pieceStorage.
	* src/TorrentAutoSaveCommand.h: Made subclass of 
BtContextAwareCommand.
	* src/DiskAdaptor.h
	(topDir): Removed.
	(getFileEntryFromPath): Changed the return type to 
FileEntryHandle.
	(setTopDir): Removed.
	(getTopDir): Removed.
	* src/BtContext.h: New file.
	* src/DefaultPeerStorage.h: New file.
	* src/PieceMessage.h (TorrentMan.h): Removed.
	* src/RequestMessage.h (TorrentMan.h): Removed.
	* src/TorrentDownloadEngine.h
	(uploadLength): New variable.
	(btContext): New variable.
	(btRuntime): New variable.
	(pieceStorage): New variable.
	(peerStorage): New variable.
	(btAnnounce): New variable.
	(btProgressInfoFile): New variable.
	(torrentMan): Removed.
	(setBtContext): New function.
	* src/TorrentDownloadEngine.cc: Use BtContext, BtRuntime, 
pieceStorage,
	peerStorage, btAnnounce, btProgressInfoFile.
	* src/Piece.h
	(toString): New function.
	(Pieces): New type definition.
	* src/Peer.h
	(active): New variable.
	(Peer): Added active.
	(activate): Set active to true.
	(deactivate): Set active to false.
	(isActive): New function.
	(Peers): New type definition.
	* src/DirectDiskAdaptor.cc
	(getFilePath): Use the accessor methods of FileEntry.
	* src/TorrentConsoleDownloadEngine.h
	(afterEachIteration): New function.
	* src/TorrentConsoleDownloadEngine.cc
	(haltRequested): New variable.
	(sendStatistics): Use pieceStorage, btRuntime.
	(afterEachIteration): New function.
	* src/AnnounceList: AnnounceTier->AnnounceTierHandle.
	* src/Directry.h
	(Directory): New function.
	(DirectoryHandle): New type definition.
	* src/BtProgressInfoFile.h: New file.
	* src/RequestMessage.cc: Use pieceStorage.
	* src/BtRuntime.h: New file.
	* src/DefaultBtContext.cc: New file.
	* src/BitfieldMan.h
	(getCompletedLength): New function(private).
	(getCompletedLength): New function.
	(getFilteredCompletedLength): New function.
	* src/BitfieldMan.h
	(getCompletedLength): New function(private).
	(getCompletedLength): New function.
	(getFilteredCompletedLength): New function.
	* src/MultiDiskAdaptor.cc
	(mkdir): New function.
	(openFile): Call mkdir().
	(initAndOpenFile): Call mkdir().
	* src/CancelMessage.h
	(TorrentMan.h): Removed.
	* src/RejectMessage.h
	(TorrentMan.h): Removed.
	* src/DownloadEngineFactory.cc
	(DefaultPieceStorage.h): New include.
	(DefaultPeerStorage.h): New include.
	(DefaultBtAnnounce.h): New include.
	(DefaultBtProgressInfoFile.h): New include.
	(newTorrentConsoleEngine): Rewritten.
	* src/ShareRatioSeedCriteria.h
	(torrentMan): Removed.
	(btContext): New variable.
	(peerStorage): New variable.
	(btRuntime): New variable.
	(evaluate): Use btContext, btRuntime, peerStorage.
	* src/AnnounceTier.h: New file.
	* src/BtAnnounce.h: New file.
	* src/BtRegistry.h: New file.
	* src/PeerInitiateConnectionCommand.h: Added btContext.
	* src/PeerConnection.h (TorrentMan.h): Removed.
	* src/PeerMessageFactory.cc: Use btContext, pieceStorage.
	* src/Util.h
	(slice): Added an argument.
	* src/Util.cc
	(slice): Added an argument to control whether trim is made or 
not.
	* src/PeerStorage.h: New file.
	* src/BtRegistry.cc: New file.
	* src/TrackerUpdateCommand.h: Made subclass of 
BtContextAwareCommand.
	* src/CopyDiskAdaptor.cc: Use the accessor methods of FileEntry.
	* src/MultiDiskWriter.h: FileEntry -> FileEntryHandle
	* src/PeerListenCommand.cc: Use btRuntime, peerStorage, 
btContext.
	* src/TorrentRequestInfo.h
	(e): Removed.
	(showFileEntry): Added an argument.
	(getDownloadEngine): Return 0.
	* src/DefaultBtAnnounce.h: New file.
	* src/TorrentAutoSaveCommand.cc: Use btRuntime, 
btProgressInfoFile.
	* src/TrackerWatcherComand.cc: Use btRuntime, btAnnounce,
	* src/PeerMessageFactory.h
	(btContext): New variable.
	(pieceStorage): New variable.
	* src/TrackerUpdateCommand.cc: Use btRuntime, peerStorage, 
btContext,
	btAnnounce.
	* src/DiskAdaptor.cc
	(DiskAdaptor): Removed topDir.
	(~DiskAdaptor): Removed topDir.
	* src/PeerListenCommand.h: Made subclass of 
BtContextAwareCommand.
	* src/SeedCheckCommand.h: Made subclass of 
BtContextAwareCommand.
	* src/File.h (mkdirs): New function.
	* src/DefaultPeerStorage): New file.
	* src/DownloadEngineFactory.h
	(newTorrentConsoleEngine): Use btContext.
	* src/BtContextAwareCommand.cc: New file.
	* src/PeerInitiateConnectionCommand.cc: Use btRuntime, 
peerStorage.
	* src/PeerMessage.h
	(btContext): New variable.
	(peerStorage): New variable.
	(pieceStorage): New variable.
	(setBtContext): New function.
	* src/Directry.cc
	(Directory): New function.
	(createDir): Do nothing if name.size() == 0.
	* src/AnnounceList.h
	(AnnounceTier): Removed. 
	(AnnounceTiers): Removed.
	* src/DefaultPieceStorage.h: New file.
	* src/Piece.cc (toString): New function.
	
	To fix typo:
	
	* src/main.cc (showVersion): Fixed typo.

	To fix compile warning:
	
	* src/DelegatingPeerListProcessor.cc
	(canHandle): Added "return false".
2006-11-05 15:04:17 +00:00

285 lines
8.2 KiB
C++

#include "Util.h"
#include <string>
#include <cppunit/extensions/HelperMacros.h>
using namespace std;
class UtilTest:public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE(UtilTest);
CPPUNIT_TEST(testTrim);
CPPUNIT_TEST(testSplit);
CPPUNIT_TEST(testSlice);
CPPUNIT_TEST(testEndsWith);
CPPUNIT_TEST(testReplace);
CPPUNIT_TEST(testStartsWith);
// may be moved to other helper class in the future.
CPPUNIT_TEST(testGetContentDispositionFilename);
CPPUNIT_TEST(testComputeFastSet);
CPPUNIT_TEST(testRandomAlpha);
CPPUNIT_TEST(testFileChecksum);
CPPUNIT_TEST(testToUpper);
CPPUNIT_TEST(testToLower);
CPPUNIT_TEST(testUrldecode);
CPPUNIT_TEST_SUITE_END();
private:
public:
void setUp() {
}
void testTrim();
void testSplit();
void testSlice();
void testEndsWith();
void testReplace();
void testStartsWith();
void testComputeFastSet();
// may be moved to other helper class in the future.
void testGetContentDispositionFilename();
void testRandomAlpha();
void testFileChecksum();
void testToUpper();
void testToLower();
void testUrldecode();
};
CPPUNIT_TEST_SUITE_REGISTRATION( UtilTest );
void UtilTest::testTrim() {
string str1 = "aria2";
CPPUNIT_ASSERT_EQUAL(str1, Util::trim("aria2"));
CPPUNIT_ASSERT_EQUAL(str1, Util::trim(" aria2"));
CPPUNIT_ASSERT_EQUAL(str1, Util::trim(" aria2 "));
CPPUNIT_ASSERT_EQUAL(str1, Util::trim(" aria2 "));
string str2 = "aria2 debut";
CPPUNIT_ASSERT_EQUAL(str2, Util::trim("aria2 debut"));
CPPUNIT_ASSERT_EQUAL(str2, Util::trim(" aria2 debut "));
string str3 = "";
CPPUNIT_ASSERT_EQUAL(str3, Util::trim(""));
CPPUNIT_ASSERT_EQUAL(str3, Util::trim(" "));
CPPUNIT_ASSERT_EQUAL(str3, Util::trim(" "));
string str4 = "A";
CPPUNIT_ASSERT_EQUAL(str4, Util::trim("A"));
CPPUNIT_ASSERT_EQUAL(str4, Util::trim(" A "));
CPPUNIT_ASSERT_EQUAL(str4, Util::trim(" A "));
}
void UtilTest::testSplit() {
pair<string, string> p1;
Util::split(p1, "name=value", '=');
CPPUNIT_ASSERT_EQUAL(string("name"), p1.first);
CPPUNIT_ASSERT_EQUAL(string("value"), p1.second);
Util::split(p1, " name = value ", '=');
CPPUNIT_ASSERT_EQUAL(string("name"), p1.first);
CPPUNIT_ASSERT_EQUAL(string("value"), p1.second);
Util::split(p1, "=value", '=');
CPPUNIT_ASSERT_EQUAL(string(""), p1.first);
CPPUNIT_ASSERT_EQUAL(string("value"), p1.second);
Util::split(p1, "name=", '=');
CPPUNIT_ASSERT_EQUAL(string("name"), p1.first);
CPPUNIT_ASSERT_EQUAL(string(""), p1.second);
Util::split(p1, "name", '=');
CPPUNIT_ASSERT_EQUAL(string("name"), p1.first);
CPPUNIT_ASSERT_EQUAL(string(""), p1.second);
}
void UtilTest::testSlice() {
Strings v1;
Util::slice(v1, "name1=value1; name2=value2; name3=value3;", ';', true);
CPPUNIT_ASSERT_EQUAL(3, (int)v1.size());
v1.clear();
Util::slice(v1, "name1=value1; name2=value2; name3=value3", ';', true);
CPPUNIT_ASSERT_EQUAL(3, (int)v1.size());
Strings::iterator itr = v1.begin();
CPPUNIT_ASSERT_EQUAL(string("name1=value1"), *itr++);
CPPUNIT_ASSERT_EQUAL(string("name2=value2"), *itr++);
CPPUNIT_ASSERT_EQUAL(string("name3=value3"), *itr++);
v1.clear();
Util::slice(v1, "name1=value1; name2=value2; name3=value3", ';', false);
CPPUNIT_ASSERT_EQUAL(3, (int)v1.size());
itr = v1.begin();
CPPUNIT_ASSERT_EQUAL(string("name1=value1"), *itr++);
CPPUNIT_ASSERT_EQUAL(string(" name2=value2"), *itr++);
CPPUNIT_ASSERT_EQUAL(string(" name3=value3"), *itr++);
}
void UtilTest::testEndsWith() {
string target = "abcdefg";
string part = "fg";
CPPUNIT_ASSERT(Util::endsWith(target, part));
target = "abdefg";
part = "g";
CPPUNIT_ASSERT(Util::endsWith(target, part));
target = "abdefg";
part = "eg";
CPPUNIT_ASSERT(!Util::endsWith(target, part));
target = "g";
part = "eg";
CPPUNIT_ASSERT(!Util::endsWith(target, part));
target = "g";
part = "g";
CPPUNIT_ASSERT(Util::endsWith(target, part));
target = "g";
part = "";
CPPUNIT_ASSERT(Util::endsWith(target, part));
target = "";
part = "";
CPPUNIT_ASSERT(Util::endsWith(target, part));
target = "";
part = "g";
CPPUNIT_ASSERT(!Util::endsWith(target, part));
}
void UtilTest::testReplace() {
CPPUNIT_ASSERT_EQUAL(string("abc\n"), Util::replace("abc\r\n", "\r", ""));
CPPUNIT_ASSERT_EQUAL(string("abc"), Util::replace("abc\r\n", "\r\n", ""));
CPPUNIT_ASSERT_EQUAL(string(""), Util::replace("", "\r\n", ""));
CPPUNIT_ASSERT_EQUAL(string("abc"), Util::replace("abc", "", "a"));
CPPUNIT_ASSERT_EQUAL(string("xbc"), Util::replace("abc", "a", "x"));
}
void UtilTest::testStartsWith() {
string target;
string part;
target = "abcdefg";
part = "abc";
CPPUNIT_ASSERT(Util::startsWith(target, part));
target = "abcdefg";
part = "abx";
CPPUNIT_ASSERT(!Util::startsWith(target, part));
target = "abcdefg";
part = "bcd";
CPPUNIT_ASSERT(!Util::startsWith(target, part));
target = "";
part = "a";
CPPUNIT_ASSERT(!Util::startsWith(target, part));
target = "";
part = "";
CPPUNIT_ASSERT(Util::startsWith(target, part));
target = "a";
part = "";
CPPUNIT_ASSERT(Util::startsWith(target, part));
target = "a";
part = "a";
CPPUNIT_ASSERT(Util::startsWith(target, part));
}
void UtilTest::testGetContentDispositionFilename() {
string h1 = "attachment; filename=\"aria2.tar.bz2\"";
CPPUNIT_ASSERT_EQUAL(string("aria2.tar.bz2"), Util::getContentDispositionFilename(h1));
string h2 = "attachment; filename=\"\"";
CPPUNIT_ASSERT_EQUAL(string(""), Util::getContentDispositionFilename(h2));
string h3 = "attachment; filename=\"";
CPPUNIT_ASSERT_EQUAL(string(""), Util::getContentDispositionFilename(h3));
string h4 = "attachment;";
CPPUNIT_ASSERT_EQUAL(string(""), Util::getContentDispositionFilename(h4));
}
class Printer {
public:
template<class T>
void operator()(T t) {
cerr << t << ", ";
}
};
void UtilTest::testComputeFastSet() {
string ipaddr = "192.168.0.1";
unsigned char infoHash[20];
memset(infoHash, 0, sizeof(infoHash));
infoHash[0] = 0xff;
int pieces = 1000;
int fastSetSize = 10;
Integers fastSet = Util::computeFastSet(ipaddr, infoHash, pieces, fastSetSize);
//for_each(fastSet.begin(), fastSet.end(), Printer());
//cerr << endl;
int ans1[] = { 686, 459, 278, 200, 404, 834, 64, 203, 760, 950 };
Integers ansSet1(&ans1[0], &ans1[10]);
CPPUNIT_ASSERT(equal(fastSet.begin(), fastSet.end(), ansSet1.begin()));
ipaddr = "10.0.0.1";
fastSet = Util::computeFastSet(ipaddr, infoHash, pieces, fastSetSize);
int ans2[] = { 568, 188, 466, 452, 550, 662, 109, 226, 398, 11 };
Integers ansSet2(&ans2[0], &ans2[10]);
CPPUNIT_ASSERT(equal(fastSet.begin(), fastSet.end(), ansSet2.begin()));
}
void UtilTest::testRandomAlpha() {
CPPUNIT_ASSERT_EQUAL(string("rUopvKRn"), Util::randomAlpha(8));
}
void UtilTest::testFileChecksum() {
unsigned char buf[20];
string filename = "4096chunk.txt";
Util::fileChecksum(filename, buf, DIGEST_ALGO_SHA1);
string sha1 = Util::toHex(buf, 20);
CPPUNIT_ASSERT_EQUAL(string("608cabc0f2fa18c260cafd974516865c772363d5"),
sha1);
Util::fileChecksum(filename, buf, DIGEST_ALGO_MD5);
string md5 = Util::toHex(buf, 16);
CPPUNIT_ASSERT_EQUAL(string("82a7348c2e03731109d0cf45a7325b88"),
md5);
}
void UtilTest::testToUpper() {
string src = "608cabc0f2fa18c260cafd974516865c772363d5";
string upp = "608CABC0F2FA18C260CAFD974516865C772363D5";
CPPUNIT_ASSERT_EQUAL(upp, Util::toUpper(src));
}
void UtilTest::testToLower() {
string src = "608CABC0F2FA18C260CAFD974516865C772363D5";
string upp = "608cabc0f2fa18c260cafd974516865c772363d5";
CPPUNIT_ASSERT_EQUAL(upp, Util::toLower(src));
}
#include "SharedHandle.h"
void UtilTest::testUrldecode() {
string src = "http://aria2.sourceforge.net/aria2%200.7.0%20docs.html";
CPPUNIT_ASSERT_EQUAL(string("http://aria2.sourceforge.net/aria2 0.7.0 docs.html"),
Util::urldecode(src));
string src2 = "aria2+aria2";
CPPUNIT_ASSERT_EQUAL(string("aria2+aria2"), Util::urldecode(src2));
string src3 = "%5t%20";
CPPUNIT_ASSERT_EQUAL(string("%5t "), Util::urldecode(src3));
string src4 = "%";
CPPUNIT_ASSERT_EQUAL(string("%"), Util::urldecode(src4));
string src5 = "%3";
CPPUNIT_ASSERT_EQUAL(string("%3"), Util::urldecode(src5));
string src6 = "%2f";
CPPUNIT_ASSERT_EQUAL(string("/"), Util::urldecode(src6));
}