Poco 1.9.1 assert true (#2255)

* 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

View File

@@ -40,7 +40,7 @@ void TextIteratorTest::testEmptyLatin1()
TextIterator it(text, encoding);
TextIterator end(text);
assert (it == end);
assertTrue (it == end);
}
@@ -51,10 +51,10 @@ void TextIteratorTest::testOneLatin1()
TextIterator it(text, encoding);
TextIterator end(text);
assert (it != end);
assert (*it == 'x');
assertTrue (it != end);
assertTrue (*it == 'x');
++it;
assert (it == end);
assertTrue (it == end);
}
@@ -65,24 +65,24 @@ void TextIteratorTest::testLatin1()
TextIterator it(text, encoding);
TextIterator end(text);
assert (it != end);
assert (*it++ == 'L');
assert (it != end);
assert (*it++ == 'a');
assert (it != end);
assert (*it++ == 't');
assert (it != end);
assert (*it++ == 'i');
assert (it != end);
assert (*it++ == 'n');
assert (it != end);
assert (*it++ == '1');
assert (it == end);
assertTrue (it != end);
assertTrue (*it++ == 'L');
assertTrue (it != end);
assertTrue (*it++ == 'a');
assertTrue (it != end);
assertTrue (*it++ == 't');
assertTrue (it != end);
assertTrue (*it++ == 'i');
assertTrue (it != end);
assertTrue (*it++ == 'n');
assertTrue (it != end);
assertTrue (*it++ == '1');
assertTrue (it == end);
std::string empty;
it = TextIterator(empty, encoding);
end = TextIterator(empty);
assert (it == end);
assertTrue (it == end);
}
@@ -93,7 +93,7 @@ void TextIteratorTest::testEmptyUTF8()
TextIterator it(text, encoding);
TextIterator end(text);
assert (it == end);
assertTrue (it == end);
}
@@ -106,53 +106,53 @@ void TextIteratorTest::testOneUTF8()
TextIterator it(text, encoding);
TextIterator end(text);
assert (it != end);
assert (*it == 'x');
assertTrue (it != end);
assertTrue (*it == 'x');
++it;
assert (it == end);
assertTrue (it == end);
unsigned char data[Poco::TextEncoding::MAX_SEQUENCE_LENGTH];
// 2 byte sequence
int n = encoding.convert(0xab, data, sizeof(data));
assert (n == 2);
assertTrue (n == 2);
text.assign((char*) data, n);
it = TextIterator(text, encoding);
end = TextIterator(text);
assert (it != end);
assert (*it++ == 0xab);
assert (it == end);
assertTrue (it != end);
assertTrue (*it++ == 0xab);
assertTrue (it == end);
// 3 byte sequence
n = encoding.convert(0xabcd, data, sizeof(data));
assert (n == 3);
assertTrue (n == 3);
text.assign((char*) data, n);
it = TextIterator(text, encoding);
end = TextIterator(text);
assert (it != end);
assert (*it++ == 0xabcd);
assert (it == end);
assertTrue (it != end);
assertTrue (*it++ == 0xabcd);
assertTrue (it == end);
// 4 byte sequence
n = encoding.convert(0xabcde, data, sizeof(data));
assert (n == 4);
assertTrue (n == 4);
text.assign((char*) data, n);
it = TextIterator(text, encoding);
end = TextIterator(text);
assert (it != end);
assert (*it++ == 0xabcde);
assert (it == end);
assertTrue (it != end);
assertTrue (*it++ == 0xabcde);
assertTrue (it == end);
// 5 byte sequence - not supported
n = encoding.convert(0xabcdef, data, sizeof(data));
assert (n == 0);
assertTrue (n == 0);
// 6 byte sequence - not supported
n = encoding.convert(0xfabcdef, data, sizeof(data));
assert (n == 0);
assertTrue (n == 0);
}
@@ -164,21 +164,21 @@ void TextIteratorTest::testUTF8()
TextIterator it(text, encoding);
TextIterator end(text);
assert (it != end);
assert (*it++ == 0x0020);
assert (it != end);
assert (*it++ == 0x03ba);
assert (it != end);
assert (*it++ == 0x1f79);
assert (it != end);
assert (*it++ == 0x03c3);
assert (it != end);
assert (*it++ == 0x03bc);
assert (it != end);
assert (*it++ == 0x03b5);
assert (it != end);
assert (*it++ == 0x0020);
assert (it == end);
assertTrue (it != end);
assertTrue (*it++ == 0x0020);
assertTrue (it != end);
assertTrue (*it++ == 0x03ba);
assertTrue (it != end);
assertTrue (*it++ == 0x1f79);
assertTrue (it != end);
assertTrue (*it++ == 0x03c3);
assertTrue (it != end);
assertTrue (*it++ == 0x03bc);
assertTrue (it != end);
assertTrue (*it++ == 0x03b5);
assertTrue (it != end);
assertTrue (*it++ == 0x0020);
assertTrue (it == end);
}
@@ -190,17 +190,17 @@ void TextIteratorTest::testUTF8Supplementary()
TextIterator it(text, encoding);
TextIterator end(text);
assert (it != end);
assert (*it++ == 0x0041);
assert (it != end);
assert (*it++ == 0x0042);
assert (it != end);
assert (*it++ == 0x100a4);
assert (it != end);
assert (*it++ == 0x2f9a0);
assert (it != end);
assert (*it++ == 0x2fa1d);
assert (it == end);
assertTrue (it != end);
assertTrue (*it++ == 0x0041);
assertTrue (it != end);
assertTrue (*it++ == 0x0042);
assertTrue (it != end);
assertTrue (*it++ == 0x100a4);
assertTrue (it != end);
assertTrue (*it++ == 0x2f9a0);
assertTrue (it != end);
assertTrue (*it++ == 0x2fa1d);
assertTrue (it == end);
}
@@ -212,17 +212,17 @@ void TextIteratorTest::testUTF16Supplementary()
TextIterator it(text, encoding);
TextIterator end(text);
assert (it != end);
assert (*it++ == 0x0041);
assert (it != end);
assert (*it++ == 0x0042);
assert (it != end);
assert (*it++ == 0x100a4);
assert (it != end);
assert (*it++ == 0x2f9a0);
assert (it != end);
assert (*it++ == 0x2fa1d);
assert (it == end);
assertTrue (it != end);
assertTrue (*it++ == 0x0041);
assertTrue (it != end);
assertTrue (*it++ == 0x0042);
assertTrue (it != end);
assertTrue (*it++ == 0x100a4);
assertTrue (it != end);
assertTrue (*it++ == 0x2f9a0);
assertTrue (it != end);
assertTrue (*it++ == 0x2fa1d);
assertTrue (it == end);
}
@@ -234,11 +234,11 @@ void TextIteratorTest::testSwap()
TextIterator it2(text, encoding);
TextIterator end(text);
assert (it1 == it2);
assertTrue (it1 == it2);
it2.swap(end);
assert (it1 != it2);
assertTrue (it1 != it2);
it2.swap(end);
assert (it1 == it2);
assertTrue (it1 == it2);
}