github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

clang-format

pull/711/merge
Tatsuhiro Tsujikawa 2016-07-21 01:00:47 +09:00
parent 5b4e3361d4
commit 8e07568a9e
11 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/OptionHandlerFactory.cc
View File

@ -1799,8 +1799,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers()
handlers.push_back(op);
}
{
OptionHandler* op(new FloatNumberOptionHandler(PREF_SEED_TIME, TEXT_SEED_TIME,
NO_DEFAULT_VALUE, 0));
OptionHandler* op(new FloatNumberOptionHandler(
PREF_SEED_TIME, TEXT_SEED_TIME, NO_DEFAULT_VALUE, 0));
op->addTag(TAG_BITTORRENT);
op->setInitialOption(true);
op->setChangeGlobalOption(true);

3
src/RequestGroup.cc
View File

@ -793,8 +793,7 @@ void RequestGroup::tryAutoFileRenaming()
// if slash == idx - 1 this means a form of "*/.*", so the file name
// starts with a dot, has no extension otherwise, and therefore do not
// extract an extension either
(slash == std::string::npos || slash < idx - 1)
) {
(slash == std::string::npos || slash < idx - 1)) {
ext = fn.substr(idx);
fn = fn.substr(0, idx);
}

3
test/MockPeerStorage.h
View File

@ -39,7 +39,8 @@ public:
}
virtual std::shared_ptr<Peer>
addAndCheckoutPeer(const std::shared_ptr<Peer>& peer, cuid_t cuid) CXX11_OVERRIDE
addAndCheckoutPeer(const std::shared_ptr<Peer>& peer,
cuid_t cuid) CXX11_OVERRIDE
{
unusedPeers.push_back(peer);
return nullptr;

17
test/RequestGroupTest.cc
View File

@ -60,7 +60,6 @@ void RequestGroupTest::testTryAutoFileRenaming()
}
catch (const Exception& ex) {
CPPUNIT_ASSERT_EQUAL(error_code::FILE_ALREADY_EXISTS, ex.getErrorCode());
}
option_->put(PREF_AUTO_FILE_RENAMING, "true");
@ -69,15 +68,18 @@ void RequestGroupTest::testTryAutoFileRenaming()
ctx->getFirstFileEntry()->setPath("/tmp/myfile.txt");
group.tryAutoFileRenaming();
CPPUNIT_ASSERT_EQUAL(std::string("/tmp/myfile.1.txt"), group.getFirstFilePath());
CPPUNIT_ASSERT_EQUAL(std::string("/tmp/myfile.1.txt"),
group.getFirstFilePath());
ctx->getFirstFileEntry()->setPath("/tmp.txt/myfile");
group.tryAutoFileRenaming();
CPPUNIT_ASSERT_EQUAL(std::string("/tmp.txt/myfile.1"), group.getFirstFilePath());
CPPUNIT_ASSERT_EQUAL(std::string("/tmp.txt/myfile.1"),
group.getFirstFilePath());
ctx->getFirstFileEntry()->setPath("/tmp.txt/myfile.txt");
group.tryAutoFileRenaming();
CPPUNIT_ASSERT_EQUAL(std::string("/tmp.txt/myfile.1.txt"), group.getFirstFilePath());
CPPUNIT_ASSERT_EQUAL(std::string("/tmp.txt/myfile.1.txt"),
group.getFirstFilePath());
ctx->getFirstFileEntry()->setPath(".bashrc");
group.tryAutoFileRenaming();
@ -89,12 +91,13 @@ void RequestGroupTest::testTryAutoFileRenaming()
ctx->getFirstFileEntry()->setPath("/tmp.txt/.bashrc");
group.tryAutoFileRenaming();
CPPUNIT_ASSERT_EQUAL(std::string("/tmp.txt/.bashrc.1"), group.getFirstFilePath());
CPPUNIT_ASSERT_EQUAL(std::string("/tmp.txt/.bashrc.1"),
group.getFirstFilePath());
ctx->getFirstFileEntry()->setPath("/tmp.txt/.bashrc.txt");
group.tryAutoFileRenaming();
CPPUNIT_ASSERT_EQUAL(std::string("/tmp.txt/.bashrc.1.txt"), group.getFirstFilePath());
CPPUNIT_ASSERT_EQUAL(std::string("/tmp.txt/.bashrc.1.txt"),
group.getFirstFilePath());
}
void RequestGroupTest::testCreateDownloadResult()