tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 07:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix failing unit tests

Browse Source 
refs #8043
This commit is contained in:
Gunnar Beutner 2014-12-10 11:25:20 +01:00
parent c381e15b5a
commit d88856a994
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/base/convert.cpp
View File

@ -22,11 +22,6 @@
using namespace icinga; using namespace icinga;
bool Convert::ToBool(const String& val)
{
return (ToLong(val) != 0);
}
String Convert::ToString(const String& val) String Convert::ToString(const String& val)
{ {
return val; return val;

5
lib/base/convert.hpp
View File

@ -64,7 +64,10 @@ public:
return val; return val;
} }
static bool ToBool(const String& val); static inline bool ToBool(const Value& val)
{
return val.ToBool();
}
template<typename T> template<typename T>
static String ToString(const T& val) static String ToString(const T& val)

6
test/base-convert.cpp
View File

@ -60,10 +60,12 @@ BOOST_AUTO_TEST_CASE(tostring)
BOOST_AUTO_TEST_CASE(tobool) BOOST_AUTO_TEST_CASE(tobool)
{ {
BOOST_CHECK_THROW(Convert::ToBool("a"), boost::exception); BOOST_CHECK(Convert::ToBool("a") == true);
BOOST_CHECK(Convert::ToBool("0") == false); BOOST_CHECK(Convert::ToBool("0") == true);
BOOST_CHECK(Convert::ToBool("1") == true); BOOST_CHECK(Convert::ToBool("1") == true);
BOOST_CHECK(Convert::ToBool("2") == true); BOOST_CHECK(Convert::ToBool("2") == true);
BOOST_CHECK(Convert::ToBool(1) == true);
BOOST_CHECK(Convert::ToBool(0) == false);
BOOST_CHECK(Convert::ToBool(Value(true)) == true); BOOST_CHECK(Convert::ToBool(Value(true)) == true);
BOOST_CHECK(Convert::ToBool(Value(false)) == false); BOOST_CHECK(Convert::ToBool(Value(false)) == false);
} }