generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-30 13:47:10 +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

122
Foundation/testsuite/src/AnyTest.cpp
View File

@@ -54,9 +54,9 @@ void AnyTest::testDefaultCtor()
{
const Any value;
assert (value.empty());
assert (0 == AnyCast<int>(&value));
assert (value.type() == typeid(void));
assertTrue (value.empty());
assertTrue (0 == AnyCast<int>(&value));
assertTrue (value.type() == typeid(void));
}
@@ -65,12 +65,12 @@ void AnyTest::testConvertingCtor()
std::string text = "test message";
Any value = text;
assert (!value.empty());
assert (value.type() == typeid(std::string));
assert (0 == AnyCast<int>(&value));
assert (0 != AnyCast<std::string>(&value));
assert (AnyCast<std::string>(value) == text);
assert (AnyCast<std::string>(&value) != &text);
assertTrue (!value.empty());
assertTrue (value.type() == typeid(std::string));
assertTrue (0 == AnyCast<int>(&value));
assertTrue (0 != AnyCast<std::string>(&value));
assertTrue (AnyCast<std::string>(value) == text);
assertTrue (AnyCast<std::string>(&value) != &text);
}
@@ -79,11 +79,11 @@ void AnyTest::testCopyCtor()
std::string text = "test message";
Any original = text, copy = original;
assert (!copy.empty());
assert (original.type() == copy.type());
assert (AnyCast<std::string>(original) == AnyCast<std::string>(copy));
assert (text == AnyCast<std::string>(copy));
assert (AnyCast<std::string>(&original) != AnyCast<std::string>(&copy));
assertTrue (!copy.empty());
assertTrue (original.type() == copy.type());
assertTrue (AnyCast<std::string>(original) == AnyCast<std::string>(copy));
assertTrue (text == AnyCast<std::string>(copy));
assertTrue (AnyCast<std::string>(&original) != AnyCast<std::string>(&copy));
}
@@ -93,19 +93,19 @@ void AnyTest::testCopyAssign()
Any original = text, copy;
Any* assignResult = &(copy = original);
assert (!copy.empty());
assert (original.type() == copy.type());
assert (AnyCast<std::string>(original) == AnyCast<std::string>(copy));
assert (text == AnyCast<std::string>(copy));
assert (AnyCast<std::string>(&original) != AnyCast<std::string>(&copy));
assert (assignResult == &copy);
assertTrue (!copy.empty());
assertTrue (original.type() == copy.type());
assertTrue (AnyCast<std::string>(original) == AnyCast<std::string>(copy));
assertTrue (text == AnyCast<std::string>(copy));
assertTrue (AnyCast<std::string>(&original) != AnyCast<std::string>(&copy));
assertTrue (assignResult == &copy);
// test self assignment
Any& ref = original;
original = ref;
assert (AnyCast<std::string>(original) == AnyCast<std::string>(copy));
assertTrue (AnyCast<std::string>(original) == AnyCast<std::string>(copy));
original = original;
assert (AnyCast<std::string>(original) == AnyCast<std::string>(copy));
assertTrue (AnyCast<std::string>(original) == AnyCast<std::string>(copy));
}
@@ -115,13 +115,13 @@ void AnyTest::testConvertingAssign()
Any value;
Any* assignResult = &(value = text);
assert (!value.empty());
assert (value.type() == typeid(std::string));
assert (0 == AnyCast<int>(&value));
assert (0 != AnyCast<std::string>(&value));
assert (AnyCast<std::string>(value) == text);
assert (AnyCast<std::string>(&value) != &text);
assert (assignResult == &value);
assertTrue (!value.empty());
assertTrue (value.type() == typeid(std::string));
assertTrue (0 == AnyCast<int>(&value));
assertTrue (0 != AnyCast<std::string>(&value));
assertTrue (AnyCast<std::string>(value) == text);
assertTrue (AnyCast<std::string>(&value) != &text);
assertTrue (assignResult == &value);
}
@@ -136,17 +136,17 @@ void AnyTest::testCastToReference()
int const volatile& ra_cv = AnyCast<int const volatile&>(a);
// cv references to same obj
assert (&ra == &ra_c && &ra == &ra_v && &ra == &ra_cv);
assertTrue (&ra == &ra_c && &ra == &ra_v && &ra == &ra_cv);
int const & rb_c = AnyCast<int const &>(b);
int const volatile & rb_cv = AnyCast<int const volatile &>(b);
assert (&rb_c == &rb_cv); // cv references to copied const obj
assert (&ra != &rb_c); // copies hold different objects
assertTrue (&rb_c == &rb_cv); // cv references to copied const obj
assertTrue (&ra != &rb_c); // copies hold different objects
++ra;
int incremented = AnyCast<int>(a);
assert (incremented == 138); // increment by reference changes value
assertTrue (incremented == 138); // increment by reference changes value
try
{
@@ -185,15 +185,15 @@ void AnyTest::testSwap()
std::string* originalPtr = AnyCast<std::string>(&original);
Any* swapResult = &original.swap(swapped);
assert (original.empty());
assert (!swapped.empty());
assert (swapped.type() == typeid(std::string));
assert (text == AnyCast<std::string>(swapped));
assert (0 != originalPtr);
assertTrue (original.empty());
assertTrue (!swapped.empty());
assertTrue (swapped.type() == typeid(std::string));
assertTrue (text == AnyCast<std::string>(swapped));
assertTrue (0 != originalPtr);
#ifdef POCO_NO_SOO // pointers only match when heap-allocated
assert (originalPtr == AnyCast<std::string>(&swapped));
assertTrue (originalPtr == AnyCast<std::string>(&swapped));
#endif
assert (swapResult == &original);
assertTrue (swapResult == &original);
}
@@ -203,29 +203,29 @@ void AnyTest::testEmptyCopy()
Any copied = null, assigned;
assigned = null;
assert (null.empty());
assert (copied.empty());
assert (assigned.empty());
assertTrue (null.empty());
assertTrue (copied.empty());
assertTrue (assigned.empty());
}
void AnyTest::testInt()
{
Any e;
assert (e.empty());
assertTrue (e.empty());
Any a = 13;
assert (a.type() == typeid(int));
assertTrue (a.type() == typeid(int));
int* i = AnyCast<int>(&a);
assert (*i == 13);
assertTrue (*i == 13);
Any b = a;
assert (b.type() == typeid(int));
assertTrue (b.type() == typeid(int));
int *cpyI = AnyCast<int>(&b);
assert (*cpyI == *i);
assertTrue (*cpyI == *i);
*cpyI = 20;
assert (*cpyI != *i);
assertTrue (*cpyI != *i);
std::string* s = AnyCast<std::string>(&a);
assert (s == NULL);
assertTrue (s == NULL);
int POCO_UNUSED tmp = AnyCast<int>(a);
const Any c = a;
@@ -238,14 +238,14 @@ void AnyTest::testComplexType()
SomeClass str(13,std::string("hello"));
Any a = str;
Any b = a;
assert (a.type() == typeid(SomeClass));
assert (b.type() == typeid(SomeClass));
assertTrue (a.type() == typeid(SomeClass));
assertTrue (b.type() == typeid(SomeClass));
SomeClass str2 = AnyCast<SomeClass>(a);
assert (str == str2);
assertTrue (str == str2);
const SomeClass& strCRef = RefAnyCast<SomeClass>(a);
assert (str == strCRef);
assertTrue (str == strCRef);
SomeClass& strRef = RefAnyCast<SomeClass>(a);
assert (str == strRef);
assertTrue (str == strRef);
}
@@ -256,17 +256,17 @@ void AnyTest::testVector()
tmp.push_back(2);
tmp.push_back(3);
Any a = tmp;
assert (a.type() == typeid(std::vector<int>));
assertTrue (a.type() == typeid(std::vector<int>));
std::vector<int> tmp2 = AnyCast<std::vector<int> >(a);
assert (tmp2.size() == 3);
assertTrue (tmp2.size() == 3);
const std::vector<int>& vecCRef = RefAnyCast<std::vector<int> >(a);
std::vector<int>& vecRef = RefAnyCast<std::vector<int> >(a);
assert (vecRef[0] == 1);
assert (vecRef[1] == 2);
assert (vecRef[2] == 3);
assertTrue (vecRef[0] == 1);
assertTrue (vecRef[1] == 2);
assertTrue (vecRef[2] == 3);
vecRef[0] = 0;
assert (vecRef[0] == vecCRef[0]);
assertTrue (vecRef[0] == vecCRef[0]);
}