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

@@ -2,7 +2,6 @@ package database
import (
"database/sql"
"errors"
"os"
"path/filepath"
"testing"
@@ -18,33 +17,25 @@ func TestSetConfig(t *testing.T) {
assert.NoError(t, err)
err = inst.SetConfig(nil)
if !errors.Is(err, ErrNilConfig) {
t.Errorf("received %v, expected %v", err, ErrNilConfig)
}
assert.ErrorIs(t, err, ErrNilConfig)
inst = nil
err = inst.SetConfig(&Config{})
if !errors.Is(err, ErrNilInstance) {
t.Errorf("received %v, expected %v", err, ErrNilInstance)
}
assert.ErrorIs(t, err, ErrNilInstance)
}
func TestSetSQLiteConnection(t *testing.T) {
t.Parallel()
inst := &Instance{}
err := inst.SetSQLiteConnection(nil)
if !errors.Is(err, errNilSQL) {
t.Errorf("received %v, expected %v", err, errNilSQL)
}
assert.ErrorIs(t, err, errNilSQL)
err = inst.SetSQLiteConnection(&sql.DB{})
assert.NoError(t, err)
inst = nil
err = inst.SetSQLiteConnection(nil)
if !errors.Is(err, ErrNilInstance) {
t.Errorf("received %v, expected %v", err, ErrNilInstance)
}
assert.ErrorIs(t, err, ErrNilInstance)
}
func TestSetPostgresConnection(t *testing.T) {
@@ -142,19 +133,16 @@ func TestPing(t *testing.T) {
inst.SQL = nil
err = inst.Ping()
if !errors.Is(err, errNilSQL) {
t.Errorf("received %v, expected %v", err, errNilSQL)
}
assert.ErrorIs(t, err, errNilSQL)
inst.SetConnected(false)
err = inst.Ping()
if !errors.Is(err, ErrDatabaseNotConnected) {
t.Errorf("received %v, expected %v", err, ErrDatabaseNotConnected)
}
assert.ErrorIs(t, err, ErrDatabaseNotConnected)
inst = nil
err = inst.Ping()
if !errors.Is(err, ErrNilInstance) {
t.Errorf("received %v, expected %v", err, ErrNilInstance)
}
assert.ErrorIs(t, err, ErrNilInstance)
err = con.Close()
assert.NoError(t, err)
@@ -166,9 +154,7 @@ func TestGetSQL(t *testing.T) {
t.Parallel()
inst := &Instance{}
_, err := inst.GetSQL()
if !errors.Is(err, errNilSQL) {
t.Errorf("received %v, expected %v", err, errNilSQL)
}
assert.ErrorIs(t, err, errNilSQL)
databaseFullLocation := filepath.Join(DB.DataPath, "TestGetSQL")
con, err := sql.Open("sqlite3", databaseFullLocation)
@@ -182,7 +168,5 @@ func TestGetSQL(t *testing.T) {
inst = nil
_, err = inst.GetSQL()
if !errors.Is(err, ErrNilInstance) {
t.Errorf("received %v, expected %v", err, ErrNilInstance)
}
assert.ErrorIs(t, err, ErrNilInstance)
}