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 From 345e28bd44ba6a38bf7ee9bfe2066f333bbbe894 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 28 Jan 2024 16:29:00 -0500 Subject: Update to checkmate v0.2.0 --- 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 74ca14e..bde519b 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" - "github.com/eugenetriguba/checkmate" + "github.com/eugenetriguba/checkmate/assert" ) func NewTestConnectionConfig(t *testing.T, driver string) *configloader.ConnectionConfig { port, err := strconv.Atoi(os.Getenv("DB_PORT")) - checkmate.AssertNil(t, err) + assert.Nil(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) - checkmate.AssertNil(t, err) + assert.Nil(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 $$; `) - checkmate.AssertNil(t, err) + assert.Nil(t, err) err = db.Close() - checkmate.AssertNil(t, err) + assert.Nil(t, err) }) return db } diff --git a/internal/bolttest/fs.go b/internal/bolttest/fs.go index 0237733..36078f4 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" - "github.com/eugenetriguba/checkmate" + "github.com/eugenetriguba/checkmate/assert" ) 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) - checkmate.AssertNil(t, err) + assert.Nil(t, err) err = f.Close() - checkmate.AssertNil(t, err) + assert.Nil(t, err) } func CreateTempFile(t *testing.T, filePath string) *os.File { f, err := os.Create(filePath) - checkmate.AssertNil(t, err) + assert.Nil(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() - checkmate.AssertNil(t, err) + assert.Nil(t, err) err = os.Chdir(path) - checkmate.AssertNil(t, err) + assert.Nil(t, err) t.Cleanup(func() { err = os.Chdir(dir) -- cgit v1.2.3 From bf1d3b3e1fc42132678b244e479839416a03a6ce Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Thu, 29 Feb 2024 19:53:20 -0500 Subject: Add service tests --- internal/bolttest/mock_migration_db_repo.go | 78 +++++++++++++++++++++++++++ internal/bolttest/mock_migration_fs_repo.go | 82 +++++++++++++++++++++++++++++ internal/bolttest/null_outputer.go | 19 +++++++ 3 files changed, 179 insertions(+) create mode 100644 internal/bolttest/mock_migration_db_repo.go create mode 100644 internal/bolttest/mock_migration_fs_repo.go create mode 100644 internal/bolttest/null_outputer.go (limited to 'internal/bolttest') diff --git a/internal/bolttest/mock_migration_db_repo.go b/internal/bolttest/mock_migration_db_repo.go new file mode 100644 index 0000000..bdcc928 --- /dev/null +++ b/internal/bolttest/mock_migration_db_repo.go @@ -0,0 +1,78 @@ +package bolttest + +import "github.com/eugenetriguba/bolt/internal/models" + +type MockMigrationDBRepo struct { + ListReturnValue ListReturnValue + ListCallCount int + IsAppliedReturnValue IsAppliedReturnValue + IsAppliedCallCount int + ApplyReturnValue ApplyReturnValue + ApplyCallCount int + ApplyWithTxReturnValue ApplyWithTxReturnValue + ApplyWithTxCallCount int + RevertReturnValue RevertReturnValue + RevertCallCount int + RevertWithTxReturnValue RevertWithTxReturnValue + RevertWithTxCallCount int +} + +type ListReturnValue struct { + Migrations map[string]*models.Migration + Err error +} + +type IsAppliedReturnValue struct { + IsApplied bool + Err error +} + +type ApplyReturnValue struct { + Err error +} + +type ApplyWithTxReturnValue = ApplyReturnValue +type RevertReturnValue = ApplyReturnValue +type RevertWithTxReturnValue = ApplyReturnValue + +func (repo *MockMigrationDBRepo) List() (map[string]*models.Migration, error) { + repo.ListCallCount += 1 + return repo.ListReturnValue.Migrations, repo.ListReturnValue.Err +} + +func (repo *MockMigrationDBRepo) IsApplied(version string) (bool, error) { + repo.IsAppliedCallCount += 1 + return repo.IsAppliedReturnValue.IsApplied, repo.IsAppliedReturnValue.Err +} + +func (repo *MockMigrationDBRepo) Apply( + upgradeScript string, + migration *models.Migration, +) error { + repo.ApplyCallCount += 1 + return repo.ApplyReturnValue.Err +} + +func (repo *MockMigrationDBRepo) ApplyWithTx( + upgradeScript string, + migration *models.Migration, +) error { + repo.ApplyWithTxCallCount += 1 + return repo.ApplyWithTxReturnValue.Err +} + +func (repo *MockMigrationDBRepo) Revert( + downgradeScript string, + migration *models.Migration, +) error { + repo.RevertCallCount += 1 + return repo.RevertReturnValue.Err +} + +func (repo *MockMigrationDBRepo) RevertWithTx( + downgradeScript string, + migration *models.Migration, +) error { + repo.RevertWithTxCallCount += 1 + return repo.RevertWithTxReturnValue.Err +} diff --git a/internal/bolttest/mock_migration_fs_repo.go b/internal/bolttest/mock_migration_fs_repo.go new file mode 100644 index 0000000..0932b37 --- /dev/null +++ b/internal/bolttest/mock_migration_fs_repo.go @@ -0,0 +1,82 @@ +package bolttest + +import "github.com/eugenetriguba/bolt/internal/models" + +type MockMigrationFsRepo struct { + CreateReturnValue CreateReturnValue + CreateCallCount int + ExistsReturnValue ExistsReturnValue + ExistsCallCount int + GetReturnValue GetReturnValue + GetCallCount int + ListReturnValue ListReturnValue + ListCallCount int + LatestReturnValue LatestReturnValue + LatestCallCount int + ReadUpgradeScriptReturnValue ReadUpgradeScriptReturnValue + ReadUpgradeScriptCallCount int + ReadDowngradeScriptReturnValue ReadDowngradeScriptReturnValue + ReadDowngradeScriptCallCount int +} + +type CreateReturnValue struct { + Err error +} + +type ExistsReturnValue struct { + Exists bool + Err error +} + +type GetReturnValue struct { + Migration *models.Migration + Err error +} + +type LatestReturnValue = GetReturnValue + +type ReadUpgradeScriptReturnValue struct { + ScriptContents string + Err error +} + +type ReadDowngradeScriptReturnValue = ReadUpgradeScriptReturnValue + +func (repo *MockMigrationFsRepo) Create(migration *models.Migration) error { + repo.CreateCallCount += 1 + return repo.CreateReturnValue.Err +} + +func (repo *MockMigrationFsRepo) Exists(version string) (bool, error) { + repo.ExistsCallCount += 1 + return repo.ExistsReturnValue.Exists, repo.ExistsReturnValue.Err +} + +func (repo *MockMigrationFsRepo) Get(version string) (*models.Migration, error) { + repo.GetCallCount += 1 + return repo.GetReturnValue.Migration, repo.GetReturnValue.Err +} + +func (repo *MockMigrationFsRepo) List() (map[string]*models.Migration, error) { + repo.ListCallCount += 1 + return repo.ListReturnValue.Migrations, repo.ListReturnValue.Err +} + +func (repo *MockMigrationFsRepo) Latest() (*models.Migration, error) { + repo.LatestCallCount += 1 + return repo.LatestReturnValue.Migration, repo.LatestReturnValue.Err +} + +func (repo *MockMigrationFsRepo) ReadUpgradeScript( + migration *models.Migration, +) (string, error) { + repo.ReadUpgradeScriptCallCount += 1 + return repo.ReadUpgradeScriptReturnValue.ScriptContents, repo.ReadUpgradeScriptReturnValue.Err +} + +func (repo *MockMigrationFsRepo) ReadDowngradeScript( + migration *models.Migration, +) (string, error) { + repo.ReadDowngradeScriptCallCount += 1 + return repo.ReadDowngradeScriptReturnValue.ScriptContents, repo.ReadDowngradeScriptReturnValue.Err +} diff --git a/internal/bolttest/null_outputer.go b/internal/bolttest/null_outputer.go new file mode 100644 index 0000000..f70b002 --- /dev/null +++ b/internal/bolttest/null_outputer.go @@ -0,0 +1,19 @@ +package bolttest + +type NullOutputter struct { + OutputLogs []string + ErrorLogs []string + TableLogs []string +} + +func (o NullOutputter) Output(message string) error { + return nil +} + +func (o NullOutputter) Error(err error) error { + return nil +} + +func (o NullOutputter) Table(header []string, rows [][]string) error { + return nil +} -- cgit v1.2.3 From 6760ae82d62449f41c68950264c02c40be81bfb3 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sat, 2 Mar 2024 09:29:41 -0500 Subject: Improve coverage for separate Tx methods --- internal/bolttest/mock_sql_db.go | 53 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 internal/bolttest/mock_sql_db.go (limited to 'internal/bolttest') diff --git a/internal/bolttest/mock_sql_db.go b/internal/bolttest/mock_sql_db.go new file mode 100644 index 0000000..0c12592 --- /dev/null +++ b/internal/bolttest/mock_sql_db.go @@ -0,0 +1,53 @@ +package bolttest + +import "database/sql" + +type MockSqlDb struct { + ExecReturnValue ExecReturnValue + ExecCallCount int + QueryReturnValue QueryReturnValue + QueryCallCount int + QueryRowReturnValue QueryRowReturnValue + QueryRowCallCount int + BeginReturnValue BeginReturnValue + BeginCallCount int +} + +type ExecReturnValue struct { + Result sql.Result + Err error +} + +type QueryReturnValue struct { + Rows *sql.Rows + Err error +} + +type QueryRowReturnValue struct { + Row *sql.Row +} + +type BeginReturnValue struct { + Tx *sql.Tx + Err error +} + +func (db *MockSqlDb) Exec(query string, args ...any) (sql.Result, error) { + db.ExecCallCount += 1 + return db.ExecReturnValue.Result, db.ExecReturnValue.Err +} + +func (db *MockSqlDb) Query(query string, args ...any) (*sql.Rows, error) { + db.QueryCallCount += 1 + return db.QueryReturnValue.Rows, db.QueryReturnValue.Err +} + +func (db *MockSqlDb) QueryRow(query string, args ...any) *sql.Row { + db.QueryRowCallCount += 1 + return db.QueryRowReturnValue.Row +} + +func (db *MockSqlDb) Begin() (*sql.Tx, error) { + db.BeginCallCount += 1 + return db.BeginReturnValue.Tx, db.BeginReturnValue.Err +} -- cgit v1.2.3 From 018083b9259c2265ad3ea2432f315641e5b996ce Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sat, 2 Mar 2024 10:18:41 -0500 Subject: Clean up fs repo and fs repo tests --- internal/bolttest/mock_migration_fs_repo.go | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'internal/bolttest') diff --git a/internal/bolttest/mock_migration_fs_repo.go b/internal/bolttest/mock_migration_fs_repo.go index 0932b37..ae933e3 100644 --- a/internal/bolttest/mock_migration_fs_repo.go +++ b/internal/bolttest/mock_migration_fs_repo.go @@ -5,10 +5,6 @@ import "github.com/eugenetriguba/bolt/internal/models" type MockMigrationFsRepo struct { CreateReturnValue CreateReturnValue CreateCallCount int - ExistsReturnValue ExistsReturnValue - ExistsCallCount int - GetReturnValue GetReturnValue - GetCallCount int ListReturnValue ListReturnValue ListCallCount int LatestReturnValue LatestReturnValue @@ -23,18 +19,11 @@ type CreateReturnValue struct { Err error } -type ExistsReturnValue struct { - Exists bool - Err error -} - -type GetReturnValue struct { +type LatestReturnValue struct { Migration *models.Migration Err error } -type LatestReturnValue = GetReturnValue - type ReadUpgradeScriptReturnValue struct { ScriptContents string Err error @@ -47,16 +36,6 @@ func (repo *MockMigrationFsRepo) Create(migration *models.Migration) error { return repo.CreateReturnValue.Err } -func (repo *MockMigrationFsRepo) Exists(version string) (bool, error) { - repo.ExistsCallCount += 1 - return repo.ExistsReturnValue.Exists, repo.ExistsReturnValue.Err -} - -func (repo *MockMigrationFsRepo) Get(version string) (*models.Migration, error) { - repo.GetCallCount += 1 - return repo.GetReturnValue.Migration, repo.GetReturnValue.Err -} - func (repo *MockMigrationFsRepo) List() (map[string]*models.Migration, error) { repo.ListCallCount += 1 return repo.ListReturnValue.Migrations, repo.ListReturnValue.Err -- cgit v1.2.3 From a37df93853def914dbda165cdcf09ae8e0305ec3 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sat, 2 Mar 2024 11:04:00 -0500 Subject: Remove Latest() from migration fs repo in favor of using List on service --- internal/bolttest/mock_migration_fs_repo.go | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'internal/bolttest') diff --git a/internal/bolttest/mock_migration_fs_repo.go b/internal/bolttest/mock_migration_fs_repo.go index ae933e3..d392732 100644 --- a/internal/bolttest/mock_migration_fs_repo.go +++ b/internal/bolttest/mock_migration_fs_repo.go @@ -7,8 +7,6 @@ type MockMigrationFsRepo struct { CreateCallCount int ListReturnValue ListReturnValue ListCallCount int - LatestReturnValue LatestReturnValue - LatestCallCount int ReadUpgradeScriptReturnValue ReadUpgradeScriptReturnValue ReadUpgradeScriptCallCount int ReadDowngradeScriptReturnValue ReadDowngradeScriptReturnValue @@ -19,11 +17,6 @@ type CreateReturnValue struct { Err error } -type LatestReturnValue struct { - Migration *models.Migration - Err error -} - type ReadUpgradeScriptReturnValue struct { ScriptContents string Err error @@ -41,11 +34,6 @@ func (repo *MockMigrationFsRepo) List() (map[string]*models.Migration, error) { return repo.ListReturnValue.Migrations, repo.ListReturnValue.Err } -func (repo *MockMigrationFsRepo) Latest() (*models.Migration, error) { - repo.LatestCallCount += 1 - return repo.LatestReturnValue.Migration, repo.LatestReturnValue.Err -} - func (repo *MockMigrationFsRepo) ReadUpgradeScript( migration *models.Migration, ) (string, error) { -- cgit v1.2.3