tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 15:44:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement a unit test for nullary lambdas

Browse Source 
fixes #7805
This commit is contained in:
Gunnar Beutner 2015-02-03 14:02:32 +01:00
parent a82b55bcc6
commit e3dcc8a610
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/function.hpp
View File

@ -44,7 +44,7 @@ public:
Function(const Callback& function); Function(const Callback& function);
Value Invoke(const std::vector<Value>& arguments); Value Invoke(const std::vector<Value>& arguments = std::vector<Value>());
static Object::Ptr GetPrototype(void); static Object::Ptr GetPrototype(void);

3
lib/icinga/macroprocessor.cpp
View File

@ -184,8 +184,7 @@ Value MacroProcessor::EvaluateFunction(const Function::Ptr& func, const Resolver
recursionLevel))); recursionLevel)));
ScriptFrame frame(resolvers_this); ScriptFrame frame(resolvers_this);
std::vector<Value> args; return func->Invoke();
return func->Invoke(args);
} }
Value MacroProcessor::InternalResolveMacros(const String& str, const ResolverList& resolvers, Value MacroProcessor::InternalResolveMacros(const String& str, const ResolverList& resolvers,

6
test/config-ops.cpp
View File

@ -209,6 +209,7 @@ BOOST_AUTO_TEST_CASE(advanced)
{ {
ScriptFrame frame; ScriptFrame frame;
Expression *expr; Expression *expr;
Function::Ptr func;
expr = ConfigCompiler::CompileText("<test>", "regex(\"^Hello\", \"Hello World\")"); expr = ConfigCompiler::CompileText("<test>", "regex(\"^Hello\", \"Hello World\")");
BOOST_CHECK(expr->Evaluate(frame)); BOOST_CHECK(expr->Evaluate(frame));
@ -319,6 +320,11 @@ BOOST_AUTO_TEST_CASE(advanced)
expr = ConfigCompiler::CompileText("<test>", "Array.x"); expr = ConfigCompiler::CompileText("<test>", "Array.x");
BOOST_CHECK_THROW(expr->Evaluate(frame), ScriptError); BOOST_CHECK_THROW(expr->Evaluate(frame), ScriptError);
delete expr; delete expr;
expr = ConfigCompiler::CompileText("<test>", "{{ 3 }}");
func = expr->Evaluate(frame);
BOOST_CHECK(func->Invoke() == 3);
delete expr;
} }
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()