Skip to content

Commit

Permalink
Remove Testify dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
@bw19
bw19 committed Jul 14, 2024
1 parent ca67266 commit 54509e7
Show file tree
Hide file tree
Showing 121 changed files with 4,538 additions and 4,550 deletions.
102 changes: 51 additions & 51 deletions application/application_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/microbus-io/fabric/coreservices/configurator"
"github.com/microbus-io/fabric/errors"
"github.com/microbus-io/fabric/pub"
"github.com/stretchr/testify/assert"
"github.com/microbus-io/testarossa"
)

func TestApplication_StartStop(t *testing.T) {
Expand All @@ -38,20 +38,20 @@ func TestApplication_StartStop(t *testing.T) {
app := NewTesting()
app.Add(alpha, beta)

assert.False(t, alpha.IsStarted())
assert.False(t, beta.IsStarted())
testarossa.False(t, alpha.IsStarted())
testarossa.False(t, beta.IsStarted())

err := app.Startup()
assert.NoError(t, err)
testarossa.NoError(t, err)

assert.True(t, alpha.IsStarted())
assert.True(t, beta.IsStarted())
testarossa.True(t, alpha.IsStarted())
testarossa.True(t, beta.IsStarted())

err = app.Shutdown()
assert.NoError(t, err)
testarossa.NoError(t, err)

assert.False(t, alpha.IsStarted())
assert.False(t, beta.IsStarted())
testarossa.False(t, alpha.IsStarted())
testarossa.False(t, beta.IsStarted())
}

func TestApplication_Interrupt(t *testing.T) {
Expand All @@ -64,21 +64,21 @@ func TestApplication_Interrupt(t *testing.T) {
ch := make(chan bool)
go func() {
err := app.Startup()
assert.NoError(t, err)
testarossa.NoError(t, err)
go func() {
app.WaitForInterrupt()
err := app.Shutdown()
assert.NoError(t, err)
testarossa.NoError(t, err)
ch <- true
}()
ch <- true
}()

<-ch
assert.True(t, con.IsStarted())
testarossa.True(t, con.IsStarted())
app.Interrupt()
<-ch
assert.False(t, con.IsStarted())
testarossa.False(t, con.IsStarted())
}

func TestApplication_NoConflict(t *testing.T) {
Expand Down Expand Up @@ -106,33 +106,33 @@ func TestApplication_NoConflict(t *testing.T) {

// Start the apps
err := appAlpha.Startup()
assert.NoError(t, err)
testarossa.NoError(t, err)
defer appAlpha.Shutdown()
err = appBeta.Startup()
assert.NoError(t, err)
testarossa.NoError(t, err)
defer appBeta.Shutdown()

// Assert different planes of communication
assert.NotEqual(t, alpha.Plane(), beta.Plane())
assert.Equal(t, connector.TESTING, alpha.Deployment())
assert.Equal(t, connector.TESTING, beta.Deployment())
testarossa.NotEqual(t, alpha.Plane(), beta.Plane())
testarossa.Equal(t, connector.TESTING, alpha.Deployment())
testarossa.Equal(t, connector.TESTING, beta.Deployment())

// Alpha should never see beta
for i := 0; i < 32; i++ {
response, err := alpha.GET(ctx, "https://no.conflict.application/id")
assert.NoError(t, err)
testarossa.NoError(t, err)
body, err := io.ReadAll(response.Body)
assert.NoError(t, err)
assert.Equal(t, []byte("alpha"), body)
testarossa.NoError(t, err)
testarossa.Equal(t, "alpha", string(body))
}

// Beta should never see alpha
for i := 0; i < 32; i++ {
response, err := beta.GET(ctx, "https://no.conflict.application/id")
assert.NoError(t, err)
testarossa.NoError(t, err)
body, err := io.ReadAll(response.Body)
assert.NoError(t, err)
assert.Equal(t, []byte("beta"), body)
testarossa.NoError(t, err)
testarossa.Equal(t, "beta", string(body))
}
}

Expand Down Expand Up @@ -169,9 +169,9 @@ func TestApplication_DependencyStart(t *testing.T) {
t0 := time.Now()
err := app.Startup()
dur := time.Since(t0)
assert.NoError(t, err)
assert.True(t, failCount > 0)
assert.True(t, dur >= startupTimeout/2)
testarossa.NoError(t, err)
testarossa.True(t, failCount > 0)
testarossa.True(t, dur >= startupTimeout/2)

app.Shutdown()
}
Expand All @@ -198,16 +198,16 @@ func TestApplication_FailStart(t *testing.T) {
t0 := time.Now()
err := app.Startup()
dur := time.Since(t0)
assert.Error(t, err)
assert.True(t, failCount > 0)
assert.True(t, dur >= startupTimeout)
assert.True(t, beta.IsStarted())
assert.False(t, alpha.IsStarted())
testarossa.Error(t, err)
testarossa.True(t, failCount > 0)
testarossa.True(t, dur >= startupTimeout)
testarossa.True(t, beta.IsStarted())
testarossa.False(t, alpha.IsStarted())

err = app.Shutdown()
assert.NoError(t, err)
assert.False(t, beta.IsStarted())
assert.False(t, alpha.IsStarted())
testarossa.NoError(t, err)
testarossa.False(t, beta.IsStarted())
testarossa.False(t, alpha.IsStarted())
}

func TestApplication_Remove(t *testing.T) {
Expand All @@ -218,23 +218,23 @@ func TestApplication_Remove(t *testing.T) {

app := NewTesting()
app.AddAndStartup(alpha, beta)
assert.True(t, alpha.IsStarted())
assert.True(t, beta.IsStarted())
assert.Equal(t, alpha.Plane(), beta.Plane())
testarossa.True(t, alpha.IsStarted())
testarossa.True(t, beta.IsStarted())
testarossa.Equal(t, alpha.Plane(), beta.Plane())

app.Remove(beta)
assert.True(t, alpha.IsStarted())
assert.True(t, beta.IsStarted())
assert.Equal(t, alpha.Plane(), beta.Plane())
testarossa.True(t, alpha.IsStarted())
testarossa.True(t, beta.IsStarted())
testarossa.Equal(t, alpha.Plane(), beta.Plane())

err := app.Shutdown()
assert.NoError(t, err)
assert.False(t, alpha.IsStarted())
assert.True(t, beta.IsStarted()) // Should remain up because no longer under management of the app
testarossa.NoError(t, err)
testarossa.False(t, alpha.IsStarted())
testarossa.True(t, beta.IsStarted()) // Should remain up because no longer under management of the app

err = beta.Shutdown()
assert.NoError(t, err)
assert.False(t, beta.IsStarted())
testarossa.NoError(t, err)
testarossa.False(t, beta.IsStarted())
}

func TestApplication_Run(t *testing.T) {
Expand All @@ -248,16 +248,16 @@ func TestApplication_Run(t *testing.T) {

go func() {
err := app.Run()
assert.NoError(t, err)
testarossa.NoError(t, err)
}()

time.Sleep(2 * time.Second)
assert.True(t, con.IsStarted())
assert.True(t, config.IsStarted())
testarossa.True(t, con.IsStarted())
testarossa.True(t, config.IsStarted())

app.Interrupt()

time.Sleep(time.Second)
assert.False(t, con.IsStarted())
assert.False(t, config.IsStarted())
testarossa.False(t, con.IsStarted())
testarossa.False(t, config.IsStarted())
}
22 changes: 11 additions & 11 deletions cfg/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package cfg
import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/microbus-io/testarossa"
)

func TestCfg_Options(t *testing.T) {
Expand All @@ -32,12 +32,12 @@ func TestCfg_Options(t *testing.T) {
DefaultValue("7"),
Secret(),
)
assert.NoError(t, err)
assert.Equal(t, c.Name, "int")
assert.Equal(t, c.Description, "int config")
assert.Equal(t, c.Validation, "int [6,7]")
assert.Equal(t, c.DefaultValue, "7")
assert.Equal(t, c.Secret, true)
testarossa.NoError(t, err)
testarossa.Equal(t, c.Name, "int")
testarossa.Equal(t, c.Description, "int config")
testarossa.Equal(t, c.Validation, "int [6,7]")
testarossa.Equal(t, c.DefaultValue, "7")
testarossa.Equal(t, c.Secret, true)
}

func TestCfg_BadValidation(t *testing.T) {
Expand All @@ -47,7 +47,7 @@ func TestCfg_BadValidation(t *testing.T) {
"bad",
Validation("invalid rule here"),
)
assert.Error(t, err)
testarossa.Error(t, err)
}

func TestCfg_DefaultValueValidation(t *testing.T) {
Expand All @@ -58,20 +58,20 @@ func TestCfg_DefaultValueValidation(t *testing.T) {
"int",
Validation("int [6,7]"),
)
assert.NoError(t, err)
testarossa.NoError(t, err)

// Order of setting default value and validation shouldn't matter
_, err = NewConfig(
"int",
DefaultValue("8"),
Validation("int [6,7]"),
)
assert.Error(t, err)
testarossa.Error(t, err)

_, err = NewConfig(
"int",
Validation("int [6,7]"),
DefaultValue("8"),
)
assert.Error(t, err)
testarossa.Error(t, err)
}
10 changes: 5 additions & 5 deletions cfg/validation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package cfg
import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/microbus-io/testarossa"
)

func TestCfg_ValidateValue(t *testing.T) {
Expand Down Expand Up @@ -111,10 +111,10 @@ func TestCfg_ValidateValue(t *testing.T) {
}

for i := 0; i < len(good); i += 2 {
assert.True(t, Validate(good[i], good[i+1]), "%v %v", good[i], good[i+1])
testarossa.True(t, Validate(good[i], good[i+1]), "%v %v", good[i], good[i+1])
}
for i := 0; i < len(bad); i += 2 {
assert.False(t, Validate(bad[i], bad[i+1]), "%v %v", bad[i], bad[i+1])
testarossa.False(t, Validate(bad[i], bad[i+1]), "%v %v", bad[i], bad[i+1])
}
}

Expand Down Expand Up @@ -160,7 +160,7 @@ func TestCfg_CheckRule(t *testing.T) {
"json anything": false, // Spec not allowed
}
for r, ok := range checks {
assert.Equal(t, ok, checkRule(r), "%v", r)
testarossa.Equal(t, ok, checkRule(r), "%v", r)
}
}

Expand Down Expand Up @@ -192,6 +192,6 @@ func TestCfg_NormalizedType(t *testing.T) {
}
for in, exp := range checks {
norm, _ := normalizedType(in)
assert.Equal(t, exp, norm)
testarossa.Equal(t, exp, norm)
}
}
12 changes: 6 additions & 6 deletions codegen/bundle/integration-gen_test.configs.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,29 @@ type OnChanged{{ .Name }}TestCase struct {

// Error asserts an error.
func (tc *OnChanged{{ .Name }}TestCase) Error(errContains string) *OnChanged{{ .Name }}TestCase {
if assert.Error(tc.t, tc.err) {
assert.Contains(tc.t, tc.err.Error(), errContains)
if testarossa.Error(tc.t, tc.err) {
testarossa.Contains(tc.t, tc.err.Error(), errContains)
}
return tc
}

// ErrorCode asserts an error by its status code.
func (tc *OnChanged{{ .Name }}TestCase) ErrorCode(statusCode int) *OnChanged{{ .Name }}TestCase {
if assert.Error(tc.t, tc.err) {
assert.Equal(tc.t, statusCode, errors.Convert(tc.err).StatusCode)
if testarossa.Error(tc.t, tc.err) {
testarossa.Equal(tc.t, statusCode, errors.Convert(tc.err).StatusCode)
}
return tc
}

// NoError asserts no error.
func (tc *OnChanged{{ .Name }}TestCase) NoError() *OnChanged{{ .Name }}TestCase {
assert.NoError(tc.t, tc.err)
testarossa.NoError(tc.t, tc.err)
return tc
}

// CompletedIn checks that the duration of the operation is less than or equal the threshold.
func (tc *OnChanged{{ .Name }}TestCase) CompletedIn(threshold time.Duration) *OnChanged{{ .Name }}TestCase {
assert.LessOrEqual(tc.t, tc.dur, threshold)
testarossa.True(tc.t, tc.dur <= threshold)
return tc
}

Expand Down
10 changes: 5 additions & 5 deletions codegen/bundle/integration-gen_test.events.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ type {{ .Name }}TestCase struct {
// Expect asserts that the event sink was triggered with an exact match of its input arguments.
func (_tc *{{ .Name }}TestCase) Expect({{ range $i, $e := .Signature.InputArgs }}{{ if $i }}, {{ end }}{{ .Name }} {{ .Type }}{{ end }}) *{{ .Name }}TestCase {
_tc._asserters = append(_tc._asserters, func() {
if assert.True(_tc._t, _tc._triggered, "Event sink was not triggered") {
if testarossa.True(_tc._t, _tc._triggered, "Event sink was not triggered") {
{{- range .Signature.InputArgs }}
{{- if eq .Type "time.Time" }}
assert.True(_tc._t, {{ .Name }}.Equal(_tc.{{ .Name }}), "Expected %v, actual %v", {{ .Name }}, _tc.{{ .Name }})
testarossa.True(_tc._t, {{ .Name }}.Equal(_tc.{{ .Name }}), "Expected %v, actual %v", {{ .Name }}, _tc.{{ .Name }})
{{- else }}
assert.Equal(_tc._t, {{ .Name }}, _tc.{{ .Name }})
testarossa.Equal(_tc._t, {{ .Name }}, _tc.{{ .Name }})
{{- end }}{{ end }}
}
})
Expand All @@ -35,7 +35,7 @@ func (_tc *{{ .Name }}TestCase) Expect({{ range $i, $e := .Signature.InputArgs }
// Assert asserts that the event sink was triggered with a custom function to assert its input arguments.
func (_tc *{{ .Name }}TestCase) Assert(asserter func({{ $t }} *testing.T, {{ .In }})) *{{ .Name }}TestCase {
_tc._asserters = append(_tc._asserters, func() {
if assert.True(_tc._t, _tc._triggered, "Event sink was not triggered") {
if testarossa.True(_tc._t, _tc._triggered, "Event sink was not triggered") {
asserter(_tc._t, _tc.ctx {{- range .Signature.InputArgs }}, _tc.{{ .Name }}{{ end }})
}
})
Expand All @@ -62,7 +62,7 @@ func (_tc *{{ .Name }}TestCase) Wait() *{{ .Name }}TestCase {
select {
case <-_tc._done:
case <-timer.C:
assert.Fail(_tc._t, "Timed out", "Event sink was not triggered")
testarossa.True(_tc._t, false, "Timed out", "Event sink was not triggered")
}
return _tc
}
Expand Down
Loading

0 comments on commit 54509e7

Please sign in to comment.