2009-10-22 15:35:33 +00:00
|
|
|
#include "util.h"
|
2008-11-27 15:29:15 +00:00
|
|
|
|
2014-12-30 17:17:44 +00:00
|
|
|
#include <cmath>
|
2009-10-22 14:43:42 +00:00
|
|
|
#include <cstring>
|
2008-11-27 15:29:15 +00:00
|
|
|
#include <string>
|
|
|
|
#include <iostream>
|
|
|
|
|
|
|
|
#include <cppunit/extensions/HelperMacros.h>
|
|
|
|
|
2007-11-04 12:26:12 +00:00
|
|
|
#include "FixedNumberRandomizer.h"
|
2007-11-10 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Don't connect server before checking file integrity at startup,
if
filesize and output file path are known.
* src/AbstractCommand.cc
* src/StreamFileAllocationEntry.cc
* src/Metalink2RequestGroup.cc
* src/RequestGroup.{h, cc}
* src/HttpResponseCommand.cc
* src/FtpNegotiationCommand.cc
Added DownloadFailureException. If it is thrown, RequestGroup
should
halt.
* src/AbstractCommand.cc
* src/DownloadFailureException.h
* src/RequestGroup.cc
Catch RecoverableException, instead of DlAbortEx.
* src/RequestGroupMan.cc
* src/FillRequestGroupCommand.cc
* src/MetaFileUtil.cc
* src/IteratableChunkChecksumValidator.cc
Now first parameter of MSG_DOWNLOAD_ABORTED is
gid(RequestGroup::
getGID())
* src/CheckIntegrityCommand.cc
* src/message.h
Print gid instead of idx.
* src/RequestGroupMan.cc
Removed exception throwers declaration.
* src/DirectDiskAdaptor.{h, cc}
* src/SocketCore.{h, cc}
* src/MultiDiskAdaptor.{h, cc}
* src/HttpConnection.{h, cc}
* src/HttpResponse.{h, cc}
* src/DiskAdaptor.{h, cc}
* src/CopyDiskAdaptor.{h, cc}
* src/MultiDiskAdaptor.{h, cc}
* src/HttpHeaderProcessor.{h, cc}
* src/AbstractSingleDiskAdaptor.{h, cc}
* src/Util.{h, cc}
* test/UtilTest.cc
* src/DefaultDiskWriter.{h, cc}
* src/FtpConnection.{h, cc}
* src/AbstractDiskWriter.{h, cc}
Removed duplicate code.
* src/StreamCheckIntegrityEntry.cc
Removed unnecessary include.
* src/DiskWriter.h
Included Exception.h
* src/option_processing.cc
Included 2 files and added doc
* src/TrackerWatcherCommand.cc
* src/SocketCore.cc (writeData): Fixed send error with GnuTLS.
2007-11-09 18:01:12 +00:00
|
|
|
#include "DlAbortEx.h"
|
2007-11-13 10:10:11 +00:00
|
|
|
#include "BitfieldMan.h"
|
2007-11-27 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Rewritten to add content-type support.
* src/DownloadHandler.{h, cc}
* src/BtPostDownloadHandler.{h, cc}
* test/BtPostDownloadHandlerTest.cc
* src/MetalinkPostDownloadHandler.{h, cc}
* test/MetalinkPostDownloadHandlerTest.cc
* src/PostDownloadHandler.{h, cc}
* src/DownloadHandlerConstants.{h, cc}
* src/RequestGroup.cc
* src/HttpResponseCommand.cc
* src/FtpNegotiationCommand.cc
* src/SingleFileDownloadContext.{h, cc}
* src/RequestGroup.h
* src/RequestGroupCriteria.h
* src/ContentTypeRequestGroupCriteria.h
Added 'mem' option value for --follow-metalink,
--follow-torrent.
If it is give, metalink/torrent file is not written to the disk,
but
just is kept in memory. Parsing is occurred on memory.
* src/MetalinkHelper.{h, cc}
* src/MetalinkProcessor.h
* src/Xml2MetalinkProcessor.{h, cc}
* test/Xml2MetalinkProcessorTest.cc
* src/DownloadHandlerFactory.{h, cc}
* test/DownloadHandlerFactoryTest.cc
* src/PreDownloadHandler.{h, cc}
* src/OptionHandlerFactory.cc
* src/DefaultBtContext.{h, cc}
* test/DefaultBtContextTest.cc
* src/version_usage.cc
* src/Metalink2RequestGroup.{h, cc}
* src/RequestGroup.{h, cc}
* src/a2functional.h
* test/a2functionalTest.cc
* src/MemoryBufferPreDownloadHandler.{h, cc}
* src/OptionHandlerImpl.h
* src/prefs.h
* src/Util.{h, cc}
* test/UtilTest.cc
Keep DownloadResult rather than RequestGroup after downloads to
reduce
memory usage.
* src/RequestGroupMan.{h, cc}
* src/DownloadEngine.cc
* src/BtDependency.{h, cc}: Changed the type of dependee from
WeakHandle to SharedHandle because WeakHandle could be null.
* src/RequestGroup.{h, cc}
* src/DownloadEngineFactory.cc
* src/DownloadResult.h
Set totalLength after download finished
* src/UnknownLengthPieceStorage.{h, cc}
Keep torrent file specified in metalink in memory.
* src/Metalink2RequestGroup.cc
* src/BtDependency.cc
* src/TrueRequestGroupCriteria.h
Fixed the bug: seekg is used where seekp should be used.
* src/ByteArrayDiskWriter.cc
* test/ByteArraydiskWriterTest.cc
2007-11-27 12:27:10 +00:00
|
|
|
#include "ByteArrayDiskWriter.h"
|
2008-02-08 15:53:45 +00:00
|
|
|
#include "FileEntry.h"
|
|
|
|
#include "File.h"
|
2009-03-04 15:53:56 +00:00
|
|
|
#include "array_fun.h"
|
2011-08-09 14:33:55 +00:00
|
|
|
#include "BufferedFile.h"
|
|
|
|
#include "TestUtil.h"
|
2011-10-19 14:14:13 +00:00
|
|
|
#include "SocketCore.h"
|
2006-02-17 13:35:04 +00:00
|
|
|
|
2008-02-08 15:53:45 +00:00
|
|
|
namespace aria2 {
|
2006-02-17 13:35:04 +00:00
|
|
|
|
2015-12-27 09:39:47 +00:00
|
|
|
class UtilTest1 : public CppUnit::TestFixture {
|
2006-02-17 13:35:04 +00:00
|
|
|
|
2015-02-07 15:26:36 +00:00
|
|
|
CPPUNIT_TEST_SUITE(UtilTest1);
|
2010-10-09 16:22:56 +00:00
|
|
|
CPPUNIT_TEST(testStrip);
|
2011-11-03 09:51:31 +00:00
|
|
|
CPPUNIT_TEST(testStripIter);
|
2011-11-04 13:27:58 +00:00
|
|
|
CPPUNIT_TEST(testLstripIter);
|
|
|
|
CPPUNIT_TEST(testLstripIter_char);
|
2010-10-10 03:39:00 +00:00
|
|
|
CPPUNIT_TEST(testDivide);
|
2006-02-17 13:35:04 +00:00
|
|
|
CPPUNIT_TEST(testSplit);
|
2011-11-04 13:27:58 +00:00
|
|
|
CPPUNIT_TEST(testSplitIter);
|
|
|
|
CPPUNIT_TEST(testSplitIterM);
|
|
|
|
CPPUNIT_TEST(testStreq);
|
|
|
|
CPPUNIT_TEST(testStrieq);
|
2011-11-11 13:50:18 +00:00
|
|
|
CPPUNIT_TEST(testStrifind);
|
2006-02-21 12:27:17 +00:00
|
|
|
CPPUNIT_TEST(testEndsWith);
|
2011-11-04 15:25:24 +00:00
|
|
|
CPPUNIT_TEST(testIendsWith);
|
2006-02-21 15:01:05 +00:00
|
|
|
CPPUNIT_TEST(testReplace);
|
2006-02-28 02:25:45 +00:00
|
|
|
CPPUNIT_TEST(testStartsWith);
|
2011-11-04 15:33:35 +00:00
|
|
|
CPPUNIT_TEST(testIstartsWith);
|
2006-05-09 15:54:14 +00:00
|
|
|
// may be moved to other helper class in the future.
|
|
|
|
CPPUNIT_TEST(testGetContentDispositionFilename);
|
2015-02-07 15:26:36 +00:00
|
|
|
CPPUNIT_TEST(testParseContentDisposition1);
|
|
|
|
CPPUNIT_TEST(testParseContentDisposition2);
|
2006-02-17 13:35:04 +00:00
|
|
|
CPPUNIT_TEST_SUITE_END();
|
|
|
|
|
2015-12-27 09:39:47 +00:00
|
|
|
private:
|
2006-02-17 13:35:04 +00:00
|
|
|
public:
|
2015-12-27 09:39:47 +00:00
|
|
|
void setUp() {}
|
2006-02-17 13:35:04 +00:00
|
|
|
|
2010-10-09 16:22:56 +00:00
|
|
|
void testStrip();
|
2011-11-03 09:51:31 +00:00
|
|
|
void testStripIter();
|
2011-11-04 13:27:58 +00:00
|
|
|
void testLstripIter();
|
|
|
|
void testLstripIter_char();
|
2010-10-10 03:39:00 +00:00
|
|
|
void testDivide();
|
2006-02-17 13:35:04 +00:00
|
|
|
void testSplit();
|
2011-11-04 13:27:58 +00:00
|
|
|
void testSplitIter();
|
|
|
|
void testSplitIterM();
|
|
|
|
void testStreq();
|
|
|
|
void testStrieq();
|
2011-11-11 13:50:18 +00:00
|
|
|
void testStrifind();
|
2006-02-21 12:27:17 +00:00
|
|
|
void testEndsWith();
|
2011-11-04 15:25:24 +00:00
|
|
|
void testIendsWith();
|
2006-02-21 15:01:05 +00:00
|
|
|
void testReplace();
|
2006-02-28 02:25:45 +00:00
|
|
|
void testStartsWith();
|
2011-11-04 15:33:35 +00:00
|
|
|
void testIstartsWith();
|
2006-05-09 15:54:14 +00:00
|
|
|
// may be moved to other helper class in the future.
|
|
|
|
void testGetContentDispositionFilename();
|
2015-02-07 15:26:36 +00:00
|
|
|
void testParseContentDisposition1();
|
|
|
|
void testParseContentDisposition2();
|
2006-02-17 13:35:04 +00:00
|
|
|
};
|
|
|
|
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_TEST_SUITE_REGISTRATION(UtilTest1);
|
2006-02-17 13:35:04 +00:00
|
|
|
|
2015-02-07 15:26:36 +00:00
|
|
|
void UtilTest1::testStrip()
|
2010-10-09 16:22:56 +00:00
|
|
|
{
|
|
|
|
std::string str1 = "aria2";
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str1, util::strip("aria2"));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str1, util::strip(" aria2"));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str1, util::strip("aria2 "));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str1, util::strip(" aria2 "));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str1, util::strip(" aria2 "));
|
|
|
|
std::string str2 = "aria2 debut";
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str2, util::strip("aria2 debut"));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str2, util::strip(" aria2 debut "));
|
|
|
|
std::string str3 = "";
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str3, util::strip(""));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str3, util::strip(" "));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str3, util::strip(" "));
|
|
|
|
std::string str4 = "A";
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str4, util::strip("A"));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str4, util::strip(" A "));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str4, util::strip(" A "));
|
|
|
|
}
|
|
|
|
|
2015-02-07 15:26:36 +00:00
|
|
|
void UtilTest1::testStripIter()
|
2011-11-03 09:51:31 +00:00
|
|
|
{
|
|
|
|
Scip p;
|
|
|
|
std::string str1 = "aria2";
|
|
|
|
std::string s = "aria2";
|
|
|
|
p = util::stripIter(s.begin(), s.end());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str1, std::string(p.first, p.second));
|
|
|
|
s = " aria2";
|
|
|
|
p = util::stripIter(s.begin(), s.end());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str1, std::string(p.first, p.second));
|
|
|
|
s = "aria2 ";
|
|
|
|
p = util::stripIter(s.begin(), s.end());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str1, std::string(p.first, p.second));
|
|
|
|
s = " aria2 ";
|
|
|
|
p = util::stripIter(s.begin(), s.end());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str1, std::string(p.first, p.second));
|
|
|
|
s = " aria2 ";
|
|
|
|
p = util::stripIter(s.begin(), s.end());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str1, std::string(p.first, p.second));
|
|
|
|
std::string str2 = "aria2 debut";
|
|
|
|
s = "aria2 debut";
|
|
|
|
p = util::stripIter(s.begin(), s.end());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str2, std::string(p.first, p.second));
|
|
|
|
s = " aria2 debut ";
|
|
|
|
p = util::stripIter(s.begin(), s.end());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str2, std::string(p.first, p.second));
|
|
|
|
std::string str3 = "";
|
|
|
|
s = "";
|
|
|
|
p = util::stripIter(s.begin(), s.end());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str3, std::string(p.first, p.second));
|
|
|
|
s = " ";
|
|
|
|
p = util::stripIter(s.begin(), s.end());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str3, std::string(p.first, p.second));
|
|
|
|
s = " ";
|
|
|
|
p = util::stripIter(s.begin(), s.end());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str3, std::string(p.first, p.second));
|
|
|
|
std::string str4 = "A";
|
|
|
|
s = "A";
|
|
|
|
p = util::stripIter(s.begin(), s.end());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str4, std::string(p.first, p.second));
|
|
|
|
s = " A ";
|
|
|
|
p = util::stripIter(s.begin(), s.end());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str4, std::string(p.first, p.second));
|
|
|
|
s = " A ";
|
|
|
|
p = util::stripIter(s.begin(), s.end());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(str4, std::string(p.first, p.second));
|
|
|
|
}
|
|
|
|
|
2015-02-07 15:26:36 +00:00
|
|
|
void UtilTest1::testLstripIter()
|
2011-11-04 13:27:58 +00:00
|
|
|
{
|
|
|
|
std::string::iterator r;
|
|
|
|
std::string s = "foo";
|
|
|
|
r = util::lstripIter(s.begin(), s.end());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo"), std::string(r, s.end()));
|
2012-10-01 14:52:22 +00:00
|
|
|
|
2011-11-04 13:27:58 +00:00
|
|
|
s = " foo bar ";
|
|
|
|
r = util::lstripIter(s.begin(), s.end());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo bar "), std::string(r, s.end()));
|
|
|
|
|
|
|
|
s = "f";
|
|
|
|
r = util::lstripIter(s.begin(), s.end());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("f"), std::string(r, s.end()));
|
|
|
|
|
|
|
|
s = "foo ";
|
|
|
|
r = util::lstripIter(s.begin(), s.end());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo "), std::string(r, s.end()));
|
|
|
|
}
|
|
|
|
|
2015-02-07 15:26:36 +00:00
|
|
|
void UtilTest1::testLstripIter_char()
|
2011-11-04 13:27:58 +00:00
|
|
|
{
|
|
|
|
std::string::iterator r;
|
|
|
|
std::string s = "foo";
|
|
|
|
r = util::lstripIter(s.begin(), s.end(), '$');
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo"), std::string(r, s.end()));
|
2012-10-01 14:52:22 +00:00
|
|
|
|
2011-11-04 13:27:58 +00:00
|
|
|
s = "$$foo$bar$$";
|
|
|
|
r = util::lstripIter(s.begin(), s.end(), '$');
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo$bar$$"), std::string(r, s.end()));
|
|
|
|
|
|
|
|
s = "f";
|
|
|
|
r = util::lstripIter(s.begin(), s.end(), '$');
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("f"), std::string(r, s.end()));
|
|
|
|
|
|
|
|
s = "foo$$";
|
|
|
|
r = util::lstripIter(s.begin(), s.end(), '$');
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo$$"), std::string(r, s.end()));
|
|
|
|
}
|
|
|
|
|
2015-12-27 09:39:47 +00:00
|
|
|
void UtilTest1::testDivide()
|
|
|
|
{
|
2011-11-03 14:09:03 +00:00
|
|
|
std::string s = "name=value";
|
2013-06-24 15:07:15 +00:00
|
|
|
auto p1 = util::divide(std::begin(s), std::end(s), '=');
|
2011-11-03 14:09:03 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("name"),
|
|
|
|
std::string(p1.first.first, p1.first.second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("value"),
|
|
|
|
std::string(p1.second.first, p1.second.second));
|
|
|
|
s = " name = value ";
|
2013-06-24 15:07:15 +00:00
|
|
|
p1 = util::divide(std::begin(s), std::end(s), '=');
|
2011-11-03 14:09:03 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("name"),
|
|
|
|
std::string(p1.first.first, p1.first.second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("value"),
|
|
|
|
std::string(p1.second.first, p1.second.second));
|
|
|
|
s = "=value";
|
2013-06-24 15:07:15 +00:00
|
|
|
p1 = util::divide(std::begin(s), std::end(s), '=');
|
2011-11-03 14:09:03 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""),
|
|
|
|
std::string(p1.first.first, p1.first.second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("value"),
|
|
|
|
std::string(p1.second.first, p1.second.second));
|
|
|
|
s = "name=";
|
2013-06-24 15:07:15 +00:00
|
|
|
p1 = util::divide(std::begin(s), std::end(s), '=');
|
2011-11-03 14:09:03 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("name"),
|
|
|
|
std::string(p1.first.first, p1.first.second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""),
|
|
|
|
std::string(p1.second.first, p1.second.second));
|
|
|
|
s = "name";
|
2013-06-24 15:07:15 +00:00
|
|
|
p1 = util::divide(std::begin(s), std::end(s), '=');
|
2011-11-03 14:09:03 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("name"),
|
|
|
|
std::string(p1.first.first, p1.first.second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""),
|
|
|
|
std::string(p1.second.first, p1.second.second));
|
2006-02-17 13:35:04 +00:00
|
|
|
}
|
|
|
|
|
2015-12-27 09:39:47 +00:00
|
|
|
void UtilTest1::testSplit()
|
|
|
|
{
|
2010-10-10 06:58:31 +00:00
|
|
|
std::vector<std::string> v;
|
2011-11-04 13:27:58 +00:00
|
|
|
std::string s = "k1; k2;; k3";
|
|
|
|
util::split(s.begin(), s.end(), std::back_inserter(v), ';', true);
|
2010-10-10 06:58:31 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)3, v.size());
|
|
|
|
std::vector<std::string>::iterator itr = v.begin();
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k1"), *itr++);
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k2"), *itr++);
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k3"), *itr++);
|
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
|
|
|
|
2010-10-10 06:58:31 +00:00
|
|
|
v.clear();
|
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
|
|
|
|
2011-11-04 13:27:58 +00:00
|
|
|
s = "k1; k2; k3";
|
|
|
|
util::split(s.begin(), s.end(), std::back_inserter(v), ';');
|
2010-10-10 06:58:31 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)3, v.size());
|
|
|
|
itr = v.begin();
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k1"), *itr++);
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(" k2"), *itr++);
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(" k3"), *itr++);
|
2010-02-17 16:09:19 +00:00
|
|
|
|
2010-10-10 06:58:31 +00:00
|
|
|
v.clear();
|
2010-02-17 16:09:19 +00:00
|
|
|
|
2011-11-04 13:27:58 +00:00
|
|
|
s = "k=v";
|
|
|
|
util::split(s.begin(), s.end(), std::back_inserter(v), ';', false, true);
|
2010-10-10 06:58:31 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, v.size());
|
|
|
|
itr = v.begin();
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k=v"), *itr++);
|
2010-02-17 16:09:19 +00:00
|
|
|
|
2010-10-10 06:58:31 +00:00
|
|
|
v.clear();
|
2010-02-17 16:09:19 +00:00
|
|
|
|
2011-11-04 13:27:58 +00:00
|
|
|
s = ";;k1;;k2;";
|
|
|
|
util::split(s.begin(), s.end(), std::back_inserter(v), ';', false, true);
|
2010-10-10 06:58:31 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)6, v.size());
|
|
|
|
itr = v.begin();
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), *itr++);
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), *itr++);
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k1"), *itr++);
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), *itr++);
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k2"), *itr++);
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), *itr++);
|
2010-02-17 16:09:19 +00:00
|
|
|
|
2010-10-10 06:58:31 +00:00
|
|
|
v.clear();
|
2010-02-17 16:09:19 +00:00
|
|
|
|
2011-11-04 13:27:58 +00:00
|
|
|
s = ";;k1;;k2;";
|
|
|
|
util::split(s.begin(), s.end(), std::back_inserter(v), ';');
|
2010-10-10 06:58:31 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)2, v.size());
|
|
|
|
itr = v.begin();
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k1"), *itr++);
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k2"), *itr++);
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
2011-11-04 13:27:58 +00:00
|
|
|
s = "k; ";
|
|
|
|
util::split(s.begin(), s.end(), std::back_inserter(v), ';');
|
2010-10-10 06:58:31 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)2, v.size());
|
|
|
|
itr = v.begin();
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k"), *itr++);
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(" "), *itr++);
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
2011-11-04 13:27:58 +00:00
|
|
|
s = " ";
|
|
|
|
util::split(s.begin(), s.end(), std::back_inserter(v), ';', true, true);
|
2010-10-10 06:58:31 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), v[0]);
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
2011-11-04 13:27:58 +00:00
|
|
|
s = " ";
|
|
|
|
util::split(s.begin(), s.end(), std::back_inserter(v), ';', true);
|
2010-10-10 06:58:31 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)0, v.size());
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
2011-11-04 13:27:58 +00:00
|
|
|
s = " ";
|
|
|
|
util::split(s.begin(), s.end(), std::back_inserter(v), ';');
|
2010-10-10 06:58:31 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(" "), v[0]);
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
2011-11-04 13:27:58 +00:00
|
|
|
s = ";";
|
|
|
|
util::split(s.begin(), s.end(), std::back_inserter(v), ';');
|
2010-10-10 06:58:31 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)0, v.size());
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
2011-11-04 13:27:58 +00:00
|
|
|
s = ";";
|
|
|
|
util::split(s.begin(), s.end(), std::back_inserter(v), ';', false, true);
|
2010-10-10 06:58:31 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)2, v.size());
|
|
|
|
itr = v.begin();
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), *itr++);
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), *itr++);
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
2011-11-04 13:27:58 +00:00
|
|
|
s = "";
|
|
|
|
util::split(s.begin(), s.end(), std::back_inserter(v), ';', false, true);
|
2010-10-10 06:58:31 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), v[0]);
|
2006-02-17 13:35:04 +00:00
|
|
|
}
|
2006-02-21 12:27:17 +00:00
|
|
|
|
2015-12-27 09:39:47 +00:00
|
|
|
void UtilTest1::testSplitIter()
|
|
|
|
{
|
2011-11-04 13:27:58 +00:00
|
|
|
std::vector<Scip> v;
|
|
|
|
std::string s = "k1; k2;; k3";
|
|
|
|
util::splitIter(s.begin(), s.end(), std::back_inserter(v), ';', true);
|
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)3, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k1"), std::string(v[0].first, v[0].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k2"), std::string(v[1].first, v[1].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k3"), std::string(v[2].first, v[2].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = "k1; k2; k3";
|
|
|
|
util::splitIter(s.begin(), s.end(), std::back_inserter(v), ';');
|
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)3, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k1"), std::string(v[0].first, v[0].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(" k2"),
|
|
|
|
std::string(v[1].first, v[1].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(" k3"),
|
|
|
|
std::string(v[2].first, v[2].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = "k=v";
|
|
|
|
util::splitIter(s.begin(), s.end(), std::back_inserter(v), ';', false, true);
|
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k=v"),
|
|
|
|
std::string(v[0].first, v[0].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = ";;k1;;k2;";
|
|
|
|
util::splitIter(s.begin(), s.end(), std::back_inserter(v), ';', false, true);
|
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)6, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(v[0].first, v[0].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(v[1].first, v[1].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k1"), std::string(v[2].first, v[2].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(v[3].first, v[3].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k2"), std::string(v[4].first, v[4].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(v[5].first, v[5].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = ";;k1;;k2;";
|
|
|
|
util::splitIter(s.begin(), s.end(), std::back_inserter(v), ';');
|
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)2, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k1"), std::string(v[0].first, v[0].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k2"), std::string(v[1].first, v[1].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = "k; ";
|
|
|
|
util::splitIter(s.begin(), s.end(), std::back_inserter(v), ';');
|
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)2, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k"), std::string(v[0].first, v[0].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(" "), std::string(v[1].first, v[1].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = " ";
|
|
|
|
util::splitIter(s.begin(), s.end(), std::back_inserter(v), ';', true, true);
|
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(v[0].first, v[0].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = " ";
|
|
|
|
util::splitIter(s.begin(), s.end(), std::back_inserter(v), ';', true);
|
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)0, v.size());
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = " ";
|
|
|
|
util::splitIter(s.begin(), s.end(), std::back_inserter(v), ';');
|
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(" "), std::string(v[0].first, v[0].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = ";";
|
|
|
|
util::splitIter(s.begin(), s.end(), std::back_inserter(v), ';');
|
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)0, v.size());
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = ";";
|
|
|
|
util::splitIter(s.begin(), s.end(), std::back_inserter(v), ';', false, true);
|
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)2, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(v[0].first, v[0].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(v[1].first, v[1].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = "";
|
|
|
|
util::splitIter(s.begin(), s.end(), std::back_inserter(v), ';', false, true);
|
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(v[0].first, v[0].second));
|
|
|
|
}
|
|
|
|
|
2015-12-27 09:39:47 +00:00
|
|
|
void UtilTest1::testSplitIterM()
|
|
|
|
{
|
2012-01-10 16:03:38 +00:00
|
|
|
const char d[] = ";";
|
|
|
|
const char md[] = "; ";
|
2011-11-04 13:27:58 +00:00
|
|
|
std::vector<Scip> v;
|
|
|
|
std::string s = "k1; k2;; k3";
|
2012-01-10 16:03:38 +00:00
|
|
|
util::splitIterM(s.begin(), s.end(), std::back_inserter(v), d, true);
|
2011-11-04 13:27:58 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)3, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k1"), std::string(v[0].first, v[0].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k2"), std::string(v[1].first, v[1].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k3"), std::string(v[2].first, v[2].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = "k1; k2; k3";
|
2012-01-10 16:03:38 +00:00
|
|
|
util::splitIterM(s.begin(), s.end(), std::back_inserter(v), d);
|
2011-11-04 13:27:58 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)3, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k1"), std::string(v[0].first, v[0].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(" k2"),
|
|
|
|
std::string(v[1].first, v[1].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(" k3"),
|
|
|
|
std::string(v[2].first, v[2].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = "k1; k2; k3";
|
2012-01-10 16:03:38 +00:00
|
|
|
util::splitIterM(s.begin(), s.end(), std::back_inserter(v), md);
|
2011-11-04 13:27:58 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)3, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k1"), std::string(v[0].first, v[0].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k2"), std::string(v[1].first, v[1].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k3"), std::string(v[2].first, v[2].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = "k1; k2; k3;";
|
2012-01-10 16:03:38 +00:00
|
|
|
util::splitIterM(s.begin(), s.end(), std::back_inserter(v), md, false, true);
|
2011-11-04 13:27:58 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)6, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k1"), std::string(v[0].first, v[0].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(v[1].first, v[1].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k2"), std::string(v[2].first, v[2].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(v[3].first, v[3].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k3"), std::string(v[4].first, v[4].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(v[5].first, v[5].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = "k=v";
|
2012-01-10 16:03:38 +00:00
|
|
|
util::splitIterM(s.begin(), s.end(), std::back_inserter(v), d, false, true);
|
2011-11-04 13:27:58 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k=v"),
|
|
|
|
std::string(v[0].first, v[0].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = ";;k1;;k2;";
|
2012-01-10 16:03:38 +00:00
|
|
|
util::splitIterM(s.begin(), s.end(), std::back_inserter(v), d, false, true);
|
2011-11-04 13:27:58 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)6, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(v[0].first, v[0].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(v[1].first, v[1].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k1"), std::string(v[2].first, v[2].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(v[3].first, v[3].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k2"), std::string(v[4].first, v[4].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(v[5].first, v[5].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = ";;k1;;k2;";
|
2012-01-10 16:03:38 +00:00
|
|
|
util::splitIterM(s.begin(), s.end(), std::back_inserter(v), d);
|
2011-11-04 13:27:58 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)2, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k1"), std::string(v[0].first, v[0].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k2"), std::string(v[1].first, v[1].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = "k; ";
|
2012-01-10 16:03:38 +00:00
|
|
|
util::splitIterM(s.begin(), s.end(), std::back_inserter(v), d);
|
2011-11-04 13:27:58 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)2, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("k"), std::string(v[0].first, v[0].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(" "), std::string(v[1].first, v[1].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = " ";
|
2012-01-10 16:03:38 +00:00
|
|
|
util::splitIterM(s.begin(), s.end(), std::back_inserter(v), d, true, true);
|
2011-11-04 13:27:58 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(v[0].first, v[0].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = " ";
|
2012-01-10 16:03:38 +00:00
|
|
|
util::splitIterM(s.begin(), s.end(), std::back_inserter(v), d, true);
|
2011-11-04 13:27:58 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)0, v.size());
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = " ";
|
2012-01-10 16:03:38 +00:00
|
|
|
util::splitIterM(s.begin(), s.end(), std::back_inserter(v), d);
|
2011-11-04 13:27:58 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(" "), std::string(v[0].first, v[0].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = ";";
|
2012-01-10 16:03:38 +00:00
|
|
|
util::splitIterM(s.begin(), s.end(), std::back_inserter(v), d);
|
2011-11-04 13:27:58 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)0, v.size());
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = ";";
|
2012-01-10 16:03:38 +00:00
|
|
|
util::splitIterM(s.begin(), s.end(), std::back_inserter(v), d, false, true);
|
2011-11-04 13:27:58 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)2, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(v[0].first, v[0].second));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(v[1].first, v[1].second));
|
|
|
|
|
|
|
|
v.clear();
|
|
|
|
|
|
|
|
s = "";
|
2012-01-10 16:03:38 +00:00
|
|
|
util::splitIterM(s.begin(), s.end(), std::back_inserter(v), d, false, true);
|
2011-11-04 13:27:58 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL((size_t)1, v.size());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(v[0].first, v[0].second));
|
|
|
|
}
|
|
|
|
|
2015-12-27 09:39:47 +00:00
|
|
|
void UtilTest1::testEndsWith()
|
|
|
|
{
|
2008-02-08 15:53:45 +00:00
|
|
|
std::string target = "abcdefg";
|
|
|
|
std::string part = "fg";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(
|
|
|
|
util::endsWith(target.begin(), target.end(), part.begin(), part.end()));
|
2006-02-21 12:27:17 +00:00
|
|
|
|
|
|
|
target = "abdefg";
|
|
|
|
part = "g";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(
|
|
|
|
util::endsWith(target.begin(), target.end(), part.begin(), part.end()));
|
2006-02-21 12:27:17 +00:00
|
|
|
|
|
|
|
target = "abdefg";
|
|
|
|
part = "eg";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(
|
|
|
|
!util::endsWith(target.begin(), target.end(), part.begin(), part.end()));
|
2006-02-21 12:27:17 +00:00
|
|
|
|
|
|
|
target = "g";
|
|
|
|
part = "eg";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(
|
|
|
|
!util::endsWith(target.begin(), target.end(), part.begin(), part.end()));
|
2006-02-21 12:27:17 +00:00
|
|
|
|
|
|
|
target = "g";
|
|
|
|
part = "g";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(
|
|
|
|
util::endsWith(target.begin(), target.end(), part.begin(), part.end()));
|
2006-02-21 12:27:17 +00:00
|
|
|
|
|
|
|
target = "g";
|
|
|
|
part = "";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(
|
|
|
|
util::endsWith(target.begin(), target.end(), part.begin(), part.end()));
|
2006-02-21 12:27:17 +00:00
|
|
|
|
|
|
|
target = "";
|
|
|
|
part = "";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(
|
|
|
|
util::endsWith(target.begin(), target.end(), part.begin(), part.end()));
|
2006-02-21 12:27:17 +00:00
|
|
|
|
|
|
|
target = "";
|
|
|
|
part = "g";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(
|
|
|
|
!util::endsWith(target.begin(), target.end(), part.begin(), part.end()));
|
2011-11-04 13:27:58 +00:00
|
|
|
}
|
|
|
|
|
2015-12-27 09:39:47 +00:00
|
|
|
void UtilTest1::testIendsWith()
|
|
|
|
{
|
2011-11-04 15:25:24 +00:00
|
|
|
std::string target = "abcdefg";
|
|
|
|
std::string part = "Fg";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(
|
|
|
|
util::iendsWith(target.begin(), target.end(), part.begin(), part.end()));
|
2011-11-04 15:25:24 +00:00
|
|
|
|
|
|
|
target = "abdefg";
|
|
|
|
part = "ef";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(
|
|
|
|
!util::iendsWith(target.begin(), target.end(), part.begin(), part.end()));
|
2011-11-04 15:25:24 +00:00
|
|
|
}
|
|
|
|
|
2015-02-07 15:26:36 +00:00
|
|
|
void UtilTest1::testStreq()
|
2011-11-04 13:27:58 +00:00
|
|
|
{
|
|
|
|
std::string s1, s2;
|
|
|
|
s1 = "foo";
|
|
|
|
s2 = "foo";
|
|
|
|
CPPUNIT_ASSERT(util::streq(s1.begin(), s1.end(), s2.begin(), s2.end()));
|
2012-01-10 16:50:35 +00:00
|
|
|
CPPUNIT_ASSERT(util::streq(s1.begin(), s1.end(), s2.c_str()));
|
2011-11-04 13:27:58 +00:00
|
|
|
|
|
|
|
s2 = "fooo";
|
|
|
|
CPPUNIT_ASSERT(!util::streq(s1.begin(), s1.end(), s2.begin(), s2.end()));
|
2012-01-10 16:50:35 +00:00
|
|
|
CPPUNIT_ASSERT(!util::streq(s1.begin(), s1.end(), s2.c_str()));
|
2011-11-04 13:27:58 +00:00
|
|
|
|
|
|
|
s2 = "fo";
|
|
|
|
CPPUNIT_ASSERT(!util::streq(s1.begin(), s1.end(), s2.begin(), s2.end()));
|
2012-01-10 16:50:35 +00:00
|
|
|
CPPUNIT_ASSERT(!util::streq(s1.begin(), s1.end(), s2.c_str()));
|
2011-11-04 13:27:58 +00:00
|
|
|
|
|
|
|
s2 = "";
|
|
|
|
CPPUNIT_ASSERT(!util::streq(s1.begin(), s1.end(), s2.begin(), s2.end()));
|
2012-01-10 16:50:35 +00:00
|
|
|
CPPUNIT_ASSERT(!util::streq(s1.begin(), s1.end(), s2.c_str()));
|
2011-11-04 13:27:58 +00:00
|
|
|
|
|
|
|
s1 = "";
|
|
|
|
CPPUNIT_ASSERT(util::streq(s1.begin(), s1.end(), s2.begin(), s2.end()));
|
2012-01-10 16:50:35 +00:00
|
|
|
CPPUNIT_ASSERT(util::streq(s1.begin(), s1.end(), s2.c_str()));
|
2011-11-04 13:27:58 +00:00
|
|
|
}
|
|
|
|
|
2015-02-07 15:26:36 +00:00
|
|
|
void UtilTest1::testStrieq()
|
2011-11-04 13:27:58 +00:00
|
|
|
{
|
|
|
|
std::string s1, s2;
|
|
|
|
s1 = "foo";
|
|
|
|
s2 = "foo";
|
|
|
|
CPPUNIT_ASSERT(util::strieq(s1.begin(), s1.end(), s2.begin(), s2.end()));
|
2012-01-10 16:50:35 +00:00
|
|
|
CPPUNIT_ASSERT(util::strieq(s1.begin(), s1.end(), s2.c_str()));
|
2011-11-04 13:27:58 +00:00
|
|
|
|
|
|
|
s1 = "FoO";
|
|
|
|
s2 = "fOo";
|
|
|
|
CPPUNIT_ASSERT(util::strieq(s1.begin(), s1.end(), s2.begin(), s2.end()));
|
2012-01-10 16:50:35 +00:00
|
|
|
CPPUNIT_ASSERT(util::strieq(s1.begin(), s1.end(), s2.c_str()));
|
2011-11-04 13:27:58 +00:00
|
|
|
|
|
|
|
s2 = "fooo";
|
|
|
|
CPPUNIT_ASSERT(!util::strieq(s1.begin(), s1.end(), s2.begin(), s2.end()));
|
2012-01-10 16:50:35 +00:00
|
|
|
CPPUNIT_ASSERT(!util::strieq(s1.begin(), s1.end(), s2.c_str()));
|
2011-11-04 13:27:58 +00:00
|
|
|
|
|
|
|
s2 = "fo";
|
|
|
|
CPPUNIT_ASSERT(!util::strieq(s1.begin(), s1.end(), s2.begin(), s2.end()));
|
2012-01-10 16:50:35 +00:00
|
|
|
CPPUNIT_ASSERT(!util::strieq(s1.begin(), s1.end(), s2.c_str()));
|
2011-11-04 13:27:58 +00:00
|
|
|
|
|
|
|
s2 = "";
|
|
|
|
CPPUNIT_ASSERT(!util::strieq(s1.begin(), s1.end(), s2.begin(), s2.end()));
|
2012-01-10 16:50:35 +00:00
|
|
|
CPPUNIT_ASSERT(!util::strieq(s1.begin(), s1.end(), s2.c_str()));
|
2011-11-04 13:27:58 +00:00
|
|
|
|
|
|
|
s1 = "";
|
|
|
|
CPPUNIT_ASSERT(util::strieq(s1.begin(), s1.end(), s2.begin(), s2.end()));
|
2012-01-10 16:50:35 +00:00
|
|
|
CPPUNIT_ASSERT(util::strieq(s1.begin(), s1.end(), s2.c_str()));
|
2006-02-21 12:27:17 +00:00
|
|
|
}
|
2006-02-21 15:01:05 +00:00
|
|
|
|
2015-02-07 15:26:36 +00:00
|
|
|
void UtilTest1::testStrifind()
|
2011-11-11 13:50:18 +00:00
|
|
|
{
|
|
|
|
std::string s1, s2;
|
|
|
|
s1 = "yamagakani mukashi wo toheba hARU no tuki";
|
|
|
|
s2 = "HaRu";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(util::strifind(s1.begin(), s1.end(), s2.begin(), s2.end()) !=
|
|
|
|
s1.end());
|
2011-11-11 13:50:18 +00:00
|
|
|
s2 = "aki";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(util::strifind(s1.begin(), s1.end(), s2.begin(), s2.end()) ==
|
|
|
|
s1.end());
|
2011-11-11 13:50:18 +00:00
|
|
|
s1 = "h";
|
|
|
|
s2 = "HH";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(util::strifind(s1.begin(), s1.end(), s2.begin(), s2.end()) ==
|
|
|
|
s1.end());
|
2011-11-11 13:50:18 +00:00
|
|
|
}
|
|
|
|
|
2015-12-27 09:39:47 +00:00
|
|
|
void UtilTest1::testReplace()
|
|
|
|
{
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("abc\n"),
|
|
|
|
util::replace("abc\r\n", "\r", ""));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("abc"),
|
|
|
|
util::replace("abc\r\n", "\r\n", ""));
|
2009-10-22 15:09:00 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""), util::replace("", "\r\n", ""));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("abc"), util::replace("abc", "", "a"));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("xbc"), util::replace("abc", "a", "x"));
|
2006-02-21 15:01:05 +00:00
|
|
|
}
|
2006-02-28 02:25:45 +00:00
|
|
|
|
2015-12-27 09:39:47 +00:00
|
|
|
void UtilTest1::testStartsWith()
|
|
|
|
{
|
2008-02-08 15:53:45 +00:00
|
|
|
std::string target;
|
|
|
|
std::string part;
|
2006-02-28 02:25:45 +00:00
|
|
|
|
|
|
|
target = "abcdefg";
|
|
|
|
part = "abc";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(
|
|
|
|
util::startsWith(target.begin(), target.end(), part.begin(), part.end()));
|
2012-01-10 16:50:35 +00:00
|
|
|
CPPUNIT_ASSERT(util::startsWith(target.begin(), target.end(), part.c_str()));
|
2006-02-28 02:25:45 +00:00
|
|
|
|
|
|
|
target = "abcdefg";
|
|
|
|
part = "abx";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(!util::startsWith(target.begin(), target.end(), part.begin(),
|
|
|
|
part.end()));
|
2012-01-10 16:50:35 +00:00
|
|
|
CPPUNIT_ASSERT(!util::startsWith(target.begin(), target.end(), part.c_str()));
|
2006-02-28 02:25:45 +00:00
|
|
|
|
|
|
|
target = "abcdefg";
|
|
|
|
part = "bcd";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(!util::startsWith(target.begin(), target.end(), part.begin(),
|
|
|
|
part.end()));
|
2012-01-10 16:50:35 +00:00
|
|
|
CPPUNIT_ASSERT(!util::startsWith(target.begin(), target.end(), part.c_str()));
|
2006-02-28 02:25:45 +00:00
|
|
|
|
|
|
|
target = "";
|
|
|
|
part = "a";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(!util::startsWith(target.begin(), target.end(), part.begin(),
|
|
|
|
part.end()));
|
2012-01-10 16:50:35 +00:00
|
|
|
CPPUNIT_ASSERT(!util::startsWith(target.begin(), target.end(), part.c_str()));
|
2006-02-28 02:25:45 +00:00
|
|
|
|
|
|
|
target = "";
|
|
|
|
part = "";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(
|
|
|
|
util::startsWith(target.begin(), target.end(), part.begin(), part.end()));
|
2012-01-10 16:50:35 +00:00
|
|
|
CPPUNIT_ASSERT(util::startsWith(target.begin(), target.end(), part.c_str()));
|
2012-10-01 14:52:22 +00:00
|
|
|
|
2006-02-28 02:25:45 +00:00
|
|
|
target = "a";
|
|
|
|
part = "";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(
|
|
|
|
util::startsWith(target.begin(), target.end(), part.begin(), part.end()));
|
2012-01-10 16:50:35 +00:00
|
|
|
CPPUNIT_ASSERT(util::startsWith(target.begin(), target.end(), part.c_str()));
|
2006-02-28 02:25:45 +00:00
|
|
|
|
|
|
|
target = "a";
|
|
|
|
part = "a";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(
|
|
|
|
util::startsWith(target.begin(), target.end(), part.begin(), part.end()));
|
2012-01-10 16:50:35 +00:00
|
|
|
CPPUNIT_ASSERT(util::startsWith(target.begin(), target.end(), part.c_str()));
|
2006-02-28 02:25:45 +00:00
|
|
|
}
|
2006-05-09 15:54:14 +00:00
|
|
|
|
2015-12-27 09:39:47 +00:00
|
|
|
void UtilTest1::testIstartsWith()
|
|
|
|
{
|
2011-11-04 15:33:35 +00:00
|
|
|
std::string target;
|
|
|
|
std::string part;
|
|
|
|
|
|
|
|
target = "abcdefg";
|
|
|
|
part = "aBc";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(util::istartsWith(target.begin(), target.end(), part.begin(),
|
|
|
|
part.end()));
|
2012-01-10 16:50:35 +00:00
|
|
|
CPPUNIT_ASSERT(util::istartsWith(target.begin(), target.end(), part.c_str()));
|
2011-11-04 15:33:35 +00:00
|
|
|
|
|
|
|
target = "abcdefg";
|
|
|
|
part = "abx";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT(!util::istartsWith(target.begin(), target.end(), part.begin(),
|
|
|
|
part.end()));
|
|
|
|
CPPUNIT_ASSERT(
|
|
|
|
!util::istartsWith(target.begin(), target.end(), part.c_str()));
|
2011-11-04 15:33:35 +00:00
|
|
|
}
|
|
|
|
|
2015-12-27 09:39:47 +00:00
|
|
|
void UtilTest1::testGetContentDispositionFilename()
|
|
|
|
{
|
2012-10-27 02:41:56 +00:00
|
|
|
std::string val;
|
2006-05-09 15:54:14 +00:00
|
|
|
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename=\"aria2.tar.bz2\"";
|
2011-11-03 14:09:03 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("aria2.tar.bz2"),
|
2012-10-27 02:41:56 +00:00
|
|
|
util::getContentDispositionFilename(val));
|
2011-11-03 14:09:03 +00:00
|
|
|
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename=\"\"";
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""),
|
|
|
|
util::getContentDispositionFilename(val));
|
2007-07-18 11:36:41 +00:00
|
|
|
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename=\"";
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""),
|
|
|
|
util::getContentDispositionFilename(val));
|
2007-07-18 11:36:41 +00:00
|
|
|
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename= \" aria2.tar.bz2 \"";
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(" aria2.tar.bz2 "),
|
|
|
|
util::getContentDispositionFilename(val));
|
2007-07-18 11:36:41 +00:00
|
|
|
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename=dir/file";
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""),
|
|
|
|
util::getContentDispositionFilename(val));
|
2007-07-18 11:36:41 +00:00
|
|
|
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename=dir\\file";
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""),
|
|
|
|
util::getContentDispositionFilename(val));
|
2007-07-18 11:36:41 +00:00
|
|
|
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename=\"dir/file\"";
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""),
|
|
|
|
util::getContentDispositionFilename(val));
|
2007-07-18 11:36:41 +00:00
|
|
|
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename=\"dir\\\\file\"";
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""),
|
|
|
|
util::getContentDispositionFilename(val));
|
2007-07-18 11:36:41 +00:00
|
|
|
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename=\"/etc/passwd\"";
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""),
|
|
|
|
util::getContentDispositionFilename(val));
|
2007-07-18 11:36:41 +00:00
|
|
|
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename=\"..\"";
|
2010-03-07 15:06:48 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""),
|
2012-10-27 02:41:56 +00:00
|
|
|
util::getContentDispositionFilename(val));
|
2010-05-06 12:49:50 +00:00
|
|
|
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename=..";
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(""),
|
|
|
|
util::getContentDispositionFilename(val));
|
2010-05-06 12:49:50 +00:00
|
|
|
|
2012-06-28 14:18:50 +00:00
|
|
|
// Unescaping %2E%2E%2F produces "../". But since we won't unescape,
|
|
|
|
// we just accept it as is.
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename=\"%2E%2E%2Ffoo.html\"";
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("%2E%2E%2Ffoo.html"),
|
|
|
|
util::getContentDispositionFilename(val));
|
|
|
|
|
|
|
|
// iso-8859-1 string will be converted to utf-8.
|
|
|
|
val = "attachment; filename*=iso-8859-1''foo-%E4.html";
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo-ä.html"),
|
|
|
|
util::getContentDispositionFilename(val));
|
|
|
|
|
|
|
|
val = "attachment; filename*= UTF-8''foo-%c3%a4.html";
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo-ä.html"),
|
|
|
|
util::getContentDispositionFilename(val));
|
|
|
|
|
|
|
|
// iso-8859-1 string will be converted to utf-8.
|
|
|
|
val = "attachment; filename=\"foo-%E4.html\"";
|
|
|
|
val = util::percentDecode(val.begin(), val.end());
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo-ä.html"),
|
|
|
|
util::getContentDispositionFilename(val));
|
|
|
|
}
|
|
|
|
|
2015-12-27 09:39:47 +00:00
|
|
|
void UtilTest1::testParseContentDisposition1()
|
|
|
|
{
|
2015-06-21 09:04:30 +00:00
|
|
|
char dest[1_k];
|
2012-10-27 02:41:56 +00:00
|
|
|
size_t destlen = sizeof(dest);
|
2015-12-27 09:39:47 +00:00
|
|
|
const char* cs;
|
2012-10-27 02:41:56 +00:00
|
|
|
size_t cslen;
|
|
|
|
std::string val;
|
|
|
|
|
|
|
|
// test cases from http://greenbytes.de/tech/tc2231/
|
|
|
|
// inlonly
|
|
|
|
val = "inline";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)0, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// inlonlyquoted
|
|
|
|
val = "\"inline\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// inlwithasciifilename
|
|
|
|
val = "inline; filename=\"foo.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)8, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo.html"),
|
|
|
|
std::string(&dest[0], &dest[8]));
|
|
|
|
|
|
|
|
// inlwithfnattach
|
|
|
|
val = "inline; filename=\"Not an attachment!\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)18, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("Not an attachment!"),
|
|
|
|
std::string(&dest[0], &dest[18]));
|
|
|
|
|
|
|
|
// inlwithasciifilenamepdf
|
|
|
|
val = "inline; filename=\"foo.pdf\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)7, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo.pdf"), std::string(&dest[0], &dest[7]));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attwithasciifilename25
|
|
|
|
val = "attachment; filename=\"0000000000111111111122222\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)25, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("0000000000111111111122222"),
|
|
|
|
std::string(&dest[0], &dest[25]));
|
|
|
|
|
|
|
|
// attwithasciifilename35
|
|
|
|
val = "attachment; filename=\"00000000001111111111222222222233333\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)35, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("00000000001111111111222222222233333"),
|
|
|
|
std::string(&dest[0], &dest[35]));
|
|
|
|
|
2010-02-19 10:54:40 +00:00
|
|
|
// attwithasciifnescapedchar
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename=\"f\\oo.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)8, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo.html"),
|
|
|
|
std::string(&dest[0], &dest[8]));
|
|
|
|
|
|
|
|
// attwithasciifnescapedquote
|
|
|
|
val = "attachment; filename=\"\\\"quoting\\\" tested.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)21, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("\"quoting\" tested.html"),
|
|
|
|
std::string(&dest[0], &dest[21]));
|
|
|
|
|
|
|
|
// attwithquotedsemicolon
|
|
|
|
val = "attachment; filename=\"Here's a semicolon;.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)24, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("Here's a semicolon;.html"),
|
|
|
|
std::string(&dest[0], &dest[24]));
|
|
|
|
|
|
|
|
// attwithfilenameandextparam
|
|
|
|
val = "attachment; foo=\"bar\"; filename=\"foo.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)8, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo.html"),
|
|
|
|
std::string(&dest[0], &dest[8]));
|
|
|
|
|
|
|
|
// attwithfilenameandextparamescaped
|
|
|
|
val = "attachment; foo=\"\\\"\\\\\";filename=\"foo.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)8, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo.html"),
|
|
|
|
std::string(&dest[0], &dest[8]));
|
|
|
|
|
2010-02-19 10:54:40 +00:00
|
|
|
// attwithasciifilenameucase
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; FILENAME=\"foo.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)8, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo.html"),
|
|
|
|
std::string(&dest[0], &dest[8]));
|
|
|
|
|
|
|
|
// attwithasciifilenamenq
|
|
|
|
val = "attachment; filename=foo.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)8, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo.html"),
|
|
|
|
std::string(&dest[0], &dest[8]));
|
|
|
|
|
|
|
|
// attwithtokfncommanq
|
|
|
|
val = "attachment; filename=foo,bar.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attwithasciifilenamenqs
|
|
|
|
val = "attachment; filename=foo.html ;";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attemptyparam
|
|
|
|
val = "attachment; ;filename=foo";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attwithasciifilenamenqws
|
|
|
|
val = "attachment; filename=foo bar.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attwithfntokensq
|
|
|
|
val = "attachment; filename='foo.bar'";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)9, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("'foo.bar'"),
|
|
|
|
std::string(&dest[0], &dest[9]));
|
|
|
|
|
|
|
|
// attwithisofnplain
|
|
|
|
// attachment; filename="foo-ä.html"
|
|
|
|
val = "attachment; filename=\"foo-%E4.html\"";
|
|
|
|
val = util::percentDecode(val.begin(), val.end());
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)10, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo-ä.html"),
|
|
|
|
util::iso8859p1ToUtf8(std::string(&dest[0], &dest[10])));
|
|
|
|
|
|
|
|
// attwithutf8fnplain
|
|
|
|
// attachment; filename="foo-ä.html"
|
|
|
|
val = "attachment; filename=\"foo-%C3%A4.html\"";
|
|
|
|
val = util::percentDecode(val.begin(), val.end());
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)11, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo-ä.html"),
|
|
|
|
util::iso8859p1ToUtf8(std::string(&dest[0], &dest[11])));
|
|
|
|
|
|
|
|
// attwithfnrawpctenca
|
|
|
|
val = "attachment; filename=\"foo-%41.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)12, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo-%41.html"),
|
|
|
|
std::string(&dest[0], &dest[12]));
|
|
|
|
|
|
|
|
// attwithfnusingpct
|
|
|
|
val = "attachment; filename=\"50%.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)8, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("50%.html"),
|
|
|
|
std::string(&dest[0], &dest[8]));
|
|
|
|
|
|
|
|
// attwithfnrawpctencaq
|
|
|
|
val = "attachment; filename=\"foo-%\\41.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)12, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo-%41.html"),
|
|
|
|
std::string(&dest[0], &dest[12]));
|
|
|
|
|
|
|
|
// attwithnamepct
|
|
|
|
val = "attachment; name=\"foo-%41.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)0, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attwithfilenamepctandiso
|
|
|
|
// attachment; filename="ä-%41.html"
|
|
|
|
val = "attachment; filename=\"%E4-%2541.html\"";
|
|
|
|
val = util::percentDecode(val.begin(), val.end());
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)10, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("ä-%41.html"),
|
|
|
|
util::iso8859p1ToUtf8(std::string(&dest[0], &dest[10])));
|
|
|
|
|
|
|
|
// attwithfnrawpctenclong
|
|
|
|
val = "attachment; filename=\"foo-%c3%a4-%e2%82%ac.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)25, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo-%c3%a4-%e2%82%ac.html"),
|
|
|
|
std::string(&dest[0], &dest[25]));
|
|
|
|
|
|
|
|
// attwithasciifilenamews1
|
|
|
|
val = "attachment; filename =\"foo.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)8, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo.html"),
|
|
|
|
std::string(&dest[0], &dest[8]));
|
|
|
|
|
|
|
|
// attwith2filenames
|
|
|
|
val = "attachment; filename=\"foo.html\"; filename=\"bar.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attfnbrokentoken
|
|
|
|
val = "attachment; filename=foo[1](2).html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attfnbrokentokeniso
|
|
|
|
val = "attachment; filename=foo-%E4.html";
|
|
|
|
val = util::percentDecode(val.begin(), val.end());
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attfnbrokentokenutf
|
|
|
|
// attachment; filename=foo-ä.html
|
|
|
|
val = "attachment; filename=foo-ä.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attmissingdisposition
|
|
|
|
val = "filename=foo.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attmissingdisposition2
|
|
|
|
val = "x=y; filename=foo.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attmissingdisposition3
|
|
|
|
val = "\"foo; filename=bar;baz\"; filename=qux";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attmissingdisposition4
|
|
|
|
val = "filename=foo.html, filename=bar.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// emptydisposition
|
|
|
|
val = "; filename=foo.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// doublecolon
|
|
|
|
val = ": inline; attachment; filename=foo.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attandinline
|
|
|
|
val = "inline; attachment; filename=foo.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attandinline2
|
|
|
|
val = "attachment; inline; filename=foo.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attbrokenquotedfn
|
|
|
|
val = "attachment; filename=\"foo.html\".txt";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attbrokenquotedfn2
|
|
|
|
val = "attachment; filename=\"bar";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attbrokenquotedfn3
|
|
|
|
val = "attachment; filename=foo\"bar;baz\"qux";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attmultinstances
|
|
|
|
val = "attachment; filename=foo.html, attachment; filename=bar.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2015-02-07 15:26:36 +00:00
|
|
|
}
|
|
|
|
|
2015-12-27 09:39:47 +00:00
|
|
|
void UtilTest1::testParseContentDisposition2()
|
|
|
|
{
|
2015-06-21 09:04:30 +00:00
|
|
|
char dest[1_k];
|
2015-02-07 15:26:36 +00:00
|
|
|
size_t destlen = sizeof(dest);
|
2015-12-27 09:39:47 +00:00
|
|
|
const char* cs;
|
2015-02-07 15:26:36 +00:00
|
|
|
size_t cslen;
|
|
|
|
std::string val;
|
2012-10-27 02:41:56 +00:00
|
|
|
|
2015-02-07 15:26:36 +00:00
|
|
|
// test cases from http://greenbytes.de/tech/tc2231/
|
2012-10-27 02:41:56 +00:00
|
|
|
// attmissingdelim
|
|
|
|
val = "attachment; foo=foo filename=bar";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attmissingdelim2
|
|
|
|
val = "attachment; filename=bar foo=foo ";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attmissingdelim3
|
|
|
|
val = "attachment filename=bar";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attreversed
|
|
|
|
val = "filename=foo.html; attachment";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attconfusedparam
|
|
|
|
val = "attachment; xfilename=foo.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)0, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attabspath
|
|
|
|
val = "attachment; filename=\"/foo.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)9, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("/foo.html"),
|
|
|
|
std::string(&dest[0], &dest[9]));
|
|
|
|
|
|
|
|
// attabspathwin
|
|
|
|
val = "attachment; filename=\"\\\\foo.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)9, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("\\foo.html"),
|
|
|
|
std::string(&dest[0], &dest[9]));
|
|
|
|
|
|
|
|
// attcdate
|
|
|
|
val = "attachment; creation-date=\"Wed, 12 Feb 1997 16:29:51 -0500\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)0, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// dispext
|
|
|
|
val = "foobar";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)0, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// dispextbadfn
|
|
|
|
val = "attachment; example=\"filename=example.txt\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)0, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
2010-02-19 10:54:40 +00:00
|
|
|
// attwithisofn2231iso
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename*=iso-8859-1''foo-%E4.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)10, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("iso-8859-1"), std::string(cs, cslen));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo-ä.html"),
|
|
|
|
util::iso8859p1ToUtf8(std::string(&dest[0], &dest[10])));
|
|
|
|
|
2010-02-19 10:54:40 +00:00
|
|
|
// attwithfn2231utf8
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename*=UTF-8''foo-%c3%a4-%e2%82%ac.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)15, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("UTF-8"), std::string(cs, cslen));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo-ä-€.html"),
|
|
|
|
std::string(&dest[0], &dest[15]));
|
|
|
|
|
|
|
|
// attwithfn2231noc
|
|
|
|
val = "attachment; filename*=''foo-%c3%a4-%e2%82%ac.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attwithfn2231utf8comp
|
|
|
|
val = "attachment; filename*=UTF-8''foo-a%cc%88.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)12, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "foo-a%cc%88.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string(util::percentDecode(val.begin(), val.end())),
|
2012-10-27 02:41:56 +00:00
|
|
|
std::string(&dest[0], &dest[12]));
|
|
|
|
|
2010-02-19 10:54:40 +00:00
|
|
|
// attwithfn2231utf8-bad
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename*=iso-8859-1''foo-%c3%a4-%e2%82%ac.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attwithfn2231iso-bad
|
|
|
|
val = "attachment; filename*=utf-8''foo-%E4.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
2010-02-19 10:54:40 +00:00
|
|
|
// attwithfn2231ws1
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename *=UTF-8''foo-%c3%a4.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
2010-02-19 10:54:40 +00:00
|
|
|
// attwithfn2231ws2
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename*= UTF-8''foo-%c3%a4.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)11, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo-ä.html"),
|
|
|
|
std::string(&dest[0], &dest[11]));
|
|
|
|
|
2010-02-19 10:54:40 +00:00
|
|
|
// attwithfn2231ws3
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename* =UTF-8''foo-%c3%a4.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)11, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo-ä.html"),
|
|
|
|
std::string(&dest[0], &dest[11]));
|
|
|
|
|
2010-02-19 10:54:40 +00:00
|
|
|
// attwithfn2231quot
|
2012-10-27 02:41:56 +00:00
|
|
|
val = "attachment; filename*=\"UTF-8''foo-%c3%a4.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attwithfn2231quot2
|
|
|
|
val = "attachment; filename*=\"foo%20bar.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attwithfn2231singleqmissing
|
|
|
|
val = "attachment; filename*=UTF-8'foo-%c3%a4.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attwithfn2231nbadpct1
|
|
|
|
val = "attachment; filename*=UTF-8''foo%";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attwithfn2231nbadpct2
|
|
|
|
val = "attachment; filename*=UTF-8''f%oo.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attwithfn2231dpct
|
|
|
|
val = "attachment; filename*=UTF-8''A-%2541.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)10, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("A-%41.html"),
|
|
|
|
std::string(&dest[0], &dest[10]));
|
|
|
|
|
|
|
|
// attwithfn2231abspathdisguised
|
|
|
|
val = "attachment; filename*=UTF-8''%5cfoo.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)9, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("\\foo.html"),
|
|
|
|
std::string(&dest[0], &dest[9]));
|
|
|
|
|
|
|
|
// attfnboth
|
2015-12-27 09:39:47 +00:00
|
|
|
val =
|
|
|
|
"attachment; filename=\"foo-ae.html\"; filename*=UTF-8''foo-%c3%a4.html";
|
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)11, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo-ä.html"),
|
|
|
|
std::string(&dest[0], &dest[11]));
|
|
|
|
|
|
|
|
// attfnboth2
|
2015-12-27 09:39:47 +00:00
|
|
|
val =
|
|
|
|
"attachment; filename*=UTF-8''foo-%c3%a4.html; filename=\"foo-ae.html\"";
|
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)11, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo-ä.html"),
|
|
|
|
std::string(&dest[0], &dest[11]));
|
|
|
|
|
|
|
|
// attfnboth3
|
2015-12-27 09:39:47 +00:00
|
|
|
val = "attachment; filename*0*=ISO-8859-15''euro-sign%3d%a4; "
|
|
|
|
"filename*=ISO-8859-1''currency-sign%3d%a4";
|
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)15, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("ISO-8859-1"), std::string(cs, cslen));
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("currency-sign=¤"),
|
|
|
|
util::iso8859p1ToUtf8(std::string(&dest[0], &dest[15])));
|
|
|
|
|
|
|
|
// attnewandfn
|
|
|
|
val = "attachment; foobar=x; filename=\"foo.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)8, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo.html"),
|
|
|
|
std::string(&dest[0], &dest[8]));
|
|
|
|
|
|
|
|
// attrfc2047token
|
|
|
|
val = "attachment; filename==?ISO-8859-1?Q?foo-=E4.html?=";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// attrfc2047quoted
|
|
|
|
val = "attachment; filename=\"=?ISO-8859-1?Q?foo-=E4.html?=\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)29, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("=?ISO-8859-1?Q?foo-=E4.html?="),
|
|
|
|
std::string(&dest[0], &dest[29]));
|
|
|
|
|
|
|
|
// aria2 original testcases
|
|
|
|
|
|
|
|
// zero-length filename. token cannot be empty, so this is invalid.
|
|
|
|
val = "attachment; filename=";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// zero-length filename. quoted-string can be empty string, so this
|
|
|
|
// is ok.
|
|
|
|
val = "attachment; filename=\"\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)0, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// empty value is not allowed
|
|
|
|
val = "attachment; filename=;";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// / is not valid char in token.
|
|
|
|
val = "attachment; filename=dir/file";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)-1, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
|
|
|
|
// value-chars is *(pct-encoded / attr-char), so empty string is
|
|
|
|
// allowed.
|
|
|
|
val = "attachment; filename*=UTF-8''";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)0, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("UTF-8"), std::string(cs, cslen));
|
|
|
|
|
|
|
|
val = "attachment; filename*=UTF-8''; filename=foo";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)0, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("UTF-8"), std::string(cs, cslen));
|
|
|
|
|
|
|
|
val = "attachment; filename*=UTF-8'' ; filename=foo";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)0, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("UTF-8"), std::string(cs, cslen));
|
|
|
|
|
|
|
|
// with language
|
|
|
|
val = "attachment; filename*=UTF-8'japanese'konnichiwa";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)10, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("konnichiwa"),
|
|
|
|
std::string(&dest[0], &dest[10]));
|
|
|
|
|
|
|
|
// lws before and after "="
|
|
|
|
val = "attachment; filename = foo.html";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)8, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo.html"),
|
|
|
|
std::string(&dest[0], &dest[8]));
|
|
|
|
|
|
|
|
// lws before and after "=" with quoted-string
|
|
|
|
val = "attachment; filename = \"foo.html\"";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)8, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo.html"),
|
|
|
|
std::string(&dest[0], &dest[8]));
|
|
|
|
|
|
|
|
// lws after parm
|
|
|
|
val = "attachment; filename=foo.html ";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)8, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo.html"),
|
|
|
|
std::string(&dest[0], &dest[8]));
|
|
|
|
|
|
|
|
val = "attachment; filename=foo.html ; hello=world";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)8, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo.html"),
|
|
|
|
std::string(&dest[0], &dest[8]));
|
|
|
|
|
|
|
|
val = "attachment; filename=\"foo.html\" ";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)8, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo.html"),
|
|
|
|
std::string(&dest[0], &dest[8]));
|
|
|
|
|
|
|
|
val = "attachment; filename=\"foo.html\" ; hello=world";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)8, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo.html"),
|
|
|
|
std::string(&dest[0], &dest[8]));
|
|
|
|
|
|
|
|
val = "attachment; filename*=UTF-8''foo.html ; hello=world";
|
2015-12-27 09:39:47 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(
|
|
|
|
(ssize_t)8, util::parse_content_disposition(dest, destlen, &cs, &cslen,
|
|
|
|
val.c_str(), val.size()));
|
2012-10-27 02:41:56 +00:00
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("foo.html"),
|
|
|
|
std::string(&dest[0], &dest[8]));
|
2006-05-09 15:54:14 +00:00
|
|
|
}
|
2006-05-18 17:08:29 +00:00
|
|
|
|
2008-02-08 15:53:45 +00:00
|
|
|
} // namespace aria2
|