Fix failing unit tests

refs #8043

diff --git a/lib/base/convert.cpp b/lib/base/convert.cpp
index 12a074e5278f7d98110caac338f4945a83bf9f72..f90be4b772128d081e7cea834b3a8fac1aaa5cfe 100644 (file)
--- a/lib/base/convert.cpp
+++ b/lib/base/convert.cpp
@@ -22,11 +22,6 @@
 
 using namespace icinga;
 
-bool Convert::ToBool(const String& val)
-{
-       return (ToLong(val) != 0);
-}
-
 String Convert::ToString(const String& val)
 {
        return val;

diff --git a/lib/base/convert.hpp b/lib/base/convert.hpp
index 2b152d488bf6af7cb86f7bafe7c35c7798ef348d..f637ac8f67051679dc859f05829ffc4221c8ef6d 100644 (file)
--- a/lib/base/convert.hpp
+++ b/lib/base/convert.hpp
@@ -64,7 +64,10 @@ public:
                return val;
        }
 
-       static bool ToBool(const String& val);
+       static inline bool ToBool(const Value& val)
+       {
+               return val.ToBool();
+       }
 
        template<typename T>
        static String ToString(const T& val)

diff --git a/test/base-convert.cpp b/test/base-convert.cpp
index 0eaa35db1b8724744885bff71a8881e88215b507..574e146656b73d017c6152f4b8ea40bbcfa6f59b 100644 (file)
--- a/test/base-convert.cpp
+++ b/test/base-convert.cpp
@@ -60,10 +60,12 @@ BOOST_AUTO_TEST_CASE(tostring)
 
 BOOST_AUTO_TEST_CASE(tobool)
 {
-       BOOST_CHECK_THROW(Convert::ToBool("a"), boost::exception);
-       BOOST_CHECK(Convert::ToBool("0") == false);
+       BOOST_CHECK(Convert::ToBool("a") == true);
+       BOOST_CHECK(Convert::ToBool("0") == true);
        BOOST_CHECK(Convert::ToBool("1") == 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(false)) == false);
 }