Skip to content

remove testify dependency #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 1, 2025
Merged

remove testify dependency #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions discord/icon_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"testing"

"github.com/disgoorg/json/v2"
"github.com/stretchr/testify/assert"
)

type iconTest struct {
Expand All @@ -20,13 +19,21 @@ func TestIcon_MarshalJSON(t *testing.T) {
}

data, err := json.Marshal(v)
assert.NoError(t, err)
assert.Equal(t, `{"icon":"data:image/jpeg;base64,data"}`, string(data))

v = iconTest{
Icon: nil,
if err != nil {
t.Fatalf("unexpected error marshaling: %v", err)
}
expected := `{"icon":"data:image/jpeg;base64,data"}`
if string(data) != expected {
t.Errorf("expected %s, got %s", expected, string(data))
}

v = iconTest{Icon: nil}
data, err = json.Marshal(v)
assert.NoError(t, err)
assert.Equal(t, "{}", string(data))
if err != nil {
t.Fatalf("unexpected error marshaling: %v", err)
}
expected = "{}"
if string(data) != expected {
t.Errorf("expected %s, got %s", expected, string(data))
}
}
41 changes: 31 additions & 10 deletions discord/permissions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"testing"

"github.com/disgoorg/json/v2"
"github.com/stretchr/testify/assert"
)

type permissionTestStruct struct {
Expand All @@ -17,30 +16,52 @@ func TestPermissions_MarshalJSON(t *testing.T) {
}

jsonPerms, err := json.Marshal(someStruct)
assert.NoError(t, err)
assert.Equal(t, "{\"permissions\":\"67108928\"}", string(jsonPerms))
if err != nil {
t.Fatalf("unexpected error marshaling: %v", err)
}

expected := `{"permissions":"67108928"}`
if string(jsonPerms) != expected {
t.Errorf("expected %s, got %s", expected, string(jsonPerms))
}
}

func TestPermissions_UnmarshalJSON(t *testing.T) {
var someStruct permissionTestStruct

err := json.Unmarshal([]byte("{\"permissions\":\"67108928\"}"), &someStruct)
assert.NoError(t, err)
assert.Equal(t, permissionTestStruct{Permissions: PermissionAddReactions | PermissionChangeNickname}, someStruct)
err := json.Unmarshal([]byte(`{"permissions":"67108928"}`), &someStruct)
if err != nil {
t.Fatalf("unexpected error unmarshaling: %v", err)
}

expected := permissionTestStruct{Permissions: PermissionAddReactions | PermissionChangeNickname}
if someStruct != expected {
t.Errorf("expected %+v, got %+v", expected, someStruct)
}
}

func TestPermissions_Add(t *testing.T) {
assert.Equal(t, PermissionAddReactions, Permissions.Add(PermissionAddReactions))
got := Permissions.Add(PermissionAddReactions)
if got != PermissionAddReactions {
t.Errorf("expected %v, got %v", PermissionAddReactions, got)
}
}

func TestPermissions_Remove(t *testing.T) {
assert.Equal(t, PermissionManageChannels, (PermissionAddReactions | PermissionManageChannels).Remove(PermissionAddReactions))
got := (PermissionAddReactions | PermissionManageChannels).Remove(PermissionAddReactions)
if got != PermissionManageChannels {
t.Errorf("expected %v, got %v", PermissionManageChannels, got)
}
}

func TestPermissions_Has(t *testing.T) {
assert.True(t, PermissionAddReactions.Has(PermissionAddReactions))
if !PermissionAddReactions.Has(PermissionAddReactions) {
t.Errorf("expected PermissionAddReactions to have PermissionAddReactions")
}
}

func TestPermissions_Missing(t *testing.T) {
assert.True(t, PermissionManageChannels.Missing(PermissionAddReactions))
if !PermissionManageChannels.Missing(PermissionAddReactions) {
t.Errorf("expected PermissionManageChannels to be missing PermissionAddReactions")
}
}
44 changes: 27 additions & 17 deletions gateway/identify_rate_limiter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import (
"sync"
"testing"
"time"

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

func TestIdentifyRateLimiterImpl(t *testing.T) {
Expand All @@ -19,17 +17,21 @@ func TestIdentifyRateLimiterImpl(t *testing.T) {
var wg sync.WaitGroup
for shardID := range 3 {
wg.Add(1)
go func() {
go func(id int) {
defer wg.Done()
err := r.Wait(context.Background(), shardID)
assert.NoError(t, err)
r.Unlock(shardID)
}()
err := r.Wait(context.Background(), id)
if err != nil {
t.Errorf("unexpected error for shard %d: %v", id, err)
}
r.Unlock(id)
}(shardID)
}
wg.Wait()

expected := start.Add(200 * time.Millisecond)
assert.WithinDuration(t, expected, time.Now(), 10*time.Millisecond)
if !time.Now().After(expected.Add(-10*time.Millisecond)) || !time.Now().Before(expected.Add(10*time.Millisecond)) {
t.Errorf("expected current time to be within 10ms of %v, got %v", expected, time.Now())
}
}

func TestIdentifyRateLimiterImpl_WithMaxConcurrency(t *testing.T) {
Expand All @@ -42,17 +44,21 @@ func TestIdentifyRateLimiterImpl_WithMaxConcurrency(t *testing.T) {
var wg sync.WaitGroup
for shardID := range 6 {
wg.Add(1)
go func() {
go func(id int) {
defer wg.Done()
err := r.Wait(context.Background(), shardID)
assert.NoError(t, err)
r.Unlock(shardID)
}()
err := r.Wait(context.Background(), id)
if err != nil {
t.Errorf("unexpected error for shard %d: %v", id, err)
}
r.Unlock(id)
}(shardID)
}
wg.Wait()

expected := start.Add(100 * time.Millisecond)
assert.WithinDuration(t, expected, time.Now(), 10*time.Millisecond)
if !time.Now().After(expected.Add(-10*time.Millisecond)) || !time.Now().Before(expected.Add(10*time.Millisecond)) {
t.Errorf("expected current time to be within 10ms of %v, got %v", expected, time.Now())
}
}

func TestIdentifyRateLimiterImpl_WaitWithTimeout(t *testing.T) {
Expand All @@ -64,11 +70,15 @@ func TestIdentifyRateLimiterImpl_WaitWithTimeout(t *testing.T) {
defer cancel()

err := r.Wait(ctx, 0)
assert.NoError(t, err)
if err != nil {
t.Fatalf("unexpected error on first wait: %v", err)
}

err = r.Wait(ctx, 0)
if assert.Error(t, err) {
assert.Equal(t, context.DeadlineExceeded, err)
if err == nil {
t.Errorf("expected error on second wait due to timeout, got nil")
} else if err != context.DeadlineExceeded {
t.Errorf("expected DeadlineExceeded error, got %v", err)
}

r.Unlock(0)
Expand Down
8 changes: 1 addition & 7 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,7 @@ require (
github.com/disgoorg/snowflake/v2 v2.0.3
github.com/gorilla/websocket v1.5.3
github.com/sasha-s/go-csync v0.0.0-20240107134140-fcbab37b09ad
github.com/stretchr/testify v1.10.0
golang.org/x/crypto v0.39.0
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/sys v0.33.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
require golang.org/x/sys v0.33.0 // indirect
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,5 @@ golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
Loading