From 8dbb5bad4b743731d0b22003c19ffeb71a90b3b2 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 16 May 2016 16:20:28 +0200 Subject: [PATCH] test(alerting): fix broken unit tests --- pkg/models/alerts_test.go | 2 +- pkg/services/sqlstore/alert_rule_changes_test.go | 2 +- pkg/services/sqlstore/alert_rule_test.go | 10 +++++----- pkg/services/sqlstore/alert_state_test.go | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/models/alerts_test.go b/pkg/models/alerts_test.go index e70f97d6163..704da36066c 100644 --- a/pkg/models/alerts_test.go +++ b/pkg/models/alerts_test.go @@ -346,7 +346,7 @@ func TestAlertModel(t *testing.T) { }, } - alerts := *cmd.GetAlertModels() + alerts := cmd.GetAlertModels() Convey("all properties have been set", func() { So(alerts, ShouldNotBeEmpty) diff --git a/pkg/services/sqlstore/alert_rule_changes_test.go b/pkg/services/sqlstore/alert_rule_changes_test.go index ed939497250..d4c641fef2f 100644 --- a/pkg/services/sqlstore/alert_rule_changes_test.go +++ b/pkg/services/sqlstore/alert_rule_changes_test.go @@ -40,7 +40,7 @@ func TestAlertRuleChangesDataAccess(t *testing.T) { } cmd := m.SaveAlertsCommand{ - Alerts: &items, + Alerts: items, DashboardId: testDash.Id, OrgId: FakeOrgId, UserId: 2, diff --git a/pkg/services/sqlstore/alert_rule_test.go b/pkg/services/sqlstore/alert_rule_test.go index becffcfa1ba..a91de723f8d 100644 --- a/pkg/services/sqlstore/alert_rule_test.go +++ b/pkg/services/sqlstore/alert_rule_test.go @@ -34,7 +34,7 @@ func TestAlertingDataAccess(t *testing.T) { } cmd := m.SaveAlertsCommand{ - Alerts: &items, + Alerts: items, DashboardId: testDash.Id, OrgId: 1, UserId: 1, @@ -80,7 +80,7 @@ func TestAlertingDataAccess(t *testing.T) { DashboardId: testDash.Id, OrgId: 1, UserId: 1, - Alerts: &modifiedItems, + Alerts: modifiedItems, } err := SaveAlerts(&modifiedCmd) @@ -135,7 +135,7 @@ func TestAlertingDataAccess(t *testing.T) { }, } - cmd.Alerts = &multipleItems + cmd.Alerts = multipleItems err = SaveAlerts(&cmd) Convey("Should save 3 dashboards", func() { @@ -156,7 +156,7 @@ func TestAlertingDataAccess(t *testing.T) { Convey("should updated two dashboards and delete one", func() { missingOneAlert := multipleItems[:2] - cmd.Alerts = &missingOneAlert + cmd.Alerts = missingOneAlert err = SaveAlerts(&cmd) Convey("should delete the missing alert", func() { @@ -195,7 +195,7 @@ func TestAlertingDataAccess(t *testing.T) { } cmd := m.SaveAlertsCommand{ - Alerts: &items, + Alerts: items, DashboardId: testDash.Id, OrgId: 1, UserId: 1, diff --git a/pkg/services/sqlstore/alert_state_test.go b/pkg/services/sqlstore/alert_state_test.go index 4a3628e099d..a598169e15e 100644 --- a/pkg/services/sqlstore/alert_state_test.go +++ b/pkg/services/sqlstore/alert_state_test.go @@ -33,7 +33,7 @@ func TestAlertingStateAccess(t *testing.T) { } cmd := m.SaveAlertsCommand{ - Alerts: &items, + Alerts: items, DashboardId: testDash.Id, OrgId: 1, UserId: 1,