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

@@ -43,24 +43,24 @@ void WinConfigurationTest::testConfiguration()
{
WinRegistryKey regKey("HKEY_CURRENT_USER\\Software\\Applied Informatics\\Test");
if (regKey.exists()) regKey.deleteKey();
assert (!regKey.exists());
assertTrue (!regKey.exists());
AutoPtr<WinRegistryConfiguration> pReg = new WinRegistryConfiguration("HKEY_CURRENT_USER\\Software\\Applied Informatics\\Test");
pReg->setString("name1", "value1");
assert (pReg->getString("name1") == "value1");
assertTrue (pReg->getString("name1") == "value1");
pReg->setInt("name1", 1); // overwrite should also change type
assert (pReg->getInt("name1") == 1);
assertTrue (pReg->getInt("name1") == 1);
pReg->setString("name2", "value2");
assert (pReg->getString("name2") == "value2");
assertTrue (pReg->getString("name2") == "value2");
#if defined(POCO_HAVE_INT64)
pReg->setUInt64("name2", std::numeric_limits<UInt64>::max()); // overwrite should also change type
assert (pReg->getUInt64("name2") == std::numeric_limits<UInt64>::max());
assertTrue (pReg->getUInt64("name2") == std::numeric_limits<UInt64>::max());
pReg->setInt64("name2", std::numeric_limits<Int64>::min());
assert (pReg->getInt64("name2") == std::numeric_limits<Int64>::min());
assertTrue (pReg->getInt64("name2") == std::numeric_limits<Int64>::min());
/// write real int64 value type
regKey.setInt64("name3", std::numeric_limits<Int64>::max());
assert (pReg->getInt64("name3") == std::numeric_limits<Int64>::max());
assertTrue (pReg->getInt64("name3") == std::numeric_limits<Int64>::max());
#endif
/// create fake binary data
@@ -70,67 +70,67 @@ void WinConfigurationTest::testConfiguration()
data[i] = rand() % 256;
regKey.setBinary("name4", data);
assert (pReg->getString("name4") == std::string(data.begin(), data.end()));
assertTrue (pReg->getString("name4") == std::string(data.begin(), data.end()));
assert (pReg->hasProperty("name1"));
assert (pReg->hasProperty("name2"));
assertTrue (pReg->hasProperty("name1"));
assertTrue (pReg->hasProperty("name2"));
std::string dfl = pReg->getString("nonexistent", "default");
assert (dfl == "default");
assertTrue (dfl == "default");
AutoPtr<Poco::Util::AbstractConfiguration> pView = pReg->createView("config");
dfl = pView->getString("sub.foo", "default");
assert (dfl == "default");
assertTrue (dfl == "default");
pView->setString("sub.foo", "bar");
assert (pView->getString("sub.foo", "default") == "bar");
assertTrue (pView->getString("sub.foo", "default") == "bar");
std::string value;
assert (pReg->convertToRegFormat("A.B.C", value) == "A\\B");
assert (value == "C");
assertTrue (pReg->convertToRegFormat("A.B.C", value) == "A\\B");
assertTrue (value == "C");
Poco::Util::AbstractConfiguration::Keys keys;
pReg->keys(keys);
assert (keys.size() == 5);
assert (std::find(keys.begin(), keys.end(), "name1") != keys.end());
assert (std::find(keys.begin(), keys.end(), "name2") != keys.end());
assert (std::find(keys.begin(), keys.end(), "name3") != keys.end());
assert (std::find(keys.begin(), keys.end(), "name4") != keys.end());
assert (std::find(keys.begin(), keys.end(), "config") != keys.end());
assertTrue (keys.size() == 5);
assertTrue (std::find(keys.begin(), keys.end(), "name1") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "name2") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "name3") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "name4") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "config") != keys.end());
pReg->keys("config", keys);
assert (keys.size() == 1);
assert (std::find(keys.begin(), keys.end(), "sub") != keys.end());
assertTrue (keys.size() == 1);
assertTrue (std::find(keys.begin(), keys.end(), "sub") != keys.end());
AutoPtr<WinRegistryConfiguration> pRootReg = new WinRegistryConfiguration("");
assert (pRootReg->getInt("HKEY_CURRENT_USER.Software.Applied Informatics.Test.name1") == 1);
assertTrue (pRootReg->getInt("HKEY_CURRENT_USER.Software.Applied Informatics.Test.name1") == 1);
pRootReg->keys(keys);
#if defined(_WIN32_WCE)
assert (keys.size() == 4);
assert (std::find(keys.begin(), keys.end(), "HKEY_CLASSES_ROOT") != keys.end());
assert (std::find(keys.begin(), keys.end(), "HKEY_CURRENT_USER") != keys.end());
assert (std::find(keys.begin(), keys.end(), "HKEY_LOCAL_MACHINE") != keys.end());
assert (std::find(keys.begin(), keys.end(), "HKEY_USERS") != keys.end());
assertTrue (keys.size() == 4);
assertTrue (std::find(keys.begin(), keys.end(), "HKEY_CLASSES_ROOT") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "HKEY_CURRENT_USER") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "HKEY_LOCAL_MACHINE") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "HKEY_USERS") != keys.end());
#else
assert (keys.size() == 6);
assert (std::find(keys.begin(), keys.end(), "HKEY_CLASSES_ROOT") != keys.end());
assert (std::find(keys.begin(), keys.end(), "HKEY_CURRENT_CONFIG") != keys.end());
assert (std::find(keys.begin(), keys.end(), "HKEY_CURRENT_USER") != keys.end());
assert (std::find(keys.begin(), keys.end(), "HKEY_LOCAL_MACHINE") != keys.end());
assert (std::find(keys.begin(), keys.end(), "HKEY_PERFORMANCE_DATA") != keys.end());
assert (std::find(keys.begin(), keys.end(), "HKEY_USERS") != keys.end());
assertTrue (keys.size() == 6);
assertTrue (std::find(keys.begin(), keys.end(), "HKEY_CLASSES_ROOT") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "HKEY_CURRENT_CONFIG") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "HKEY_CURRENT_USER") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "HKEY_LOCAL_MACHINE") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "HKEY_PERFORMANCE_DATA") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "HKEY_USERS") != keys.end());
#endif
pRootReg->keys("HKEY_CURRENT_USER.Software.Applied Informatics.Test", keys);
assert (keys.size() == 5);
assert (std::find(keys.begin(), keys.end(), "name1") != keys.end());
assert (std::find(keys.begin(), keys.end(), "name2") != keys.end());
assert (std::find(keys.begin(), keys.end(), "name3") != keys.end());
assert (std::find(keys.begin(), keys.end(), "name4") != keys.end());
assert (std::find(keys.begin(), keys.end(), "config") != keys.end());
assertTrue (keys.size() == 5);
assertTrue (std::find(keys.begin(), keys.end(), "name1") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "name2") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "name3") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "name4") != keys.end());
assertTrue (std::find(keys.begin(), keys.end(), "config") != keys.end());
}