From 912bf309d1f102f8f10c96c718784f01901dad4d Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 14 Nov 2018 01:11:40 +0200 Subject: Fix tests --- matrix/pushrules/rule_array_test.go | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'matrix/pushrules/rule_array_test.go') diff --git a/matrix/pushrules/rule_array_test.go b/matrix/pushrules/rule_array_test.go index 9396411..5a5bd3d 100644 --- a/matrix/pushrules/rule_array_test.go +++ b/matrix/pushrules/rule_array_test.go @@ -19,6 +19,7 @@ package pushrules_test import ( "github.com/stretchr/testify/assert" "maunium.net/go/gomuks/matrix/pushrules" + "maunium.net/go/mautrix" "testing" ) @@ -61,9 +62,9 @@ func TestPushRuleArray_GetActions_FirstMatchReturns(t *testing.T) { rules := pushrules.PushRuleArray{rule1, rule2, rule3} - event := newFakeEvent("m.room.message", map[string]interface{}{ - "msgtype": "m.emote", - "body": "is testing pushrules", + event := newFakeEvent(mautrix.EventMessage, mautrix.Content{ + MsgType: mautrix.MsgEmote, + Body: "is testing pushrules", }) assert.Equal(t, rules.GetActions(blankTestRoom, event), actions2) } @@ -107,9 +108,9 @@ func TestPushRuleArray_GetActions_NoMatchesIsNil(t *testing.T) { rules := pushrules.PushRuleArray{rule1, rule2, rule3} - event := newFakeEvent("m.room.message", map[string]interface{}{ - "msgtype": "m.emote", - "body": "is testing pushrules", + event := newFakeEvent(mautrix.EventMessage, mautrix.Content{ + MsgType: mautrix.MsgEmote, + Body: "is testing pushrules", }) assert.Nil(t, rules.GetActions(blankTestRoom, event)) } @@ -156,9 +157,9 @@ func TestPushRuleMap_GetActions_RoomRuleExists(t *testing.T) { Type: pushrules.RoomRule, } - event := newFakeEvent("m.room.message", map[string]interface{}{ - "msgtype": "m.emote", - "body": "is testing pushrules", + event := newFakeEvent(mautrix.EventMessage, mautrix.Content{ + MsgType: mautrix.MsgEmote, + Body: "is testing pushrules", }) assert.Equal(t, rules.GetActions(blankTestRoom, event), actions3) } @@ -194,9 +195,9 @@ func TestPushRuleMap_GetActions_RoomRuleDoesntExist(t *testing.T) { Type: pushrules.RoomRule, } - event := newFakeEvent("m.room.message", map[string]interface{}{ - "msgtype": "m.emote", - "body": "is testing pushrules", + event := newFakeEvent(mautrix.EventMessage, mautrix.Content{ + MsgType: mautrix.MsgEmote, + Body: "is testing pushrules", }) assert.Nil(t, rules.GetActions(blankTestRoom, event)) } @@ -243,9 +244,9 @@ func TestPushRuleMap_GetActions_SenderRuleExists(t *testing.T) { Type: pushrules.SenderRule, } - event := newFakeEvent("m.room.message", map[string]interface{}{ - "msgtype": "m.emote", - "body": "is testing pushrules", + event := newFakeEvent(mautrix.EventMessage, mautrix.Content{ + MsgType: mautrix.MsgEmote, + Body: "is testing pushrules", }) assert.Equal(t, rules.GetActions(blankTestRoom, event), actions1) } -- cgit v1.2.3