tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6181 from Icinga/fix/boosttest-fixture-order 

tests: Ensure IcingaApplication is initialized before adding config
This commit is contained in:
Gunnar Beutner 2018-03-26 14:45:01 +02:00 committed by GitHub
parent d5ddc877dd 3adfd396f4
commit fa615ec291
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 95 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/CMakeLists.txt
View File

@ -18,6 +18,7 @@
include(BoostTestTargets)
set(base_test_SOURCES
icingaapplication-fixture.cpp
base-array.cpp
base-base64.cpp
base-convert.cpp
@ -56,7 +57,7 @@ endif()
add_boost_test(base
SOURCES test-runner.cpp ${base_test_SOURCES}
LIBRARIES ${base_DEPS}
TESTS
TESTS
base_array/construct
base_array/getset
base_array/resize
@ -145,6 +146,7 @@ add_boost_test(base
if(ICINGA2_WITH_LIVESTATUS)
set(livestatus_test_SOURCES
icingaapplication-fixture.cpp
livestatus-fixture.cpp
livestatus.cpp
${base_OBJS}
@ -167,6 +169,7 @@ if(ICINGA2_WITH_LIVESTATUS)
endif()
set(icinga_checkable_test_SOURCES
icingaapplication-fixture.cpp
icinga-checkable-fixture.cpp
icinga-checkable-flapping.cpp
${base_OBJS}

49
test/icingaapplication-fixture.cpp Normal file
View File

@ -0,0 +1,49 @@
/******************************************************************************
* Icinga 2 *
* 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 *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the Free Software Foundation *
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#include "icingaapplication-fixture.hpp"
using namespace icinga;
static bool IcingaInitialized = false;
IcingaApplicationFixture::IcingaApplicationFixture()
{
if (!IcingaInitialized)
InitIcingaApplication();
}
void IcingaApplicationFixture::InitIcingaApplication()
{
BOOST_TEST_MESSAGE("Initializing Application...");
Application::InitializeBase();
BOOST_TEST_MESSAGE("Initializing IcingaApplication...");
IcingaApplication::Ptr appInst = new IcingaApplication();
static_pointer_cast<ConfigObject>(appInst)->OnConfigLoaded();
IcingaInitialized = true;
}
IcingaApplicationFixture::~IcingaApplicationFixture()
{
IcingaApplication::GetInstance().reset();
}
BOOST_GLOBAL_FIXTURE(IcingaApplicationFixture);

38
test/icingaapplication-fixture.hpp Normal file
View File

@ -0,0 +1,38 @@
/******************************************************************************
* Icinga 2 *
* 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 *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the Free Software Foundation *
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
#ifndef ICINGAAPPLICATION_FIXTURE_H
#define ICINGAAPPLICATION_FIXTURE_H
#include "icinga/icingaapplication.hpp"
#include "base/application.hpp"
#include <BoostTestTargetConfig.h>
using namespace icinga;
struct IcingaApplicationFixture
{
IcingaApplicationFixture();
void InitIcingaApplication();
~IcingaApplicationFixture();
};
#endif // ICINGAAPPLICATION_FIXTURE_H

4
test/livestatus-fixture.cpp
View File

@ -21,6 +21,7 @@
#include "config/configitem.hpp"
#include "base/application.hpp"
#include "base/loader.hpp"
#include "icingaapplication-fixture.hpp"
#include <BoostTestTargetConfig.h>
using namespace icinga;
@ -29,6 +30,9 @@ struct LivestatusFixture
{
LivestatusFixture()
{
// ensure IcingaApplication is initialized before we try to add config
IcingaApplicationFixture icinga;
BOOST_TEST_MESSAGE("Preparing config objects...");
ConfigItem::RunWithActivationContext(new Function("CreateTestObjects", CreateTestObjects));

24
test/test-runner.cpp
View File

@ -19,28 +19,4 @@
#define BOOST_TEST_MAIN
#include "icinga/icingaapplication.hpp"
#include "base/application.hpp"
#include <BoostTestTargetConfig.h>
using namespace icinga;
struct TestIcingaApplication
{
TestIcingaApplication()
{
Application::InitializeBase();
IcingaApplication::Ptr appInst;
appInst = new IcingaApplication();
static_pointer_cast<ConfigObject>(appInst)->OnConfigLoaded();
}
~TestIcingaApplication()
{
IcingaApplication::GetInstance().reset();
}
};
BOOST_GLOBAL_FIXTURE(TestIcingaApplication);