From 6d4748ae0782090bdf21c10840db0a984668c5b9 Mon Sep 17 00:00:00 2001 From: Vilen Topchii <32271530+vtopc@users.noreply.github.com> Date: Sat, 2 Nov 2024 16:16:38 +0200 Subject: [PATCH] get rid of ensure.False --- email_validation_test.go | 11 +++++------ mailing_lists_test.go | 4 ++-- routes_test.go | 4 ++-- spam_complaints_test.go | 6 +++--- template_versions_test.go | 3 +-- webhooks_test.go | 3 +-- 6 files changed, 14 insertions(+), 17 deletions(-) diff --git a/email_validation_test.go b/email_validation_test.go index 44452683..b4100442 100644 --- a/email_validation_test.go +++ b/email_validation_test.go @@ -5,7 +5,6 @@ import ( "encoding/json" "testing" - "github.com/facebookgo/ensure" "github.com/mailgun/mailgun-go/v4" "github.com/stretchr/testify/require" ) @@ -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) @@ -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) { @@ -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) diff --git a/mailing_lists_test.go b/mailing_lists_test.go index d79fcd66..1b758f6e 100644 --- a/mailing_lists_test.go +++ b/mailing_lists_test.go @@ -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, "joe@example.com", address) require.NoError(t, err) @@ -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) diff --git a/routes_test.go b/routes_test.go index a2e59a1b..d55cebb7 100644 --- a/routes_test.go +++ b/routes_test.go @@ -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) @@ -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 diff --git a/spam_complaints_test.go b/spam_complaints_test.go index e8e70899..1c59c07f 100644 --- a/spam_complaints_test.go +++ b/spam_complaints_test.go @@ -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) { @@ -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)) } } diff --git a/template_versions_test.go b/template_versions_test.go index 8e78e7c1..48308210 100644 --- a/template_versions_test.go +++ b/template_versions_test.go @@ -4,7 +4,6 @@ import ( "context" "testing" - "github.com/facebookgo/ensure" "github.com/mailgun/mailgun-go/v4" "github.com/stretchr/testify/require" ) @@ -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)) diff --git a/webhooks_test.go b/webhooks_test.go index 447eb490..490a1898 100644 --- a/webhooks_test.go +++ b/webhooks_test.go @@ -13,7 +13,6 @@ import ( "strings" "testing" - "github.com/facebookgo/ensure" "github.com/mailgun/mailgun-go/v4" "github.com/stretchr/testify/require" ) @@ -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)