Fixed tests that broke because of previous breaking change
This commit is contained in:
parent
9873d475aa
commit
7905e2138b
|
@ -5,6 +5,7 @@ package bot
|
|||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/diamondburned/arikawa/discord"
|
||||
"github.com/diamondburned/arikawa/gateway"
|
||||
"github.com/diamondburned/arikawa/state"
|
||||
)
|
||||
|
@ -52,7 +53,9 @@ func TestSubcommandPlumb(t *testing.T) {
|
|||
|
||||
// Try call exactly what's in the Plumb example:
|
||||
m := &gateway.MessageCreateEvent{
|
||||
Content: "hasPlumb test command",
|
||||
Message: discord.Message{
|
||||
Content: "hasPlumb test command",
|
||||
},
|
||||
}
|
||||
|
||||
if err := c.callCmd(m); err != nil {
|
||||
|
|
|
@ -131,7 +131,9 @@ func TestContext(t *testing.T) {
|
|||
|
||||
// Mock a messageCreate event
|
||||
m := &gateway.MessageCreateEvent{
|
||||
Content: content,
|
||||
Message: discord.Message{
|
||||
Content: content,
|
||||
},
|
||||
}
|
||||
|
||||
var (
|
||||
|
@ -198,7 +200,9 @@ func TestContext(t *testing.T) {
|
|||
testMessage := func(content string) error {
|
||||
// Mock a messageCreate event
|
||||
m := &gateway.MessageCreateEvent{
|
||||
Content: content,
|
||||
Message: discord.Message{
|
||||
Content: content,
|
||||
},
|
||||
}
|
||||
|
||||
return ctx.callCmd(m)
|
||||
|
@ -270,7 +274,9 @@ func BenchmarkCall(b *testing.B) {
|
|||
}
|
||||
|
||||
m := &gateway.MessageCreateEvent{
|
||||
Content: "~noop",
|
||||
Message: discord.Message{
|
||||
Content: "~noop",
|
||||
},
|
||||
}
|
||||
|
||||
b.ResetTimer()
|
||||
|
|
|
@ -9,9 +9,16 @@ import (
|
|||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/diamondburned/arikawa/discord"
|
||||
"github.com/diamondburned/arikawa/gateway"
|
||||
)
|
||||
|
||||
func newMessage(content string) *gateway.MessageCreateEvent {
|
||||
return &gateway.MessageCreateEvent{
|
||||
Message: discord.Message{Content: content},
|
||||
}
|
||||
}
|
||||
|
||||
func TestCall(t *testing.T) {
|
||||
var results = make(chan string)
|
||||
|
||||
|
@ -24,25 +31,21 @@ func TestCall(t *testing.T) {
|
|||
results <- m.Content
|
||||
})
|
||||
|
||||
go h.Call(&gateway.MessageCreateEvent{
|
||||
Content: "test",
|
||||
})
|
||||
go h.Call(newMessage("hime arikawa"))
|
||||
|
||||
if r := <-results; r != "test" {
|
||||
if r := <-results; r != "hime arikawa" {
|
||||
t.Fatal("Returned results is wrong:", r)
|
||||
}
|
||||
|
||||
// Remove handler test
|
||||
rm()
|
||||
|
||||
go h.Call(&gateway.MessageCreateEvent{
|
||||
Content: "test",
|
||||
})
|
||||
go h.Call(newMessage("astolfo"))
|
||||
|
||||
select {
|
||||
case <-results:
|
||||
t.Fatal("Unexpected results")
|
||||
case <-time.After(time.Millisecond):
|
||||
case <-time.After(5 * time.Millisecond):
|
||||
break
|
||||
}
|
||||
|
||||
|
@ -70,9 +73,7 @@ func TestHandler(t *testing.T) {
|
|||
}
|
||||
|
||||
const result = "Hime Arikawa"
|
||||
var msg = &gateway.MessageCreateEvent{
|
||||
Content: result,
|
||||
}
|
||||
var msg = newMessage(result)
|
||||
|
||||
var msgV = reflect.ValueOf(msg)
|
||||
var msgT = msgV.Type()
|
||||
|
@ -99,9 +100,7 @@ func TestHandlerInterface(t *testing.T) {
|
|||
}
|
||||
|
||||
const result = "Hime Arikawa"
|
||||
var msg = &gateway.MessageCreateEvent{
|
||||
Content: result,
|
||||
}
|
||||
var msg = newMessage(result)
|
||||
|
||||
var msgV = reflect.ValueOf(msg)
|
||||
var msgT = msgV.Type()
|
||||
|
|
|
@ -81,7 +81,7 @@ func (s *State) Unhook() {
|
|||
|
||||
//// Helper methods
|
||||
|
||||
func (s *State) AuthorDisplayName(message discord.Message) string {
|
||||
func (s *State) AuthorDisplayName(message *gateway.MessageCreateEvent) string {
|
||||
if !message.GuildID.Valid() {
|
||||
return message.Author.Username
|
||||
}
|
||||
|
@ -101,9 +101,7 @@ func (s *State) AuthorDisplayName(message discord.Message) string {
|
|||
return n
|
||||
}
|
||||
|
||||
func (s *State) MemberDisplayName(
|
||||
guildID, userID discord.Snowflake) (string, error) {
|
||||
|
||||
func (s *State) MemberDisplayName(guildID, userID discord.Snowflake) (string, error) {
|
||||
member, err := s.Member(guildID, userID)
|
||||
if err != nil {
|
||||
return "", err
|
||||
|
@ -116,7 +114,7 @@ func (s *State) MemberDisplayName(
|
|||
return member.Nick, nil
|
||||
}
|
||||
|
||||
func (s *State) AuthorColor(message discord.Message) discord.Color {
|
||||
func (s *State) AuthorColor(message *gateway.MessageCreateEvent) discord.Color {
|
||||
if !message.GuildID.Valid() {
|
||||
return discord.DefaultMemberColor
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue