mirrors/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-04-05 21:47:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Rewritten help tags and various internal flag handling in OptionHandler

Browse source 
Now help tags are defined as enum values to avoid vector of strings.
The internal flags are represented by bitmask to shrink size.
This commit is contained in:
Tatsuhiro Tsujikawa 2012-09-23 14:59:05 +09:00
parent 461a542c5e
commit 295a62f538
15 changed files with 296 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

17
test/OptionParserTest.cc
View file

@ -11,6 +11,7 @@
#include "Option.h"
#include "array_fun.h"
#include "prefs.h"
#include "help_tags.h"
namespace aria2 {
@ -37,28 +38,28 @@ public:
SharedHandle<OptionHandler> timeout
(new DefaultOptionHandler(PREF_TIMEOUT, NO_DESCRIPTION, "ALPHA", "",
OptionHandler::REQ_ARG, 'A'));
timeout->addTag("apple");
timeout->addTag(TAG_BASIC);
timeout->setEraseAfterParse(true);
oparser_->addOptionHandler(timeout);
SharedHandle<OptionHandler> dir(new DefaultOptionHandler(PREF_DIR));
dir->addTag("apple");
dir->addTag("orange");
dir->addTag("pineapple");
dir->addTag(TAG_BASIC);
dir->addTag(TAG_HTTP);
dir->addTag(TAG_FILE);
oparser_->addOptionHandler(dir);
SharedHandle<DefaultOptionHandler> daemon
(new DefaultOptionHandler(PREF_DAEMON, NO_DESCRIPTION, "CHARLIE", "",
OptionHandler::REQ_ARG, 'C'));
daemon->hide();
daemon->addTag("pineapple");
daemon->addTag(TAG_FILE);
oparser_->addOptionHandler(daemon);
SharedHandle<OptionHandler> out
(new UnitNumberOptionHandler(PREF_OUT, NO_DESCRIPTION, "1M",
-1, -1, 'D'));
out->addTag("pineapple");
oparser_->addOptionHandler(out);
out->addTag(TAG_FILE);
oparser_->addOptionHandler(out);
}
void tearDown() {}
@ -98,7 +99,7 @@ void OptionParserTest::testFindByNameSubstring()
void OptionParserTest::testFindByTag()
{
std::vector<SharedHandle<OptionHandler> > res =
oparser_->findByTag("pineapple");
oparser_->findByTag(TAG_FILE);
CPPUNIT_ASSERT_EQUAL((size_t)2, res.size());
CPPUNIT_ASSERT_EQUAL(std::string("dir"), std::string(res[0]->getName()));
CPPUNIT_ASSERT_EQUAL(std::string("out"), std::string(res[1]->getName()));