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

@@ -79,21 +79,21 @@ void AutoPtrTest::testAutoPtr()
{
{
AutoPtr<TestObj> ptr = new TestObj;
assert (ptr->rc() == 1);
assertTrue (ptr->rc() == 1);
AutoPtr<TestObj> ptr2 = ptr;
assert (ptr->rc() == 2);
assertTrue (ptr->rc() == 2);
ptr2 = new TestObj;
assert (ptr->rc() == 1);
assertTrue (ptr->rc() == 1);
AutoPtr<TestObj> ptr3;
ptr3 = ptr2;
assert (ptr2->rc() == 2);
assertTrue (ptr2->rc() == 2);
ptr3 = new TestObj;
assert (ptr2->rc() == 1);
assertTrue (ptr2->rc() == 1);
ptr3 = ptr2;
assert (ptr2->rc() == 2);
assert (TestObj::count() > 0);
assertTrue (ptr2->rc() == 2);
assertTrue (TestObj::count() > 0);
}
assert (TestObj::count() == 0);
assertTrue (TestObj::count() == 0);
}
@@ -109,59 +109,59 @@ void AutoPtrTest::testOps()
pTO1 = pTO2;
pTO2 = pTmp;
}
assert (pTO1 < pTO2);
assertTrue (pTO1 < pTO2);
ptr1 = pTO1;
AutoPtr<TestObj> ptr2 = pTO2;
AutoPtr<TestObj> ptr3 = ptr1;
AutoPtr<TestObj> ptr4;
assert (ptr1.get() == pTO1);
assert (ptr1 == pTO1);
assert (ptr2.get() == pTO2);
assert (ptr2 == pTO2);
assert (ptr3.get() == pTO1);
assert (ptr3 == pTO1);
assertTrue (ptr1.get() == pTO1);
assertTrue (ptr1 == pTO1);
assertTrue (ptr2.get() == pTO2);
assertTrue (ptr2 == pTO2);
assertTrue (ptr3.get() == pTO1);
assertTrue (ptr3 == pTO1);
assert (ptr1 == pTO1);
assert (ptr1 != pTO2);
assert (ptr1 < pTO2);
assert (ptr1 <= pTO2);
assert (ptr2 > pTO1);
assert (ptr2 >= pTO1);
assertTrue (ptr1 == pTO1);
assertTrue (ptr1 != pTO2);
assertTrue (ptr1 < pTO2);
assertTrue (ptr1 <= pTO2);
assertTrue (ptr2 > pTO1);
assertTrue (ptr2 >= pTO1);
assert (ptr1 == ptr3);
assert (ptr1 != ptr2);
assert (ptr1 < ptr2);
assert (ptr1 <= ptr2);
assert (ptr2 > ptr1);
assert (ptr2 >= ptr1);
assertTrue (ptr1 == ptr3);
assertTrue (ptr1 != ptr2);
assertTrue (ptr1 < ptr2);
assertTrue (ptr1 <= ptr2);
assertTrue (ptr2 > ptr1);
assertTrue (ptr2 >= ptr1);
ptr1 = pTO1;
ptr2 = pTO2;
ptr1.swap(ptr2);
assert (ptr2.get() == pTO1);
assert (ptr1.get() == pTO2);
assertTrue (ptr2.get() == pTO1);
assertTrue (ptr1.get() == pTO2);
try
{
assert (ptr4->rc() > 0);
assertTrue (ptr4->rc() > 0);
fail ("must throw NullPointerException");
}
catch (NullPointerException&)
{
}
assert (!(ptr4 == ptr1));
assert (!(ptr4 == ptr2));
assert (ptr4 != ptr1);
assert (ptr4 != ptr2);
assertTrue (!(ptr4 == ptr1));
assertTrue (!(ptr4 == ptr2));
assertTrue (ptr4 != ptr1);
assertTrue (ptr4 != ptr2);
ptr4 = ptr2;
assert (ptr4 == ptr2);
assert (!(ptr4 != ptr2));
assertTrue (ptr4 == ptr2);
assertTrue (!(ptr4 != ptr2));
assert (!(!ptr1));
assertTrue (!(!ptr1));
ptr1 = 0;
assert (!ptr1);
assertTrue (!ptr1);
}