2008-02-08 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

Removed "using namespace std;" from all sources. Appended std:: 
prefix to c++
	standard classes.
	Included string.h where mem* function are used.
This commit is contained in:
Tatsuhiro Tsujikawa
2008-02-08 15:53:45 +00:00
parent d82e183d34
commit 1b7c198289
801 changed files with 12024 additions and 8627 deletions

View File

@@ -3,8 +3,11 @@
#include "PStringSegment.h"
#include "PStringNumLoop.h"
#include "FatalException.h"
#include <iostream>
#include <cppunit/extensions/HelperMacros.h>
namespace aria2 {
class ParameterizedStringParserTest:public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE(ParameterizedStringParserTest);
@@ -50,25 +53,25 @@ CPPUNIT_TEST_SUITE_REGISTRATION( ParameterizedStringParserTest );
void ParameterizedStringParserTest::testParse_select()
{
PStringDatumHandle ls = ParameterizedStringParser().parse("{alpha, bravo, charlie}");
PStringSelectHandle select = ls;
SharedHandle<PStringDatum> ls = ParameterizedStringParser().parse("{alpha, bravo, charlie}");
SharedHandle<PStringSelect> select = ls;
CPPUNIT_ASSERT(!select.isNull());
Strings values = select->getValues();
std::deque<std::string> values = select->getValues();
CPPUNIT_ASSERT_EQUAL((size_t)3, values.size());
CPPUNIT_ASSERT_EQUAL(string("alpha"), values[0]);
CPPUNIT_ASSERT_EQUAL(string("bravo"), values[1]);
CPPUNIT_ASSERT_EQUAL(string("charlie"), values[2]);
CPPUNIT_ASSERT_EQUAL(std::string("alpha"), values[0]);
CPPUNIT_ASSERT_EQUAL(std::string("bravo"), values[1]);
CPPUNIT_ASSERT_EQUAL(std::string("charlie"), values[2]);
}
void ParameterizedStringParserTest::testParse_select_empty()
{
try {
PStringDatumHandle ls = ParameterizedStringParser().parse("{}");
SharedHandle<PStringDatum> ls = ParameterizedStringParser().parse("{}");
CPPUNIT_FAIL("exception must be thrown.");
} catch(FatalException* e) {
cerr << e->getMsg() << endl;
std::cerr << e->getMsg() << std::endl;
delete e;
} catch(...) {
CPPUNIT_FAIL("unexpected exception thrown.");
@@ -78,10 +81,10 @@ void ParameterizedStringParserTest::testParse_select_empty()
void ParameterizedStringParserTest::testParse_select_missingParen()
{
try {
PStringDatumHandle ls = ParameterizedStringParser().parse("{alpha");
SharedHandle<PStringDatum> ls = ParameterizedStringParser().parse("{alpha");
CPPUNIT_FAIL("exception must be thrown.");
} catch(FatalException* e) {
cerr << e->getMsg() << endl;
std::cerr << e->getMsg() << std::endl;
delete e;
} catch(...) {
CPPUNIT_FAIL("unexpected exception was thrown.");
@@ -90,38 +93,38 @@ void ParameterizedStringParserTest::testParse_select_missingParen()
void ParameterizedStringParserTest::testParse_segment()
{
PStringDatumHandle ls = ParameterizedStringParser().parse("hello world");
PStringSegmentHandle segment = ls;
SharedHandle<PStringDatum> ls = ParameterizedStringParser().parse("hello world");
SharedHandle<PStringSegment> segment = ls;
CPPUNIT_ASSERT(!segment.isNull());
CPPUNIT_ASSERT_EQUAL(string("hello world"), segment->getValue());
CPPUNIT_ASSERT_EQUAL(std::string("hello world"), segment->getValue());
}
void ParameterizedStringParserTest::testParse_segment_select()
{
PStringDatumHandle ls = ParameterizedStringParser().parse("file:///{alpha, bravo, charlie}/tango");
SharedHandle<PStringDatum> ls = ParameterizedStringParser().parse("file:///{alpha, bravo, charlie}/tango");
PStringSegmentHandle segment1 = ls;
SharedHandle<PStringSegment> segment1 = ls;
CPPUNIT_ASSERT(!segment1.isNull());
CPPUNIT_ASSERT_EQUAL(string("file:///"), segment1->getValue());
CPPUNIT_ASSERT_EQUAL(std::string("file:///"), segment1->getValue());
PStringSelectHandle select1 = segment1->getNext();
SharedHandle<PStringSelect> select1 = segment1->getNext();
CPPUNIT_ASSERT(!select1.isNull());
Strings selectValues = select1->getValues();
std::deque<std::string> selectValues = select1->getValues();
CPPUNIT_ASSERT_EQUAL((size_t)3, selectValues.size());
CPPUNIT_ASSERT_EQUAL(string("alpha"), selectValues[0]);
CPPUNIT_ASSERT_EQUAL(string("bravo"), selectValues[1]);
CPPUNIT_ASSERT_EQUAL(string("charlie"), selectValues[2]);
CPPUNIT_ASSERT_EQUAL(std::string("alpha"), selectValues[0]);
CPPUNIT_ASSERT_EQUAL(std::string("bravo"), selectValues[1]);
CPPUNIT_ASSERT_EQUAL(std::string("charlie"), selectValues[2]);
PStringSegmentHandle segment2 = select1->getNext();
SharedHandle<PStringSegment> segment2 = select1->getNext();
CPPUNIT_ASSERT(!segment2.isNull());
CPPUNIT_ASSERT_EQUAL(string("/tango"), segment2->getValue());
CPPUNIT_ASSERT_EQUAL(std::string("/tango"), segment2->getValue());
}
void ParameterizedStringParserTest::testParse_loop()
{
PStringDatumHandle ls = ParameterizedStringParser().parse("[1-10:2]");
SharedHandle<PStringDatum> ls = ParameterizedStringParser().parse("[1-10:2]");
PStringNumLoopHandle loop1 = ls;
SharedHandle<PStringNumLoop> loop1 = ls;
CPPUNIT_ASSERT(!loop1.isNull());
CPPUNIT_ASSERT_EQUAL((int32_t)1, loop1->getStartValue());
CPPUNIT_ASSERT_EQUAL((int32_t)10, loop1->getEndValue());
@@ -131,10 +134,10 @@ void ParameterizedStringParserTest::testParse_loop()
void ParameterizedStringParserTest::testParse_loop_empty()
{
try {
PStringDatumHandle ls = ParameterizedStringParser().parse("[]");
SharedHandle<PStringDatum> ls = ParameterizedStringParser().parse("[]");
CPPUNIT_FAIL("exception must be thrown.");
} catch(FatalException* e) {
cerr << e->getMsg() << endl;
std::cerr << e->getMsg() << std::endl;
delete e;
} catch(...) {
CPPUNIT_FAIL("unexpected exception was thrown.");
@@ -144,10 +147,10 @@ void ParameterizedStringParserTest::testParse_loop_empty()
void ParameterizedStringParserTest::testParse_loop_missingParen()
{
try {
PStringDatumHandle ls = ParameterizedStringParser().parse("[");
SharedHandle<PStringDatum> ls = ParameterizedStringParser().parse("[");
CPPUNIT_FAIL("exception must be thrown.");
} catch(FatalException* e) {
cerr << e->getMsg() << endl;
std::cerr << e->getMsg() << std::endl;
delete e;
} catch(...) {
CPPUNIT_FAIL("unexpected exception was thrown.");
@@ -157,10 +160,10 @@ void ParameterizedStringParserTest::testParse_loop_missingParen()
void ParameterizedStringParserTest::testParse_loop_missingStep()
{
try {
PStringDatumHandle ls = ParameterizedStringParser().parse("[1-10:]");
SharedHandle<PStringDatum> ls = ParameterizedStringParser().parse("[1-10:]");
CPPUNIT_FAIL("exception must be thrown.");
} catch(FatalException* e) {
cerr << e->getMsg() << endl;
std::cerr << e->getMsg() << std::endl;
delete e;
} catch(...) {
CPPUNIT_FAIL("unexpected exception was thrown.");
@@ -170,10 +173,10 @@ void ParameterizedStringParserTest::testParse_loop_missingStep()
void ParameterizedStringParserTest::testParse_loop_missingRange()
{
try {
PStringDatumHandle ls = ParameterizedStringParser().parse("[1-]");
SharedHandle<PStringDatum> ls = ParameterizedStringParser().parse("[1-]");
CPPUNIT_FAIL("exception must be thrown.");
} catch(FatalException* e) {
cerr << e->getMsg() << endl;
std::cerr << e->getMsg() << std::endl;
delete e;
} catch(...) {
CPPUNIT_FAIL("unexpected exception was thrown.");
@@ -182,9 +185,9 @@ void ParameterizedStringParserTest::testParse_loop_missingRange()
void ParameterizedStringParserTest::testParse_alphaLoop()
{
PStringDatumHandle ls = ParameterizedStringParser().parse("[a-z:2]");
SharedHandle<PStringDatum> ls = ParameterizedStringParser().parse("[a-z:2]");
PStringNumLoopHandle loop1 = ls;
SharedHandle<PStringNumLoop> loop1 = ls;
CPPUNIT_ASSERT(!loop1.isNull());
CPPUNIT_ASSERT_EQUAL((int32_t)0, loop1->getStartValue());
CPPUNIT_ASSERT_EQUAL((int32_t)25, loop1->getEndValue());
@@ -197,7 +200,7 @@ void ParameterizedStringParserTest::testParse_loop_mixedChar()
ParameterizedStringParser().parse("[1-z:2]");
CPPUNIT_FAIL("exception must be thrown.");
} catch(FatalException* e) {
cerr << e->getMsg() << endl;
std::cerr << e->getMsg() << std::endl;
delete e;
} catch(...) {
CPPUNIT_FAIL("FatalException must be thrown.");
@@ -210,7 +213,7 @@ void ParameterizedStringParserTest::testParse_loop_mixedCase()
ParameterizedStringParser().parse("[a-Z:2]");
CPPUNIT_FAIL("exception must be thrown.");
} catch(FatalException* e) {
cerr << e->getMsg() << endl;
std::cerr << e->getMsg() << std::endl;
delete e;
} catch(...) {
CPPUNIT_FAIL("FatalException must be thrown.");
@@ -219,19 +222,21 @@ void ParameterizedStringParserTest::testParse_loop_mixedCase()
void ParameterizedStringParserTest::testParse_segment_loop()
{
PStringDatumHandle ls = ParameterizedStringParser().parse("http://server[1-3]/file");
SharedHandle<PStringDatum> ls = ParameterizedStringParser().parse("http://server[1-3]/file");
PStringSegmentHandle segment1 = ls;
SharedHandle<PStringSegment> segment1 = ls;
CPPUNIT_ASSERT(!segment1.isNull());
CPPUNIT_ASSERT_EQUAL(string("http://server"), segment1->getValue());
CPPUNIT_ASSERT_EQUAL(std::string("http://server"), segment1->getValue());
PStringNumLoopHandle loop1 = segment1->getNext();
SharedHandle<PStringNumLoop> loop1 = segment1->getNext();
CPPUNIT_ASSERT(!loop1.isNull());
CPPUNIT_ASSERT_EQUAL((int32_t)1, loop1->getStartValue());
CPPUNIT_ASSERT_EQUAL((int32_t)3, loop1->getEndValue());
CPPUNIT_ASSERT_EQUAL((int32_t)1, loop1->getStep());
PStringSegmentHandle segment2 = loop1->getNext();
SharedHandle<PStringSegment> segment2 = loop1->getNext();
CPPUNIT_ASSERT(!segment2.isNull());
CPPUNIT_ASSERT_EQUAL(string("/file"), segment2->getValue());
CPPUNIT_ASSERT_EQUAL(std::string("/file"), segment2->getValue());
}
} // namespace aria2