Skip to content

Commit

Permalink
get rid of ensure.False
Browse files Browse the repository at this point in the history
  • Loading branch information
vtopc committed Nov 2, 2024
1 parent 2f7fd84 commit 6d4748a
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 17 deletions.
11 changes: 5 additions & 6 deletions email_validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"encoding/json"
"testing"

"github.com/facebookgo/ensure"
"github.com/mailgun/mailgun-go/v4"
"github.com/stretchr/testify/require"
)
Expand All @@ -21,8 +20,8 @@ func TestEmailValidationV4(t *testing.T) {

require.True(t, ev.IsValid)
require.Equal(t, "", ev.MailboxVerification)
ensure.False(t, ev.IsDisposableAddress)
ensure.False(t, ev.IsRoleAddress)
require.False(t, ev.IsDisposableAddress)
require.False(t, ev.IsRoleAddress)
require.Equal(t, "", ev.Parts.DisplayName)
require.Equal(t, "foo", ev.Parts.LocalPart)
require.Equal(t, "mailgun.com", ev.Parts.Domain)
Expand All @@ -33,7 +32,7 @@ func TestEmailValidationV4(t *testing.T) {
require.Equal(t, "deliverable", ev.Result)
require.Equal(t, "disengaged", ev.Engagement.Behavior)
require.False(t, ev.Engagement.Engaging)
ensure.False(t, ev.Engagement.IsBot)
require.False(t, ev.Engagement.IsBot)
}

func TestParseAddresses(t *testing.T) {
Expand Down Expand Up @@ -78,8 +77,8 @@ func TestUnmarshallResponse(t *testing.T) {

require.True(t, ev.IsValid)
require.Equal(t, "unknown", ev.MailboxVerification)
ensure.False(t, ev.IsDisposableAddress)
ensure.False(t, ev.IsRoleAddress)
require.False(t, ev.IsDisposableAddress)
require.False(t, ev.IsRoleAddress)
require.Equal(t, "", ev.Parts.DisplayName)
require.Equal(t, "some_email", ev.Parts.LocalPart)
require.Equal(t, "aol.com", ev.Parts.Domain)
Expand Down
4 changes: 2 additions & 2 deletions mailing_lists_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func TestMailingListMembers(t *testing.T) {
}
require.NoError(t, mg.CreateMember(ctx, true, address, protoJoe))
newCount := countMembers()
ensure.False(t, newCount <= startCount)
require.False(t, newCount <= startCount)

theMember, err := mg.GetMember(ctx, "[email protected]", address)
require.NoError(t, err)
Expand Down Expand Up @@ -129,7 +129,7 @@ func TestMailingLists(t *testing.T) {
}()

actualCount := countLists()
ensure.False(t, actualCount < 1)
require.False(t, actualCount < 1)

theList, err := mg.GetMailingList(ctx, address)
require.NoError(t, err)
Expand Down
4 changes: 2 additions & 2 deletions routes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func TestRouteCRUD(t *testing.T) {
}()

newCount := countRoutes()
ensure.False(t, newCount <= routeCount)
require.False(t, newCount <= routeCount)

theRoute, err := mg.GetRoute(ctx, newRoute.Id)
require.NoError(t, err)
Expand All @@ -67,7 +67,7 @@ func TestRoutesIterator(t *testing.T) {
var ctx = context.Background()

// Calling Last() is invalid unless you first use First() or Next()
ensure.False(t, it.Last(ctx, &lastPage))
require.False(t, it.Last(ctx, &lastPage))
require.Len(t, lastPage, 0)

// Get our first page
Expand Down
6 changes: 3 additions & 3 deletions spam_complaints_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ func TestCreateDeleteComplaint(t *testing.T) {
}

randomMail := strings.ToLower(randomString(64, "")) + "@example.com"
ensure.False(t, hasComplaint(randomMail))
require.False(t, hasComplaint(randomMail))

require.NoError(t, mg.CreateComplaint(ctx, randomMail))
require.True(t, hasComplaint(randomMail))
require.NoError(t, mg.DeleteComplaint(ctx, randomMail))
ensure.False(t, hasComplaint(randomMail))
require.False(t, hasComplaint(randomMail))
}

func TestCreateDeleteComplaintList(t *testing.T) {
Expand Down Expand Up @@ -102,7 +102,7 @@ func TestCreateDeleteComplaintList(t *testing.T) {
for _, address := range addresses {
require.True(t, hasComplaint(address))
require.NoError(t, mg.DeleteComplaint(ctx, address))
ensure.False(t, hasComplaint(address))
require.False(t, hasComplaint(address))
}

}
3 changes: 1 addition & 2 deletions template_versions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"
"testing"

"github.com/facebookgo/ensure"
"github.com/mailgun/mailgun-go/v4"
"github.com/stretchr/testify/require"
)
Expand Down Expand Up @@ -89,7 +88,7 @@ func TestTemplateVersionsCRUD(t *testing.T) {
require.NoError(t, mg.DeleteTemplateVersion(ctx, tmpl.Name, version.Tag))

// Ensure version was deleted
ensure.False(t, findVersion(tmpl.Name, version.Tag))
require.False(t, findVersion(tmpl.Name, version.Tag))

// Delete the template
require.NoError(t, mg.DeleteTemplate(ctx, tmpl.Name))
Expand Down
3 changes: 1 addition & 2 deletions webhooks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"strings"
"testing"

"github.com/facebookgo/ensure"
"github.com/mailgun/mailgun-go/v4"
"github.com/stretchr/testify/require"
)
Expand Down Expand Up @@ -59,7 +58,7 @@ func TestWebhookCRUD(t *testing.T) {
}()

newCount := countHooks()
ensure.False(t, newCount <= hookCount)
require.False(t, newCount <= hookCount)

urls, err := mg.GetWebhook(ctx, "deliver")
require.NoError(t, err)
Expand Down

0 comments on commit 6d4748a

Please sign in to comment.