codebase: Replace !errors.Is(err, target) with testify (#1931)

* tests: Replace !errors.Is(err, target) with testify equivalents

* codebase: Manual !errors.Is(err, target) replacements

* typo: Replace errMisMatchedEvent with errMismatchedEvent

* tests: Enhance error messages for better output

* tests: Refactor error assertions in various test cases to use require and improve clarity

* misc linter: Fix assert should wording

* tests: Simplify assertions in TestCreateSignals for clarity and conciseness

* tests: Enhance assertion message in TestCreateSignals
This commit is contained in:
Adrian Gallagher
2025-06-10 16:29:57 +10:00
committed by GitHub
parent 122ab2f849
commit 19b8957f3f
109 changed files with 2485 additions and 5670 deletions

View File

@@ -1,7 +1,6 @@
package engine
import (
"errors"
"log"
"sync"
"testing"
@@ -28,9 +27,7 @@ func CreateDatabase(t *testing.T) {
func TestSetupDatabaseConnectionManager(t *testing.T) {
_, err := SetupDatabaseConnectionManager(nil)
if !errors.Is(err, errNilConfig) {
t.Errorf("error '%v', expected '%v'", err, errNilConfig)
}
assert.ErrorIs(t, err, errNilConfig)
m, err := SetupDatabaseConnectionManager(&database.Config{})
assert.NoError(t, err)
@@ -47,21 +44,18 @@ func TestStartSQLite(t *testing.T) {
var wg sync.WaitGroup
err = m.Start(&wg)
if !errors.Is(err, database.ErrDatabaseSupportDisabled) {
t.Errorf("error '%v', expected '%v'", err, database.ErrDatabaseSupportDisabled)
}
assert.ErrorIs(t, err, database.ErrDatabaseSupportDisabled)
m, err = SetupDatabaseConnectionManager(&database.Config{Enabled: true})
assert.NoError(t, err)
err = m.Start(&wg)
if !errors.Is(err, database.ErrNoDatabaseProvided) {
t.Errorf("error '%v', expected '%v'", err, database.ErrNoDatabaseProvided)
}
assert.ErrorIs(t, err, database.ErrNoDatabaseProvided)
m.cfg = database.Config{Driver: database.DBSQLite}
err = m.Start(&wg)
if !errors.Is(err, database.ErrDatabaseSupportDisabled) {
t.Errorf("error '%v', expected '%v'", err, database.ErrDatabaseSupportDisabled)
}
assert.ErrorIs(t, err, database.ErrDatabaseSupportDisabled)
_, err = SetupDatabaseConnectionManager(&database.Config{
Enabled: true,
Driver: database.DBSQLite,
@@ -80,19 +74,15 @@ func TestStartPostgres(t *testing.T) {
var wg sync.WaitGroup
err = m.Start(&wg)
if !errors.Is(err, database.ErrDatabaseSupportDisabled) {
t.Errorf("error '%v', expected '%v'", err, database.ErrDatabaseSupportDisabled)
}
assert.ErrorIs(t, err, database.ErrDatabaseSupportDisabled)
m.cfg.Enabled = true
err = m.Start(&wg)
if !errors.Is(err, database.ErrNoDatabaseProvided) {
t.Errorf("error '%v', expected '%v'", err, database.ErrNoDatabaseProvided)
}
assert.ErrorIs(t, err, database.ErrNoDatabaseProvided)
m.cfg.Driver = database.DBPostgreSQL
err = m.Start(&wg)
if !errors.Is(err, database.ErrFailedToConnect) {
t.Errorf("error '%v', expected '%v'", err, database.ErrFailedToConnect)
}
assert.ErrorIs(t, err, database.ErrFailedToConnect)
}
func TestDatabaseConnectionManagerIsRunning(t *testing.T) {
@@ -136,9 +126,7 @@ func TestDatabaseConnectionManagerStop(t *testing.T) {
assert.NoError(t, err)
err = m.Stop()
if !errors.Is(err, ErrSubSystemNotStarted) {
t.Errorf("error '%v', expected '%v'", err, ErrSubSystemNotStarted)
}
assert.ErrorIs(t, err, ErrSubSystemNotStarted)
var wg sync.WaitGroup
err = m.Start(&wg)
@@ -149,18 +137,15 @@ func TestDatabaseConnectionManagerStop(t *testing.T) {
m = nil
err = m.Stop()
if !errors.Is(err, ErrNilSubsystem) {
t.Errorf("error '%v', expected '%v'", err, ErrNilSubsystem)
}
assert.ErrorIs(t, err, ErrNilSubsystem)
}
func TestCheckConnection(t *testing.T) {
CreateDatabase(t)
var m *DatabaseConnectionManager
err := m.checkConnection()
if !errors.Is(err, ErrNilSubsystem) {
t.Errorf("error '%v', expected '%v'", err, ErrNilSubsystem)
}
assert.ErrorIs(t, err, ErrNilSubsystem)
m, err = SetupDatabaseConnectionManager(&database.Config{
Enabled: true,
Driver: database.DBSQLite,
@@ -172,9 +157,8 @@ func TestCheckConnection(t *testing.T) {
assert.NoError(t, err)
err = m.checkConnection()
if !errors.Is(err, ErrSubSystemNotStarted) {
t.Errorf("error '%v', expected '%v'", err, ErrSubSystemNotStarted)
}
assert.ErrorIs(t, err, ErrSubSystemNotStarted)
var wg sync.WaitGroup
err = m.Start(&wg)
assert.NoError(t, err)
@@ -186,9 +170,7 @@ func TestCheckConnection(t *testing.T) {
assert.NoError(t, err)
err = m.checkConnection()
if !errors.Is(err, ErrSubSystemNotStarted) {
t.Errorf("error '%v', expected '%v'", err, ErrSubSystemNotStarted)
}
assert.ErrorIs(t, err, ErrSubSystemNotStarted)
err = m.Start(&wg)
assert.NoError(t, err)
@@ -198,9 +180,7 @@ func TestCheckConnection(t *testing.T) {
m.dbConn.SetConnected(false)
err = m.checkConnection()
if !errors.Is(err, database.ErrDatabaseNotConnected) {
t.Errorf("error '%v', expected '%v'", err, database.ErrDatabaseNotConnected)
}
assert.ErrorIs(t, err, database.ErrDatabaseNotConnected)
err = m.Stop()
assert.NoError(t, err)