From b06eba3df09a8fcd777b8fe350c2b184758963d1 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 28 Jan 2024 16:10:14 -0500 Subject: Use checkmate for tests --- internal/bolttest/db.go | 10 +++++----- internal/bolttest/fs.go | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'internal/bolttest') diff --git a/internal/bolttest/db.go b/internal/bolttest/db.go index de2dcfa..74ca14e 100644 --- a/internal/bolttest/db.go +++ b/internal/bolttest/db.go @@ -8,12 +8,12 @@ import ( "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/storage" - "gotest.tools/v3/assert" + "github.com/eugenetriguba/checkmate" ) func NewTestConnectionConfig(t *testing.T, driver string) *configloader.ConnectionConfig { port, err := strconv.Atoi(os.Getenv("DB_PORT")) - assert.NilError(t, err) + checkmate.AssertNil(t, err) return &configloader.ConnectionConfig{ Driver: driver, @@ -29,7 +29,7 @@ func NewTestDB(t *testing.T, driver string) *sql.DB { connectionConfig := NewTestConnectionConfig(t, driver) connInfo := storage.DBConnectionString(connectionConfig) db, err := storage.DBConnect(driver, connInfo) - assert.NilError(t, err) + checkmate.AssertNil(t, err) t.Cleanup(func() { _, err = db.Exec(` DO $$ DECLARE rec RECORD; @@ -41,9 +41,9 @@ func NewTestDB(t *testing.T, driver string) *sql.DB { END LOOP; END $$; `) - assert.NilError(t, err) + checkmate.AssertNil(t, err) err = db.Close() - assert.NilError(t, err) + checkmate.AssertNil(t, err) }) return db } diff --git a/internal/bolttest/fs.go b/internal/bolttest/fs.go index 9edd894..0237733 100644 --- a/internal/bolttest/fs.go +++ b/internal/bolttest/fs.go @@ -6,7 +6,7 @@ import ( "github.com/BurntSushi/toml" "github.com/eugenetriguba/bolt/internal/configloader" - "gotest.tools/v3/assert" + "github.com/eugenetriguba/checkmate" ) func CreateConfigFile(t *testing.T, cfg *configloader.Config, filePath string) { @@ -14,15 +14,15 @@ func CreateConfigFile(t *testing.T, cfg *configloader.Config, filePath string) { encoder := toml.NewEncoder(f) err := encoder.Encode(cfg) - assert.NilError(t, err) + checkmate.AssertNil(t, err) err = f.Close() - assert.NilError(t, err) + checkmate.AssertNil(t, err) } func CreateTempFile(t *testing.T, filePath string) *os.File { f, err := os.Create(filePath) - assert.NilError(t, err) + checkmate.AssertNil(t, err) t.Cleanup(func() { err = os.Remove(f.Name()) @@ -36,10 +36,10 @@ func CreateTempFile(t *testing.T, filePath string) *os.File { func ChangeCwd(t *testing.T, path string) { dir, err := os.Getwd() - assert.NilError(t, err) + checkmate.AssertNil(t, err) err = os.Chdir(path) - assert.NilError(t, err) + checkmate.AssertNil(t, err) t.Cleanup(func() { err = os.Chdir(dir) -- cgit v1.2.3