diff --git a/internal/client/repository/http/http_client_test.go b/internal/client/repository/http/http_client_test.go index bab9e52..2cd7837 100644 --- a/internal/client/repository/http/http_client_test.go +++ b/internal/client/repository/http/http_client_test.go @@ -6,7 +6,6 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" http "github.com/valyala/fasthttp" repository "source.toby3d.me/website/indieauth/internal/client/repository/http" @@ -41,7 +40,9 @@ func TestGet(t *testing.T) { t.Cleanup(cleanup) result, err := repository.NewHTTPClientRepository(httpClient).Get(context.TODO(), client.ID) - require.NoError(t, err) + if err != nil { + t.Fatal(err) + } assert.Equal(t, client.Name, result.Name) assert.Equal(t, client.ID.String(), result.ID.String()) diff --git a/internal/health/delivery/http/health_http_test.go b/internal/health/delivery/http/health_http_test.go index 2673c02..da929d1 100644 --- a/internal/health/delivery/http/health_http_test.go +++ b/internal/health/delivery/http/health_http_test.go @@ -5,7 +5,6 @@ import ( "github.com/fasthttp/router" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" http "github.com/valyala/fasthttp" delivery "source.toby3d.me/website/indieauth/internal/health/delivery/http" @@ -27,7 +26,10 @@ func TestRequestHandler(t *testing.T) { resp := http.AcquireResponse() defer http.ReleaseResponse(resp) - require.NoError(t, client.Do(req, resp)) + if err := client.Do(req, resp); err != nil { + t.Fatal(err) + } + assert.Equal(t, http.StatusOK, resp.StatusCode()) assert.Equal(t, `{"ok": true}`, string(resp.Body())) } diff --git a/internal/ticket/repository/memory/memory_ticket_test.go b/internal/ticket/repository/memory/memory_ticket_test.go index 74c22a7..922712e 100644 --- a/internal/ticket/repository/memory/memory_ticket_test.go +++ b/internal/ticket/repository/memory/memory_ticket_test.go @@ -3,13 +3,11 @@ package memory_test import ( "context" "path" + "reflect" "sync" "testing" "time" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "source.toby3d.me/website/indieauth/internal/domain" repository "source.toby3d.me/website/indieauth/internal/ticket/repository/memory" ) @@ -20,15 +18,21 @@ func TestCreate(t *testing.T) { store := new(sync.Map) ticket := domain.TestTicket(t) - require.NoError(t, repository.NewMemoryTicketRepository(store, domain.TestConfig(t)). - Create(context.TODO(), ticket)) + if err := repository.NewMemoryTicketRepository(store, domain.TestConfig(t)). + Create(context.TODO(), ticket); err != nil { + t.Fatal(err) + } - src, ok := store.Load(path.Join(repository.DefaultPathPrefix, ticket.Ticket)) - require.True(t, ok) + storePath := path.Join(repository.DefaultPathPrefix, ticket.Ticket) - result, ok := src.(*repository.Ticket) - require.True(t, ok) - assert.Equal(t, ticket, result.Ticket) + src, ok := store.Load(storePath) + if !ok { + t.Fatalf("Load(%s) = %t, want %t", storePath, ok, true) + } + + if result, _ := src.(*repository.Ticket); !reflect.DeepEqual(result.Ticket, ticket) { + t.Errorf("Create(%+v) = %+v, want %+v", ticket, result.Ticket, ticket) + } } func TestGetAndDelete(t *testing.T) { @@ -44,10 +48,16 @@ func TestGetAndDelete(t *testing.T) { result, err := repository.NewMemoryTicketRepository(store, domain.TestConfig(t)). GetAndDelete(context.TODO(), ticket.Ticket) - require.NoError(t, err) - assert.Equal(t, ticket, result) + if err != nil { + t.Fatal(err) + } - src, ok := store.Load(path.Join(repository.DefaultPathPrefix, ticket.Ticket)) - assert.False(t, ok) - assert.Nil(t, src) + if !reflect.DeepEqual(result, ticket) { + t.Errorf("GetAndDelete(%s) = %+v, want %+v", ticket.Ticket, result, ticket) + } + + storePath := path.Join(repository.DefaultPathPrefix, ticket.Ticket) + if src, _ := store.Load(storePath); src != nil { + t.Errorf("Load(%s) = %+v, want %+v", storePath, src, nil) + } } diff --git a/internal/ticket/usecase/ticket_ucase_test.go b/internal/ticket/usecase/ticket_ucase_test.go index ef313e9..bf6cceb 100644 --- a/internal/ticket/usecase/ticket_ucase_test.go +++ b/internal/ticket/usecase/ticket_ucase_test.go @@ -7,7 +7,6 @@ import ( "github.com/fasthttp/router" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" http "github.com/valyala/fasthttp" "source.toby3d.me/website/indieauth/internal/common" @@ -41,7 +40,10 @@ func TestRedeem(t *testing.T) { result, err := ucase.NewTicketUseCase(nil, client, domain.TestConfig(t)). Redeem(context.TODO(), ticket) - require.NoError(t, err) + if err != nil { + t.Fatal(err) + } + assert.Equal(t, token.AccessToken, result.AccessToken) assert.Equal(t, token.Me.String(), result.Me.String()) assert.Equal(t, token.Scope, result.Scope) diff --git a/internal/token/delivery/http/token_http_test.go b/internal/token/delivery/http/token_http_test.go index fae3afd..636d232 100644 --- a/internal/token/delivery/http/token_http_test.go +++ b/internal/token/delivery/http/token_http_test.go @@ -9,7 +9,6 @@ import ( "github.com/fasthttp/router" json "github.com/goccy/go-json" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" http "github.com/valyala/fasthttp" "source.toby3d.me/website/indieauth/internal/common" @@ -62,11 +61,17 @@ func TestVerification(t *testing.T) { resp := http.AcquireResponse() defer http.ReleaseResponse(resp) - require.NoError(t, client.Do(req, resp)) + if err := client.Do(req, resp); err != nil { + t.Fatal(err) + } + assert.Equal(t, http.StatusOK, resp.StatusCode()) result := new(delivery.TokenVerificationResponse) - require.NoError(t, json.Unmarshal(resp.Body(), result)) + if err := json.Unmarshal(resp.Body(), result); err != nil { + t.Fatal(err) + } + assert.Equal(t, token.ClientID.String(), result.ClientID.String()) assert.Equal(t, token.Me.String(), result.Me.String()) assert.Equal(t, token.Scope.String(), result.Scope.String()) @@ -107,12 +112,17 @@ func TestRevocation(t *testing.T) { resp := http.AcquireResponse() defer http.ReleaseResponse(resp) - require.NoError(t, client.Do(req, resp)) + if err := client.Do(req, resp); err != nil { + t.Fatal(err) + } assert.Equal(t, http.StatusOK, resp.StatusCode()) assert.Equal(t, `{}`, strings.TrimSpace(string(resp.Body()))) result, err := tokens.Get(context.TODO(), accessToken.AccessToken) - require.NoError(t, err) + if err != nil { + t.Fatal(err) + } + assert.Equal(t, accessToken.AccessToken, result.AccessToken) } diff --git a/internal/token/repository/memory/memory_token_test.go b/internal/token/repository/memory/memory_token_test.go index 7d4f693..069e8c3 100644 --- a/internal/token/repository/memory/memory_token_test.go +++ b/internal/token/repository/memory/memory_token_test.go @@ -7,7 +7,6 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" "source.toby3d.me/website/indieauth/internal/domain" "source.toby3d.me/website/indieauth/internal/token" @@ -21,7 +20,9 @@ func TestCreate(t *testing.T) { accessToken := domain.TestToken(t) repo := repository.NewMemoryTokenRepository(store) - require.NoError(t, repo.Create(context.TODO(), accessToken)) + if err := repo.Create(context.TODO(), accessToken); err != nil { + t.Fatal(err) + } result, ok := store.Load(path.Join(repository.DefaultPathPrefix, accessToken.AccessToken)) assert.True(t, ok) diff --git a/internal/token/usecase/token_ucase_test.go b/internal/token/usecase/token_ucase_test.go index 86484bf..1ba51c5 100644 --- a/internal/token/usecase/token_ucase_test.go +++ b/internal/token/usecase/token_ucase_test.go @@ -2,11 +2,11 @@ package usecase_test import ( "context" + "errors" "sync" "testing" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" "source.toby3d.me/website/indieauth/internal/domain" "source.toby3d.me/website/indieauth/internal/token" @@ -32,7 +32,10 @@ func TestVerify(t *testing.T) { accessToken := domain.TestToken(t) result, err := ucase.Verify(context.TODO(), accessToken.AccessToken) - require.NoError(t, err) + if err != nil { + t.Fatal(err) + } + assert.Equal(t, accessToken.AccessToken, result.AccessToken) assert.Equal(t, accessToken.Scope, result.Scope) assert.Equal(t, accessToken.ClientID.String(), result.ClientID.String()) @@ -43,11 +46,18 @@ func TestVerify(t *testing.T) { t.Parallel() accessToken := domain.TestToken(t) - require.NoError(t, repo.Create(context.TODO(), accessToken)) + if err := repo.Create(context.TODO(), accessToken); err != nil { + t.Fatal(err) + } result, err := ucase.Verify(context.TODO(), accessToken.AccessToken) - require.ErrorIs(t, err, token.ErrRevoke) - assert.Nil(t, result) + if !errors.Is(err, token.ErrRevoke) { + t.Errorf("Verify(%s) = %v, want %v", accessToken.AccessToken, err, token.ErrRevoke) + } + + if result != nil { + t.Errorf("Verify(%s) = %v, want %v", accessToken.AccessToken, result, nil) + } }) } @@ -58,10 +68,15 @@ func TestRevoke(t *testing.T) { accessToken := domain.TestToken(t) repo := repository.NewMemoryTokenRepository(new(sync.Map)) - require.NoError(t, usecase.NewTokenUseCase(repo, nil, config). - Revoke(context.TODO(), accessToken.AccessToken)) + if err := usecase.NewTokenUseCase(repo, nil, config). + Revoke(context.TODO(), accessToken.AccessToken); err != nil { + t.Fatal(err) + } result, err := repo.Get(context.TODO(), accessToken.AccessToken) - assert.NoError(t, err) + if err != nil { + t.Error(err) + } + assert.Equal(t, accessToken.AccessToken, result.AccessToken) } diff --git a/internal/user/repository/http/http_user_test.go b/internal/user/repository/http/http_user_test.go index 04d0068..63b9bc0 100644 --- a/internal/user/repository/http/http_user_test.go +++ b/internal/user/repository/http/http_user_test.go @@ -8,7 +8,6 @@ import ( "github.com/fasthttp/router" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" http "github.com/valyala/fasthttp" "source.toby3d.me/website/indieauth/internal/common" @@ -45,7 +44,9 @@ func TestGet(t *testing.T) { t.Cleanup(cleanup) result, err := repository.NewHTTPUserRepository(client).Get(context.TODO(), user.Me) - require.NoError(t, err) + if err != nil { + t.Fatal(err) + } // NOTE(toby3d): endpoints assert.Equal(t, user.AuthorizationEndpoint.String(), result.AuthorizationEndpoint.String())