generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2026-01-11 08:34:20 +01:00
Code Issues Projects Releases Wiki Activity

Poco 1.9.1 assert true (#2255)

Browse Source 
* Rename assert by assertTrue

* Update submodules

* Missing assertTrue

* Rename poco_assertTrue to poco_assert

* Rename poco_assertTrue to poco_assert
This commit is contained in:
zosrothko
2018-03-29 19:12:54 +02:00
committed by Aleksandar Fabijanic
parent 5a1bf5eb4a
commit 960ecb38f0
232 changed files with 16274 additions and 16265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

204
Net/testsuite/src/MessageHeaderTest.cpp
View File

@@ -41,7 +41,7 @@ void MessageHeaderTest::testWrite()
std::ostringstream ostr;
mh.write(ostr);
std::string s = ostr.str();
assert (s == "name1: value1\r\nname2: value2\r\nname3: value3\r\n");
assertTrue (s == "name1: value1\r\nname2: value2\r\nname3: value3\r\n");
}
@@ -51,10 +51,10 @@ void MessageHeaderTest::testRead1()
std::istringstream istr(s);
MessageHeader mh;
mh.read(istr);
assert (mh.size() == 3);
assert (mh["name1"] == "value1");
assert (mh["name2"] == "value2");
assert (mh["name3"] == "value3");
assertTrue (mh.size() == 3);
assertTrue (mh["name1"] == "value1");
assertTrue (mh["name2"] == "value2");
assertTrue (mh["name3"] == "value3");
}
@@ -64,10 +64,10 @@ void MessageHeaderTest::testRead2()
std::istringstream istr(s);
MessageHeader mh;
mh.read(istr);
assert (mh.size() == 3);
assert (mh["name1"] == "value1");
assert (mh["name2"] == "value2");
assert (mh["name3"] == "value3");
assertTrue (mh.size() == 3);
assertTrue (mh["name1"] == "value1");
assertTrue (mh["name2"] == "value2");
assertTrue (mh["name3"] == "value3");
}
@@ -77,8 +77,8 @@ void MessageHeaderTest::testRead3()
std::istringstream istr(s);
MessageHeader mh;
mh.read(istr);
assert (mh.size() == 1);
assert (mh["name1"] == "value1");
assertTrue (mh.size() == 1);
assertTrue (mh["name1"] == "value1");
}
@@ -89,15 +89,15 @@ void MessageHeaderTest::testRead4()
std::istringstream istr(s);
MessageHeader mh;
mh.read(istr);
assert (mh.size() == 2);
assert (mh["name1"] == "value1");
assert (mh["name2"] == "value2");
assertTrue (mh.size() == 2);
assertTrue (mh["name1"] == "value1");
assertTrue (mh["name2"] == "value2");
int ch = istr.get();
assert (ch == '\r');
assertTrue (ch == '\r');
ch = istr.get();
assert (ch == '\n');
assertTrue (ch == '\n');
ch = istr.get();
assert (ch == 's');
assertTrue (ch == 's');
}
@@ -107,10 +107,10 @@ void MessageHeaderTest::testRead5()
std::istringstream istr(s);
MessageHeader mh;
mh.read(istr);
assert (mh.size() == 3);
assert (mh["name1"] == "");
assert (mh["name2"] == "value2");
assert (mh["name3"] == "value3");
assertTrue (mh.size() == 3);
assertTrue (mh["name1"] == "");
assertTrue (mh["name2"] == "value2");
assertTrue (mh["name3"] == "value3");
}
@@ -120,10 +120,10 @@ void MessageHeaderTest::testReadFolding1()
std::istringstream istr(s);
MessageHeader mh;
mh.read(istr);
assert (mh.size() == 3);
assert (mh["name1"] == "value1");
assert (mh["name2"] == "value21 value22");
assert (mh["name3"] == "value3");
assertTrue (mh.size() == 3);
assertTrue (mh["name1"] == "value1");
assertTrue (mh["name2"] == "value21 value22");
assertTrue (mh["name3"] == "value3");
}
@@ -133,10 +133,10 @@ void MessageHeaderTest::testReadFolding2()
std::istringstream istr(s);
MessageHeader mh;
mh.read(istr);
assert (mh.size() == 3);
assert (mh["name1"] == "value1");
assert (mh["name2"] == "value21\tvalue22");
assert (mh["name3"] == "value3");
assertTrue (mh.size() == 3);
assertTrue (mh["name1"] == "value1");
assertTrue (mh["name2"] == "value21\tvalue22");
assertTrue (mh["name3"] == "value3");
}
@@ -146,9 +146,9 @@ void MessageHeaderTest::testReadFolding3()
std::istringstream istr(s);
MessageHeader mh;
mh.read(istr);
assert (mh.size() == 2);
assert (mh["name1"] == "value1");
assert (mh["name2"] == "value21 value22");
assertTrue (mh.size() == 2);
assertTrue (mh["name1"] == "value1");
assertTrue (mh["name2"] == "value21 value22");
}
@@ -158,9 +158,9 @@ void MessageHeaderTest::testReadFolding4()
std::istringstream istr(s);
MessageHeader mh;
mh.read(istr);
assert (mh.size() == 2);
assert (mh["name1"] == "value1");
assert (mh["name2"] == "value21 value22 value23");
assertTrue (mh.size() == 2);
assertTrue (mh["name1"] == "value1");
assertTrue (mh["name2"] == "value21 value22 value23");
}
@@ -170,10 +170,10 @@ void MessageHeaderTest::testReadFolding5()
std::istringstream istr(s);
MessageHeader mh;
mh.read(istr);
assert (mh.size() == 3);
assert (mh["name1"] == "value1");
assert (mh["name2"] == "value21 value22 value23");
assert (mh["name3"] == "value3");
assertTrue (mh.size() == 3);
assertTrue (mh["name1"] == "value1");
assertTrue (mh["name2"] == "value21 value22 value23");
assertTrue (mh["name3"] == "value3");
}
@@ -216,74 +216,74 @@ void MessageHeaderTest::testSplitElements()
std::string s;
std::vector<std::string> v;
MessageHeader::splitElements(s, v);
assert (v.empty());
assertTrue (v.empty());
s = "foo";
MessageHeader::splitElements(s, v);
assert (v.size() == 1);
assert (v[0] == "foo");
assertTrue (v.size() == 1);
assertTrue (v[0] == "foo");
s = " foo ";
MessageHeader::splitElements(s, v);
assert (v.size() == 1);
assert (v[0] == "foo");
assertTrue (v.size() == 1);
assertTrue (v[0] == "foo");
s = "foo,bar";
MessageHeader::splitElements(s, v);
assert (v.size() == 2);
assert (v[0] == "foo");
assert (v[1] == "bar");
assertTrue (v.size() == 2);
assertTrue (v[0] == "foo");
assertTrue (v[1] == "bar");
s = "foo,,bar";
MessageHeader::splitElements(s, v);
assert (v.size() == 2);
assert (v[0] == "foo");
assert (v[1] == "bar");
assertTrue (v.size() == 2);
assertTrue (v[0] == "foo");
assertTrue (v[1] == "bar");
MessageHeader::splitElements(s, v, false);
assert (v.size() == 3);
assert (v[0] == "foo");
assert (v[1] == "");
assert (v[2] == "bar");
assertTrue (v.size() == 3);
assertTrue (v[0] == "foo");
assertTrue (v[1] == "");
assertTrue (v[2] == "bar");
s = "foo;param=\"a,b\",bar;param=\"c,d\"";
MessageHeader::splitElements(s, v);
assert (v.size() == 2);
assert (v[0] == "foo;param=\"a,b\"");
assert (v[1] == "bar;param=\"c,d\"");
assertTrue (v.size() == 2);
assertTrue (v[0] == "foo;param=\"a,b\"");
assertTrue (v[1] == "bar;param=\"c,d\"");
s = "foo; param=\"a,b\", bar; param=\"c,d\"";
MessageHeader::splitElements(s, v);
assert (v.size() == 2);
assert (v[0] == "foo; param=\"a,b\"");
assert (v[1] == "bar; param=\"c,d\"");
assertTrue (v.size() == 2);
assertTrue (v[0] == "foo; param=\"a,b\"");
assertTrue (v[1] == "bar; param=\"c,d\"");
s = "foo, bar, f00, baz";
MessageHeader::splitElements(s, v);
assert (v.size() == 4);
assert (v[0] == "foo");
assert (v[1] == "bar");
assert (v[2] == "f00");
assert (v[3] == "baz");
assertTrue (v.size() == 4);
assertTrue (v[0] == "foo");
assertTrue (v[1] == "bar");
assertTrue (v[2] == "f00");
assertTrue (v[3] == "baz");
s = "a,b,c";
MessageHeader::splitElements(s, v);
assert (v.size() == 3);
assert (v[0] == "a");
assert (v[1] == "b");
assert (v[2] == "c");
assertTrue (v.size() == 3);
assertTrue (v[0] == "a");
assertTrue (v[1] == "b");
assertTrue (v[2] == "c");
s = "a=\"value=\\\\\\\"foo, bar\\\\\\\"\",b=foo";
MessageHeader::splitElements(s, v);
assert (v.size() == 2);
assert (v[0] == "a=\"value=\\\"foo, bar\\\"\"");
assert (v[1] == "b=foo");
assertTrue (v.size() == 2);
assertTrue (v[0] == "a=\"value=\\\"foo, bar\\\"\"");
assertTrue (v[1] == "b=foo");
s = "a=\\\",b=\\\"";
MessageHeader::splitElements(s, v);
assert (v.size() == 2);
assert (v[0] == "a=\"");
assert (v[1] == "b=\"");
assertTrue (v.size() == 2);
assertTrue (v[0] == "a=\"");
assertTrue (v[1] == "b=\"");
}
@@ -295,51 +295,51 @@ void MessageHeaderTest::testSplitParameters()
NameValueCollection p;
MessageHeader::splitParameters(s, v, p);
assert (v.empty());
assert (p.empty());
assertTrue (v.empty());
assertTrue (p.empty());
s = "multipart/related";
MessageHeader::splitParameters(s, v, p);
assert (v == "multipart/related");
assert (p.empty());
assertTrue (v == "multipart/related");
assertTrue (p.empty());
s = "multipart/related; boundary=MIME_boundary_01234567";
MessageHeader::splitParameters(s, v, p);
assert (v == "multipart/related");
assert (p.size() == 1);
assert (p["boundary"] == "MIME_boundary_01234567");
assertTrue (v == "multipart/related");
assertTrue (p.size() == 1);
assertTrue (p["boundary"] == "MIME_boundary_01234567");
s = "multipart/related; boundary=\"MIME_boundary_76543210\"";
MessageHeader::splitParameters(s, v, p);
assert (v == "multipart/related");
assert (p.size() == 1);
assert (p["boundary"] == "MIME_boundary_76543210");
assertTrue (v == "multipart/related");
assertTrue (p.size() == 1);
assertTrue (p["boundary"] == "MIME_boundary_76543210");
s = "text/plain; charset=us-ascii";
MessageHeader::splitParameters(s, v, p);
assert (v == "text/plain");
assert (p.size() == 1);
assert (p["charset"] == "us-ascii");
assertTrue (v == "text/plain");
assertTrue (p.size() == 1);
assertTrue (p["charset"] == "us-ascii");
s = "value; p1=foo; p2=bar";
MessageHeader::splitParameters(s, v, p);
assert (v == "value");
assert (p.size() == 2);
assert (p["p1"] == "foo");
assert (p["p2"] == "bar");
assertTrue (v == "value");
assertTrue (p.size() == 2);
assertTrue (p["p1"] == "foo");
assertTrue (p["p2"] == "bar");
s = "value; p1=\"foo; bar\"";
MessageHeader::splitParameters(s, v, p);
assert (v == "value");
assert (p.size() == 1);
assert (p["p1"] == "foo; bar");
assertTrue (v == "value");
assertTrue (p.size() == 1);
assertTrue (p["p1"] == "foo; bar");
s = "value ; p1=foo ; p2=bar ";
MessageHeader::splitParameters(s, v, p);
assert (v == "value");
assert (p.size() == 2);
assert (p["p1"] == "foo");
assert (p["p2"] == "bar");
assertTrue (v == "value");
assertTrue (p.size() == 2);
assertTrue (p["p1"] == "foo");
assertTrue (p["p2"] == "bar");
}
@@ -364,15 +364,15 @@ void MessageHeaderTest::testDecodeWord()
{
std::string coded("this is pure ASCII");
std::string decoded = MessageHeader::decodeWord(coded, "ISO-8859-1");
assert(decoded == coded);
assertTrue (decoded == coded);
coded = "(=?ISO-8859-1?Q?a?= =?ISO-8859-1?Q?b?=)";
decoded = MessageHeader::decodeWord(coded, "ISO-8859-1");
assert(decoded == "(a b)");
assertTrue (decoded == "(a b)");
coded = "Hello =?UTF-8?B?RnJhbmNpcw==?=, good bye";
decoded = MessageHeader::decodeWord(coded, "ISO-8859-1");
assert(decoded == "Hello Francis, good bye");
assertTrue (decoded == "Hello Francis, good bye");
}