Move new password functions into tlsutility

[icinga2] / test / CMakeLists.txt

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 01488d3d9f0e3028dcc436393c62056f4c0cbf52..9d993feaead8f923d942a15b90676e7acb1b86a5 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Icinga 2
-# Copyright (C) 2012-2015 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
@@ -15,31 +15,27 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
+set(Boost_USE_STATIC_LIBS OFF)
+
 include(BoostTestTargets)
 
 set(base_test_SOURCES
-  base-array.cpp base-convert.cpp base-dictionary.cpp base-fifo.cpp
+  base-array.cpp base-base64.cpp base-convert.cpp base-dictionary.cpp base-fifo.cpp
   base-json.cpp base-match.cpp base-netstring.cpp base-object.cpp
   base-serialize.cpp base-shellescape.cpp base-stacktrace.cpp
   base-stream.cpp base-string.cpp base-timer.cpp base-type.cpp
-  base-value.cpp config-ops.cpp icinga-macros.cpp
-  icinga-perfdata.cpp test.cpp 
-  remote-url.cpp
-)
-
-set(livestatus_test_SOURCES
-  livestatus.cpp
-  test.cpp
+  base-value.cpp config-ops.cpp icinga-checkresult.cpp icinga-macros.cpp
+  icinga-notification.cpp
+  icinga-perfdata.cpp remote-url.cpp
+  remote-user.cpp
 )
 
-set_property(SOURCE test.cpp PROPERTY EXCLUDE_UNITY_BUILD TRUE)
-
 if(ICINGA2_UNITY_BUILD)
-    mkunity_target(test base_test_SOURCES)
+    mkunity_target(base test base_test_SOURCES)
 endif()
 
 add_boost_test(base
-  SOURCES test.cpp ${base_test_SOURCES}
+  SOURCES test-runner.cpp ${base_test_SOURCES}
   LIBRARIES base config icinga
   TESTS base_array/construct
         base_array/getset
@@ -49,6 +45,7 @@ add_boost_test(base
         base_array/foreach
         base_array/clone
         base_array/json
+        base_base64/base64
         base_convert/tolong
         base_convert/todouble
         base_convert/tostring
@@ -97,6 +94,16 @@ add_boost_test(base
         base_value/format
         config_ops/simple
         config_ops/advanced
+        icinga_checkresult/host_1attempt
+        icinga_checkresult/host_2attempts
+        icinga_checkresult/host_3attempts
+        icinga_checkresult/service_1attempt
+        icinga_checkresult/service_2attempts
+        icinga_checkresult/service_3attempts
+        icinga_checkresult/host_flapping_notification
+        icinga_checkresult/service_flapping_notification
+        icinga_notification/state_filter
+        icinga_notification/type_filter
         icinga_macros/simple
         icinga_perfdata/empty
         icinga_perfdata/simple
@@ -112,12 +119,36 @@ add_boost_test(base
         remote_url/get_and_set
         remote_url/format
         remote_url/illegal_legal_strings
+        api_user/password
 )
 
 if(ICINGA2_WITH_LIVESTATUS)
+  set(livestatus_test_SOURCES
+    livestatus.cpp
+  )
+
+  if(ICINGA2_UNITY_BUILD)
+      mkunity_target(livestatus test livestatus_test_SOURCES)
+  endif()
+
   add_boost_test(livestatus
-    SOURCES test.cpp ${livestatus_test_SOURCES}
-    LIBRARIES base config icinga cli livestatus
+    SOURCES test-runner.cpp livestatus-fixture.cpp ${livestatus_test_SOURCES}
+    LIBRARIES base config icinga livestatus
+    DEPENDENCIES methods
     TESTS livestatus/hosts livestatus/services
   )
 endif()
+
+set(icinga_checkable_test_SOURCES
+    icinga-checkable-flapping.cpp
+)
+
+add_boost_test(icinga_checkable
+  SOURCES icinga-checkable-test.cpp ${icinga_checkable_test_SOURCES}
+  LIBRARIES base config icinga cli
+  TESTS icinga_checkable_flapping/host_not_flapping
+        icinga_checkable_flapping/host_flapping
+        icinga_checkable_flapping/host_flapping_recover
+        icinga_checkable_flapping/host_flapping_docs_example
+)
+