Merge pull request #6544 from gunnarbeutner/fix/deprecated-strstream-header

[icinga2] / test / base-type.cpp

diff --git a/test/base-type.cpp b/test/base-type.cpp
index 47b160b02c6b489b808019056f3c1fe698706041..9013f9f7c073e4b8a58c5814b527205034bc8cee 100644 (file)
--- a/test/base-type.cpp
+++ b/test/base-type.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2013 Icinga Development Team (http://www.icinga.org/)   *
+ * Copyright (C) 2012-2018 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,14 +17,12 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/perfdatavalue.h"
-#include "base/dictionary.h"
-#include "base/objectlock.h"
-#include "base/application.h"
-#include "base/type.h"
-#include <boost/test/unit_test.hpp>
-#include <boost/foreach.hpp>
-#include <boost/tuple/tuple.hpp>
+#include "base/perfdatavalue.hpp"
+#include "base/dictionary.hpp"
+#include "base/objectlock.hpp"
+#include "base/application.hpp"
+#include "base/type.hpp"
+#include <BoostTestTargetConfig.h>
 
 using namespace icinga;
 
@@ -32,15 +30,15 @@ BOOST_AUTO_TEST_SUITE(base_type)
 
 BOOST_AUTO_TEST_CASE(gettype)
 {
-       const Type *t = GetType<Application>();
+       Type::Ptr t = Type::GetByName("Application");
 
        BOOST_CHECK(t);
 }
 
 BOOST_AUTO_TEST_CASE(assign)
 {
-       const Type *t1 = GetType<Application>();
-       const Type *t2 = GetType<DynamicObject>();
+       Type::Ptr t1 = Type::GetByName("Application");
+       Type::Ptr t2 = Type::GetByName("ConfigObject");
 
        BOOST_CHECK(t1->IsAssignableFrom(t1));
        BOOST_CHECK(t2->IsAssignableFrom(t1));
@@ -49,16 +47,16 @@ BOOST_AUTO_TEST_CASE(assign)
 
 BOOST_AUTO_TEST_CASE(byname)
 {
-       const Type *t = Type::GetByName("Application");
+       Type::Ptr t = Type::GetByName("Application");
 
        BOOST_CHECK(t);
 }
 
 BOOST_AUTO_TEST_CASE(instantiate)
 {
-       const Type *t = Type::GetByName("PerfdataValue");
+       Type::Ptr t = Type::GetByName("PerfdataValue");
 
-       Object::Ptr p = t->Instantiate();
+       Object::Ptr p = t->Instantiate(std::vector<Value>());
 
        BOOST_CHECK(p);
 }