Skip to content

Commit 5582f2d

Browse files
committed
reuse shared error assertion helper in capability constructor tests
1 parent f5f2a6e commit 5582f2d

3 files changed

Lines changed: 17 additions & 27 deletions

File tree

vibes/capability_context_test.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package vibes
22

33
import (
44
"context"
5-
"strings"
65
"testing"
76
)
87

@@ -91,10 +90,9 @@ end`)
9190
func TestNewContextCapabilityRejectsInvalidArguments(t *testing.T) {
9291
resolver := func(context.Context) (Value, error) { return NewObject(map[string]Value{}), nil }
9392

94-
if _, err := NewContextCapability("", resolver); err == nil || !strings.Contains(err.Error(), "name must be non-empty") {
95-
t.Fatalf("expected empty name error, got %v", err)
96-
}
97-
if _, err := NewContextCapability("ctx", nil); err == nil || !strings.Contains(err.Error(), "requires a resolver") {
98-
t.Fatalf("expected nil resolver error, got %v", err)
99-
}
93+
_, err := NewContextCapability("", resolver)
94+
requireErrorContains(t, err, "name must be non-empty")
95+
96+
_, err = NewContextCapability("ctx", nil)
97+
requireErrorContains(t, err, "requires a resolver")
10098
}

vibes/capability_db_test.go

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package vibes
22

33
import (
44
"context"
5-
"strings"
65
"testing"
76
)
87

@@ -306,17 +305,14 @@ end`)
306305
func TestNewDBCapabilityRejectsInvalidArguments(t *testing.T) {
307306
stub := &dbCapabilityStub{}
308307

309-
if _, err := NewDBCapability("", stub); err == nil || !strings.Contains(err.Error(), "name must be non-empty") {
310-
t.Fatalf("expected empty name error, got %v", err)
311-
}
308+
_, err := NewDBCapability("", stub)
309+
requireErrorContains(t, err, "name must be non-empty")
312310

313311
var db Database
314-
if _, err := NewDBCapability("db", db); err == nil || !strings.Contains(err.Error(), "requires a non-nil implementation") {
315-
t.Fatalf("expected nil db error, got %v", err)
316-
}
312+
_, err = NewDBCapability("db", db)
313+
requireErrorContains(t, err, "requires a non-nil implementation")
317314

318315
var typedNil *dbCapabilityStub
319-
if _, err := NewDBCapability("db", typedNil); err == nil || !strings.Contains(err.Error(), "requires a non-nil implementation") {
320-
t.Fatalf("expected typed nil db error, got %v", err)
321-
}
316+
_, err = NewDBCapability("db", typedNil)
317+
requireErrorContains(t, err, "requires a non-nil implementation")
322318
}

vibes/capability_events_test.go

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package vibes
22

33
import (
44
"context"
5-
"strings"
65
"testing"
76
)
87

@@ -125,17 +124,14 @@ end`)
125124

126125
func TestNewEventsCapabilityRejectsInvalidArguments(t *testing.T) {
127126
stub := &eventsCapabilityStub{}
128-
if _, err := NewEventsCapability("", stub); err == nil || !strings.Contains(err.Error(), "name must be non-empty") {
129-
t.Fatalf("expected empty name error, got %v", err)
130-
}
127+
_, err := NewEventsCapability("", stub)
128+
requireErrorContains(t, err, "name must be non-empty")
131129

132130
var publisher EventPublisher
133-
if _, err := NewEventsCapability("events", publisher); err == nil || !strings.Contains(err.Error(), "requires a non-nil implementation") {
134-
t.Fatalf("expected nil publisher error, got %v", err)
135-
}
131+
_, err = NewEventsCapability("events", publisher)
132+
requireErrorContains(t, err, "requires a non-nil implementation")
136133

137134
var typedNil *eventsCapabilityStub
138-
if _, err := NewEventsCapability("events", typedNil); err == nil || !strings.Contains(err.Error(), "requires a non-nil implementation") {
139-
t.Fatalf("expected typed nil publisher error, got %v", err)
140-
}
135+
_, err = NewEventsCapability("events", typedNil)
136+
requireErrorContains(t, err, "requires a non-nil implementation")
141137
}

0 commit comments

Comments
 (0)