From aae33b36ddd9c92d5b4904a6593eedb0a16694d4 Mon Sep 17 00:00:00 2001 From: utkarshcmu Date: Thu, 17 Nov 2016 01:41:23 -0800 Subject: [PATCH] Added tests for firingEvaluation string --- pkg/services/alerting/eval_handler.go | 2 +- pkg/services/alerting/eval_handler_test.go | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkg/services/alerting/eval_handler.go b/pkg/services/alerting/eval_handler.go index 620f8c9a121..e0ccea24ade 100644 --- a/pkg/services/alerting/eval_handler.go +++ b/pkg/services/alerting/eval_handler.go @@ -47,7 +47,7 @@ func (e *DefaultEvalHandler) Eval(context *EvalContext) { if i > 0 { firingEval = "[" + firingEval + " " + operator + " " + strconv.FormatBool(cr.Firing) + "]" } else { - firingEval = "[" + strconv.FormatBool(firing) + "]" + firingEval = strconv.FormatBool(firing) } context.EvalMatches = append(context.EvalMatches, cr.EvalMatches...) diff --git a/pkg/services/alerting/eval_handler_test.go b/pkg/services/alerting/eval_handler_test.go index 4ef79504e78..1bda0c7c609 100644 --- a/pkg/services/alerting/eval_handler_test.go +++ b/pkg/services/alerting/eval_handler_test.go @@ -30,6 +30,7 @@ func TestAlertingExecutor(t *testing.T) { handler.Eval(context) So(context.Firing, ShouldEqual, true) + So(context.FiringEval, ShouldEqual, "true = true") }) Convey("Show return false with not passing asdf", func() { @@ -42,6 +43,7 @@ func TestAlertingExecutor(t *testing.T) { handler.Eval(context) So(context.Firing, ShouldEqual, false) + So(context.FiringEval, ShouldEqual, "[true AND false] = false") }) Convey("Show return true if any of the condition is passing with OR operator", func() { @@ -54,6 +56,7 @@ func TestAlertingExecutor(t *testing.T) { handler.Eval(context) So(context.Firing, ShouldEqual, true) + So(context.FiringEval, ShouldEqual, "[true OR false] = true") }) Convey("Show return false if any of the condition is failing with AND operator", func() { @@ -66,6 +69,7 @@ func TestAlertingExecutor(t *testing.T) { handler.Eval(context) So(context.Firing, ShouldEqual, false) + So(context.FiringEval, ShouldEqual, "[true AND false] = false") }) Convey("Show return true if one condition is failing with nested OR operator", func() { @@ -79,6 +83,7 @@ func TestAlertingExecutor(t *testing.T) { handler.Eval(context) So(context.Firing, ShouldEqual, true) + So(context.FiringEval, ShouldEqual, "[[true AND true] OR false] = true") }) Convey("Show return false if one condition is passing with nested OR operator", func() { @@ -92,6 +97,7 @@ func TestAlertingExecutor(t *testing.T) { handler.Eval(context) So(context.Firing, ShouldEqual, false) + So(context.FiringEval, ShouldEqual, "[[true AND false] OR false] = false") }) Convey("Show return false if a condition is failing with nested AND operator", func() { @@ -105,6 +111,7 @@ func TestAlertingExecutor(t *testing.T) { handler.Eval(context) So(context.Firing, ShouldEqual, false) + So(context.FiringEval, ShouldEqual, "[[true AND false] AND true] = false") }) Convey("Show return true if a condition is passing with nested OR operator", func() { @@ -118,6 +125,7 @@ func TestAlertingExecutor(t *testing.T) { handler.Eval(context) So(context.Firing, ShouldEqual, true) + So(context.FiringEval, ShouldEqual, "[[true OR false] OR true] = true") }) }) }