Skip to content

Commit

Permalink
Drop test wrappers (#81)
Browse files Browse the repository at this point in the history 
totally unnecessary
  • Loading branch information
@ferhatelmas
ferhatelmas authored Jun 23, 2020
1 parent b17bcb7 commit fdd2cf2
Show file tree
Hide file tree
Showing 9 changed files with 71 additions and 79 deletions.
6 changes: 4 additions & 2 deletions app_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ package stream_chat //nolint: golint
import (
"log"
"testing"

"github.com/stretchr/testify/require"
)

func TestClient_GetApp(t *testing.T) {
c := initClient(t)
_, err := c.GetAppConfig()
mustNoError(t, err)
require.NoError(t, err)
}

func TestClient_UpdateAppSettings(t *testing.T) {
Expand All @@ -19,7 +21,7 @@ func TestClient_UpdateAppSettings(t *testing.T) {
SetDisablePermissions(true)

err := c.UpdateAppSettings(settings)
mustNoError(t, err)
require.NoError(t, err)
}

// See https://getstream.io/chat/docs/app_settings_auth/ for
Expand Down
60 changes: 30 additions & 30 deletions channel_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func TestClient_CreateChannel(t *testing.T) {
t.Run("get existing channel", func(t *testing.T) {
ch := initChannel(t, c)
got, err := c.CreateChannel(ch.Type, ch.ID, serverUser.ID, nil)
mustNoError(t, err, "create channel", ch)
require.NoError(t, err, "create channel", ch)

assert.Equal(t, c, got.client, "client link")
assert.Equal(t, ch.Type, got.Type, "channel type")
Expand Down Expand Up @@ -44,11 +44,11 @@ func TestClient_CreateChannel(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
got, err := c.CreateChannel(tt._type, tt.id, tt.userID, tt.data)
if tt.wantErr {
mustError(t, err, "create channel", tt)
require.Error(t, err, "create channel", tt)
return
}

mustNoError(t, err, "create channel", tt)
require.NoError(t, err, "create channel", tt)

assert.Equal(t, tt._type, got.Type, "channel type")
assert.NotEmpty(t, got.ID)
Expand All @@ -66,7 +66,7 @@ func TestChannel_AddMembers(t *testing.T) {
chanID := randomString(12)

ch, err := c.CreateChannel("messaging", chanID, serverUser.ID, nil)
mustNoError(t, err, "create channel")
require.NoError(t, err, "create channel")
defer func() {
_ = ch.Delete()
}()
Expand All @@ -79,10 +79,10 @@ func TestChannel_AddMembers(t *testing.T) {
[]string{user.ID},
&Message{Text: "some members", User: &User{ID: user.ID}},
)
mustNoError(t, err, "add members")
require.NoError(t, err, "add members")

// refresh channel state
mustNoError(t, ch.refresh(), "refresh channel")
require.NoError(t, ch.refresh(), "refresh channel")

assert.Equal(t, user.ID, ch.Members[0].User.ID, "members contain user id")
}
Expand All @@ -103,7 +103,7 @@ func TestChannel_InviteMembers(t *testing.T) {
chanID := randomString(12)

ch, err := c.CreateChannel("messaging", chanID, serverUser.ID, nil)
mustNoError(t, err, "create channel")
require.NoError(t, err, "create channel")
defer func() {
_ = ch.Delete()
}()
Expand All @@ -113,10 +113,10 @@ func TestChannel_InviteMembers(t *testing.T) {
user := randomUser()

err = ch.InviteMembers(user.ID)
mustNoError(t, err, "invite members")
require.NoError(t, err, "invite members")

// refresh channel state
mustNoError(t, ch.refresh(), "refresh channel")
require.NoError(t, ch.refresh(), "refresh channel")

assert.Equal(t, user.ID, ch.Members[0].User.ID, "members contain user id")
assert.Equal(t, true, ch.Members[0].Invited, "member is invited")
Expand All @@ -130,7 +130,7 @@ func TestChannel_Moderation(t *testing.T) {
// init random channel
chanID := randomString(12)
ch, err := c.CreateChannel("messaging", chanID, serverUser.ID, nil)
mustNoError(t, err, "create channel")
require.NoError(t, err, "create channel")
defer func() {
_ = ch.Delete()
}()
Expand All @@ -144,19 +144,19 @@ func TestChannel_Moderation(t *testing.T) {
&Message{Text: "accepted", User: &User{ID: user.ID}},
)

mustNoError(t, err, "add moderators")
require.NoError(t, err, "add moderators")

// refresh channel state
mustNoError(t, ch.refresh(), "refresh channel")
require.NoError(t, ch.refresh(), "refresh channel")

assert.Equal(t, user.ID, ch.Members[0].User.ID, "user exists")
assert.Equal(t, "moderator", ch.Members[0].Role, "user role is moderator")

err = ch.DemoteModerators(user.ID)
mustNoError(t, err, "demote moderators")
require.NoError(t, err, "demote moderators")

// refresh channel state
mustNoError(t, ch.refresh(), "refresh channel")
require.NoError(t, ch.refresh(), "refresh channel")

assert.Equal(t, user.ID, ch.Members[0].User.ID, "user exists")
assert.Equal(t, "member", ch.Members[0].Role, "user role is member")
Expand All @@ -172,23 +172,23 @@ func TestChannel_BanUser(t *testing.T) {
user := randomUser()

err := ch.BanUser(user.ID, serverUser.ID, nil)
mustNoError(t, err, "ban user")
require.NoError(t, err, "ban user")

err = ch.BanUser(user.ID, serverUser.ID, map[string]interface{}{
"timeout": 3600,
"reason": "offensive language is not allowed here",
})
mustNoError(t, err, "ban user")
require.NoError(t, err, "ban user")

err = ch.UnBanUser(user.ID, nil)
mustNoError(t, err, "unban user")
require.NoError(t, err, "unban user")
}

func TestChannel_Delete(t *testing.T) {
c := initClient(t)
ch := initChannel(t, c)

mustNoError(t, ch.Delete(), "delete channel")
require.NoError(t, ch.Delete(), "delete channel")
}

func TestChannel_GetReplies(t *testing.T) {
Expand All @@ -203,14 +203,14 @@ func TestChannel_GetReplies(t *testing.T) {
msg := &Message{Text: "test message"}

msg, err := ch.SendMessage(msg, user.ID)
mustNoError(t, err, "send message")
require.NoError(t, err, "send message")

reply := &Message{Text: "test reply", ParentID: msg.ID, Type: MessageTypeReply}
_, err = ch.SendMessage(reply, serverUser.ID)
mustNoError(t, err, "send reply")
require.NoError(t, err, "send reply")

replies, err := ch.GetReplies(msg.ID, nil)
mustNoError(t, err, "get replies")
require.NoError(t, err, "get replies")
assert.Len(t, replies, 1)
}

Expand All @@ -231,7 +231,7 @@ func TestChannel_RemoveMembers(t *testing.T) {
&Message{Text: "some members", User: &User{ID: user.ID}},
)

mustNoError(t, err, "remove members")
require.NoError(t, err, "remove members")

for _, member := range ch.Members {
assert.NotEqual(t, member.User.ID, user.ID, "member is not present")
Expand All @@ -256,7 +256,7 @@ func TestChannel_SendMessage(t *testing.T) {
}

msg, err := ch.SendMessage(msg, serverUser.ID)
mustNoError(t, err, "send message")
require.NoError(t, err, "send message")
// check that message was updated
assert.NotEmpty(t, msg.ID, "message has ID")
assert.NotEmpty(t, msg.HTML, "message has HTML body")
Expand All @@ -275,18 +275,18 @@ func TestChannel_Truncate(t *testing.T) {
User: user,
}
msg, err := ch.SendMessage(msg, serverUser.ID)
mustNoError(t, err, "send message")
require.NoError(t, err, "send message")

// refresh channel state
mustNoError(t, ch.refresh(), "refresh channel")
require.NoError(t, ch.refresh(), "refresh channel")

assert.Equal(t, ch.Messages[0].ID, msg.ID, "message exists")

err = ch.Truncate()
mustNoError(t, err, "truncate channel")
require.NoError(t, err, "truncate channel")

// refresh channel state
mustNoError(t, ch.refresh(), "refresh channel")
require.NoError(t, ch.refresh(), "refresh channel")

assert.Empty(t, ch.Messages, "message not exists")
}
Expand Down Expand Up @@ -385,7 +385,7 @@ func TestChannel_AcceptInvite(t *testing.T) {
c := initClient(t)

_, err := c.UpdateUsers(testUsers...)
mustNoError(t, err, "update users")
require.NoError(t, err, "update users")

members := make([]string, 0, len(testUsers))
for i := range testUsers {
Expand All @@ -406,7 +406,7 @@ func TestChannel_RejectInvite(t *testing.T) {
c := initClient(t)

_, err := c.UpdateUsers(testUsers...)
mustNoError(t, err, "update users")
require.NoError(t, err, "update users")

members := make([]string, 0, len(testUsers))
for i := range testUsers {
Expand All @@ -427,7 +427,7 @@ func TestChannel_Mute_Unmute(t *testing.T) {
c := initClient(t)

_, err := c.UpdateUsers(testUsers...)
mustNoError(t, err, "update users")
require.NoError(t, err, "update users")

members := make([]string, 0, len(testUsers))
for i := range testUsers {
Expand Down
7 changes: 4 additions & 3 deletions channel_type_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func prepareChannelType(t *testing.T, c *Client) *ChannelType {
ct := NewChannelType(randomString(10))

ct, err := c.CreateChannelType(ct)
mustNoError(t, err, "create channel type")
require.NoError(t, err, "create channel type")

return ct
}
Expand All @@ -24,7 +25,7 @@ func TestClient_GetChannelType(t *testing.T) {
}()

got, err := c.GetChannelType(ct.Name)
mustNoError(t, err, "get channel type")
require.NoError(t, err, "get channel type")

assert.Equal(t, ct.Name, got.Name)
assert.Equal(t, len(ct.Commands), len(got.Commands))
Expand All @@ -40,7 +41,7 @@ func TestClient_ListChannelTypes(t *testing.T) {
}()

got, err := c.ListChannelTypes()
mustNoError(t, err, "list channel types")
require.NoError(t, err, "list channel types")

assert.Contains(t, got, ct.Name)
}
Expand Down
6 changes: 3 additions & 3 deletions client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

func initClient(t *testing.T) *Client {
c, err := NewClient(APIKey, []byte(APISecret))
mustNoError(t, err, "new client")
require.NoError(t, err, "new client")

// set hostname to client from env if present
if StreamHost != "" {
Expand All @@ -23,7 +23,7 @@ func initClient(t *testing.T) *Client {

func initChannel(t *testing.T, c *Client) *Channel {
_, err := c.UpdateUsers(testUsers...)
mustNoError(t, err, "update users")
require.NoError(t, err, "update users")

members := make([]string, 0, len(testUsers))
for i := range testUsers {
Expand All @@ -34,7 +34,7 @@ func initChannel(t *testing.T, c *Client) *Channel {
"members": members,
})

mustNoError(t, err, "create channel")
require.NoError(t, err, "create channel")
return ch
}

Expand Down
7 changes: 4 additions & 3 deletions device_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestClient_Devices(t *testing.T) {
Expand All @@ -17,13 +18,13 @@ func TestClient_Devices(t *testing.T) {
}

for _, dev := range devices {
mustNoError(t, c.AddDevice(dev), "add device")
require.NoError(t, c.AddDevice(dev), "add device")
defer func(dev *Device) {
mustNoError(t, c.DeleteDevice(user.ID, dev.ID), "delete device")
require.NoError(t, c.DeleteDevice(user.ID, dev.ID), "delete device")
}(dev)

resp, err := c.GetDevices(user.ID)
mustNoError(t, err, "get devices")
require.NoError(t, err, "get devices")

assert.True(t, deviceIDExists(resp, dev.ID), "device with ID %s was created", dev.ID)
}
Expand Down
11 changes: 6 additions & 5 deletions query_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestClient_QueryUsers(t *testing.T) {
Expand All @@ -17,7 +18,7 @@ func TestClient_QueryUsers(t *testing.T) {
}},
})

mustNoError(t, err, "query users error")
require.NoError(t, err, "query users error")

if assert.NotEmpty(t, users, "query users exists") {
assert.Equal(t, user.ID, users[0].ID, "received user ID")
Expand All @@ -34,7 +35,7 @@ func TestClient_QueryChannels(t *testing.T) {
},
}})

mustNoError(t, err, "query channels error")
require.NoError(t, err, "query channels error")

if assert.NotEmpty(t, got, "query channels exists") {
assert.Equal(t, ch.ID, got[0].ID, "received channel ID")
Expand All @@ -50,18 +51,18 @@ func TestClient_Search(t *testing.T) {
text := randomString(10)

_, err := ch.SendMessage(&Message{Text: text + " " + randomString(25)}, user1.ID)
mustNoError(t, err)
require.NoError(t, err)

_, err = ch.SendMessage(&Message{Text: text + " " + randomString(25)}, user2.ID)
mustNoError(t, err)
require.NoError(t, err)

got, err := c.Search(SearchRequest{Query: text, Filters: map[string]interface{}{
"members": map[string][]string{
"$in": {user1.ID, user2.ID},
},
}})

mustNoError(t, err)
require.NoError(t, err)

assert.Len(t, got, 2)
}
Loading

0 comments on commit fdd2cf2

Please sign in to comment.