Move new password functions into tlsutility

[icinga2] / test / base-convert.cpp

diff --git a/test/base-convert.cpp b/test/base-convert.cpp
index cc27bd2b37fa8b692b6e2ff6d87a47513f81c916..5c899b70cf16d802be85d0e4453a2695dc0070cc 100644 (file)
--- a/test/base-convert.cpp
+++ b/test/base-convert.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2013 Icinga Development Team (http://www.icinga.org/)   *
+ * Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)  *
  *                                                                            *
  * This program is free software; you can redistribute it and/or              *
  * modify it under the terms of the GNU General Public License                *
@@ -17,9 +17,9 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "base/convert.h"
-#include "base/object.h"
-#include <boost/test/unit_test.hpp>
+#include "base/convert.hpp"
+#include "base/object.hpp"
+#include <BoostTestTargetConfig.h>
 #include <iostream>
 
 using namespace icinga;
@@ -46,21 +46,26 @@ BOOST_AUTO_TEST_CASE(todouble)
 BOOST_AUTO_TEST_CASE(tostring)
 {
        BOOST_CHECK(Convert::ToString(7) == "7");
-       BOOST_CHECK(Convert::ToString(7.5) == "7.5");
+       BOOST_CHECK(Convert::ToString(7.5) == "7.500000");
        BOOST_CHECK(Convert::ToString("hello") == "hello");
 
+       String str = "hello";
+       BOOST_CHECK(Convert::ToString(str) == "hello");
+
        BOOST_CHECK(Convert::ToString(Value(7)) == "7");
-       BOOST_CHECK(Convert::ToString(Value(7.5)) == "7.5");
+       BOOST_CHECK(Convert::ToString(Value(7.5)) == "7.500000");
        BOOST_CHECK(Convert::ToString(Value("hello")) == "hello");
        BOOST_CHECK(Convert::ToString(Value("hello hello")) == "hello hello");
 }
 
 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);
 }