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

@@ -36,68 +36,68 @@ void ConfigurationViewTest::testView()
{
AutoPtr<AbstractConfiguration> pConf = createConfiguration();
AutoPtr<AbstractConfiguration> pView = pConf->createView("");
assert (pView->hasProperty("prop1"));
assert (pView->hasProperty("prop2"));
assertTrue (pView->hasProperty("prop1"));
assertTrue (pView->hasProperty("prop2"));
AbstractConfiguration::Keys keys;
pView->keys(keys);
assert (keys.size() == 13);
assert (std::find(keys.begin(), keys.end(), "prop1") != keys.end());
assert (std::find(keys.begin(), keys.end(), "prop2") != keys.end());
assert (std::find(keys.begin(), keys.end(), "prop3") != keys.end());
assert (std::find(keys.begin(), keys.end(), "prop4") != keys.end());
assertTrue (keys.size() == 13);
assertTrue (std::find(keys.begin(), keys.end(), "prop1") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "prop2") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "prop3") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "prop4") != keys.end());
assert (pView->getString("prop1") == "foo");
assert (pView->getString("prop3.string1") == "foo");
assertTrue (pView->getString("prop1") == "foo");
assertTrue (pView->getString("prop3.string1") == "foo");
pView->setString("prop6", "foobar");
assert (pConf->getString("prop6") == "foobar");
assertTrue (pConf->getString("prop6") == "foobar");
pView = pConf->createView("prop1");
pView->keys(keys);
assert (keys.empty());
assert (pView->hasProperty("prop1"));
assertTrue (keys.empty());
assertTrue (pView->hasProperty("prop1"));
pView->setString("prop11", "foobar");
assert (pConf->getString("prop1.prop11") == "foobar");
assertTrue (pConf->getString("prop1.prop11") == "foobar");
pView = pConf->createView("prop3");
pView->keys(keys);
assert (keys.size() == 2);
assert (std::find(keys.begin(), keys.end(), "string1") != keys.end());
assert (std::find(keys.begin(), keys.end(), "string2") != keys.end());
assertTrue (keys.size() == 2);
assertTrue (std::find(keys.begin(), keys.end(), "string1") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "string2") != keys.end());
assert (pView->getString("string1") == "foo");
assert (pView->getString("string2") == "bar");
assertTrue (pView->getString("string1") == "foo");
assertTrue (pView->getString("string2") == "bar");
pView->setString("string3", "foobar");
assert (pConf->getString("prop3.string3") == "foobar");
assertTrue (pConf->getString("prop3.string3") == "foobar");
pView = pConf->createView("prop5");
pView->keys(keys);
assert (keys.size() == 4);
assert (std::find(keys.begin(), keys.end(), "string1") != keys.end());
assert (std::find(keys.begin(), keys.end(), "string1") != keys.end());
assert (std::find(keys.begin(), keys.end(), "sub1") != keys.end());
assert (std::find(keys.begin(), keys.end(), "sub2") != keys.end());
assertTrue (keys.size() == 4);
assertTrue (std::find(keys.begin(), keys.end(), "string1") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "string1") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "sub1") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "sub2") != keys.end());
assert (pView->getString("sub1.string1") == "FOO");
assert (pView->getString("sub2.string2") == "Bar");
assertTrue (pView->getString("sub1.string1") == "FOO");
assertTrue (pView->getString("sub2.string2") == "Bar");
pView = pConf->createView("prop5.sub1");
pView->keys(keys);
assert (keys.size() == 2);
assert (std::find(keys.begin(), keys.end(), "string1") != keys.end());
assert (std::find(keys.begin(), keys.end(), "string2") != keys.end());
assertTrue (keys.size() == 2);
assertTrue (std::find(keys.begin(), keys.end(), "string1") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "string2") != keys.end());
assert (pView->getString("string1") == "FOO");
assert (pView->getString("string2") == "BAR");
assertTrue (pView->getString("string1") == "FOO");
assertTrue (pView->getString("string2") == "BAR");
pView->setString("string3", "foobar");
assert (pConf->getString("prop5.sub1.string3") == "foobar");
assertTrue (pConf->getString("prop5.sub1.string3") == "foobar");
pView->remove("string3");
assert (!pConf->hasProperty("prop5.sub1.string3"));
assertTrue (!pConf->hasProperty("prop5.sub1.string3"));
}