angel/inventory-plus-plus
1
0
Fork 0
Code Issues 34 Pull Requests Actions Packages Projects 4 Releases Wiki Activity

tests: migrate assertions to testify's assert/require

Browse Source 
Replaces raw t.Error/t.Errorf/t.Fatal/t.Fatalf across every test file
that has any (domains/accounts, domains/authentication,
domains/raw_events, domains/amazon, domains/reports x2) with testify's
assert (non-halting) / require (halting) equivalents. The three
Example-based tests (server/ui/svg, server/ui/charts) have no
*testing.T at all - nothing to convert there.

require.Eventually replaces several hand-rolled polling loops in
domains/amazon/mock_test.go. Its condition function runs on a separate
goroutine (confirmed in testify's source), so calling require.* from
inside one - which two of the new Eventually calls initially did, via
the isProcessed helper - is unsafe per Go's testing rules (t.FailNow
must only be called from the test's own goroutine). Fixed by splitting
a *testing.T-free queryIsProcessed(ctx, pool, shopID, eventID) out of
isProcessed for use inside those closures specifically.

github.com/stretchr/testify promoted from an indirect to a direct
dependency (go.mod only - it was already present transitively, so
go.sum is unchanged).

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01XEDaCB7C2NEBgyvqEtZuxY
This commit is contained in:
angel
2026-08-20 00:36:55 -06:00
co-authored by Claude Sonnet 5
parent fe8c451739
commit 707aa65ddc
8 changed files with 230 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
domains/reports/events_test.go
+17 -41
View File
@@ -3,12 +3,13 @@ package reports_test
import (
"context"
"encoding/json"
"errors"
"testing"
"time"
"github.com/google/uuid"
"github.com/jackc/pgx/v5/pgxpool"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"ruben/inventory2/consts"
"ruben/inventory2/domains/accounts"
@@ -28,17 +29,13 @@ func setupAmazonMockShop(t *testing.T, pool *pgxpool.Pool, acctStore *accounts.S
testdb.SeedOAuthUser(t, pool, userID)
acct, err := acctStore.CreateAccount(ctx, userID, userID+"@example.com")
if err != nil {
t.Fatalf("CreateAccount() error = %v", err)
}
require.NoError(t, err, "CreateAccount()")
t.Cleanup(func() {
pool.Exec(context.Background(), "DELETE FROM accounts WHERE account_id = $1", acct.AccountID)
})
id, err := acctStore.CreateMockShop(ctx, acct.AccountID, accounts.Amazon, "Test Shop")
if err != nil {
t.Fatalf("CreateMockShop() error = %v", err)
}
require.NoError(t, err, "CreateMockShop()")
shopID = id.String()
t.Cleanup(func() {
@@ -61,9 +58,7 @@ func insertRawShopEvent(t *testing.T, pool *pgxpool.Pool, shopID, eventID string
INSERT INTO mock.raw_shop_events (platform, shop_id, event_timestamp, event_id, raw_payload)
VALUES ('amazon', $1, $2, $3, $4::jsonb)
`, shopID, ts, eventID, payload)
if err != nil {
t.Fatalf("failed to insert raw shop event: %v", err)
}
require.NoError(t, err, "insert raw shop event")
}
func TestGetRawShopEvents(t *testing.T) {
@@ -80,30 +75,19 @@ func TestGetRawShopEvents(t *testing.T) {
insertRawShopEvent(t, pool, shopID, "evt-2", newer, `{"n":2}`)
got, err := reportsStore.GetRawShopEvents(ctx, acctID, accounts.Amazon, shopID)
if err != nil {
t.Fatalf("GetRawShopEvents() error = %v", err)
}
if len(got) != 2 {
t.Fatalf("GetRawShopEvents() returned %d events, want 2: %+v", len(got), got)
}
require.NoError(t, err, "GetRawShopEvents()")
require.Len(t, got, 2, "GetRawShopEvents()")
// ordered event_timestamp DESC, event_id ASC - newest first.
if got[0].EventID != "evt-2" || got[1].EventID != "evt-1" {
t.Errorf("GetRawShopEvents() order = [%s, %s], want [evt-2, evt-1]", got[0].EventID, got[1].EventID)
}
assert.Equal(t, "evt-2", got[0].EventID, "GetRawShopEvents()[0]")
assert.Equal(t, "evt-1", got[1].EventID, "GetRawShopEvents()[1]")
if got[0].Platform != accounts.Amazon || got[0].ShopID != shopID {
t.Errorf("got[0] Platform/ShopID = %s/%s, want %s/%s", got[0].Platform, got[0].ShopID, accounts.Amazon, shopID)
}
assert.Equal(t, accounts.Amazon, got[0].Platform, "got[0].Platform")
assert.Equal(t, shopID, got[0].ShopID, "got[0].ShopID")
var payload struct{ N int }
if err := json.Unmarshal(got[0].RawPayload, &payload); err != nil {
t.Fatalf("failed to unmarshal got[0].RawPayload = %s: %v", got[0].RawPayload, err)
}
if payload.N != 2 {
t.Errorf("got[0].RawPayload n = %d, want 2", payload.N)
}
require.NoError(t, json.Unmarshal(got[0].RawPayload, &payload), "unmarshal got[0].RawPayload")
assert.Equal(t, 2, payload.N, "got[0].RawPayload n")
}
func TestGetRawShopEvents_NoEvents(t *testing.T) {
@@ -115,12 +99,8 @@ func TestGetRawShopEvents_NoEvents(t *testing.T) {
acctID, shopID := setupAmazonMockShop(t, pool, acctStore)
got, err := reportsStore.GetRawShopEvents(ctx, acctID, accounts.Amazon, shopID)
if err != nil {
t.Fatalf("GetRawShopEvents() error = %v", err)
}
if len(got) != 0 {
t.Fatalf("GetRawShopEvents() = %+v, want empty", got)
}
require.NoError(t, err, "GetRawShopEvents()")
assert.Empty(t, got, "GetRawShopEvents()")
}
func TestGetRawShopEvents_UnknownShop(t *testing.T) {
@@ -133,15 +113,11 @@ func TestGetRawShopEvents_UnknownShop(t *testing.T) {
testdb.SeedOAuthUser(t, pool, userID)
acct, err := acctStore.CreateAccount(ctx, userID, userID+"@example.com")
if err != nil {
t.Fatalf("CreateAccount() error = %v", err)
}
require.NoError(t, err, "CreateAccount()")
t.Cleanup(func() {
pool.Exec(context.Background(), "DELETE FROM accounts WHERE account_id = $1", acct.AccountID)
})
_, err = reportsStore.GetRawShopEvents(ctx, acct.AccountID, accounts.Amazon, "no-such-shop-"+uuid.NewString())
if !errors.Is(err, consts.ErrNotFound) {
t.Fatalf("GetRawShopEvents() error = %v, want %v", err, consts.ErrNotFound)
}
require.ErrorIs(t, err, consts.ErrNotFound, "GetRawShopEvents()")
}