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 +-- internal/configloader/configloader_test.go | 14 +-- internal/configloader/configloader_unix_test.go | 8 +- internal/configloader/configloader_windows_test.go | 10 +- internal/models/migration_test.go | 20 ++-- internal/output/console_test.go | 14 +-- internal/repositories/migration_db_repo_test.go | 118 ++++++++++----------- internal/repositories/migration_fs_repo_test.go | 40 +++---- internal/sqlparse/sqlparse_test.go | 6 +- internal/storage/db_test.go | 12 +-- 11 files changed, 132 insertions(+), 132 deletions(-) (limited to 'internal') 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) diff --git a/internal/configloader/configloader_test.go b/internal/configloader/configloader_test.go index 3cb9d71..f08f12f 100644 --- a/internal/configloader/configloader_test.go +++ b/internal/configloader/configloader_test.go @@ -7,16 +7,16 @@ import ( "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" - "github.com/eugenetriguba/checkmate" + "github.com/eugenetriguba/checkmate/assert" ) func TestNewConfigMigrationsDirPathDefault(t *testing.T) { bolttest.ChangeCwd(t, os.TempDir()) cfg, err := configloader.NewConfig() - checkmate.AssertNil(t, err) + assert.Nil(t, err) - checkmate.AssertEqual(t, cfg.Migrations.DirectoryPath, "migrations") + assert.Equal(t, cfg.Migrations.DirectoryPath, "migrations") } func TestNewConfigFindsFileAndPopulatesConfigStruct(t *testing.T) { @@ -34,8 +34,8 @@ func TestNewConfigFindsFileAndPopulatesConfigStruct(t *testing.T) { bolttest.CreateConfigFile(t, &expectedCfg, "bolt.toml") cfg, err := configloader.NewConfig() - checkmate.AssertNil(t, err) - checkmate.AssertDeepEqual(t, *cfg, expectedCfg) + assert.Nil(t, err) + assert.DeepEqual(t, *cfg, expectedCfg) } func TestNewConfigCanBeOverridenByEnvVars(t *testing.T) { @@ -72,6 +72,6 @@ func TestNewConfigCanBeOverridenByEnvVars(t *testing.T) { t.Setenv("BOLT_DB_CONN_DRIVER", envCfg.Connection.Driver) cfg, err := configloader.NewConfig() - checkmate.AssertNil(t, err) - checkmate.AssertDeepEqual(t, *cfg, envCfg) + assert.Nil(t, err) + assert.DeepEqual(t, *cfg, envCfg) } diff --git a/internal/configloader/configloader_unix_test.go b/internal/configloader/configloader_unix_test.go index b9cef31..0095afd 100644 --- a/internal/configloader/configloader_unix_test.go +++ b/internal/configloader/configloader_unix_test.go @@ -8,7 +8,7 @@ import ( "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" - "github.com/eugenetriguba/checkmate" + "github.com/eugenetriguba/checkmate/assert" ) func TestNewConfigUnixSearchesToRootFilePath(t *testing.T) { @@ -18,11 +18,11 @@ func TestNewConfigUnixSearchesToRootFilePath(t *testing.T) { bolttest.CreateConfigFile(t, &expectedCfg, "/bolt.toml") homedir, err := os.UserHomeDir() - checkmate.AssertNil(t, err) + assert.Nil(t, err) bolttest.ChangeCwd(t, homedir) cfg, err := configloader.NewConfig() - checkmate.AssertNil(t, err) + assert.Nil(t, err) - checkmate.AssertDeepEqual(t, *cfg, expectedCfg) + assert.DeepEqual(t, *cfg, expectedCfg) } diff --git a/internal/configloader/configloader_windows_test.go b/internal/configloader/configloader_windows_test.go index a6a24e6..1b62624 100644 --- a/internal/configloader/configloader_windows_test.go +++ b/internal/configloader/configloader_windows_test.go @@ -9,7 +9,7 @@ import ( "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" - "github.com/eugenetriguba/checkmate" + "github.com/eugenetriguba/checkmate/assert" ) func TestNewConfigWindowsSearchesToRootFilePath(t *testing.T) { @@ -18,14 +18,14 @@ func TestNewConfigWindowsSearchesToRootFilePath(t *testing.T) { } configPath := filepath.Join(os.Getenv("SystemDrive"), "bolt.toml") bolttest.CreateConfigFile(t, &expectedCfg, configPath) - checkmate.AssertNil(t, err) + assert.Nil(t, err) homedir, err := os.UserHomeDir() - checkmate.AssertNil(t, err) + assert.Nil(t, err) bolttest.ChangeCwd(t, homedir) cfg, err := configloader.NewConfig() - checkmate.AssertNil(t, err) + assert.Nil(t, err) - checkmate.AssertDeepEqual(t, *cfg, expectedCfg) + assert.DeepEqual(t, *cfg, expectedCfg) } diff --git a/internal/models/migration_test.go b/internal/models/migration_test.go index 1d449c8..aa92510 100644 --- a/internal/models/migration_test.go +++ b/internal/models/migration_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/eugenetriguba/bolt/internal/models" - "github.com/eugenetriguba/checkmate" + "github.com/eugenetriguba/checkmate/assert" ) func TestNewTimestampMigration(t *testing.T) { @@ -13,21 +13,21 @@ func TestNewTimestampMigration(t *testing.T) { m := models.NewTimestampMigration(timestamp, "test message") - checkmate.AssertEqual(t, m.Version, "20200101000000") - checkmate.AssertEqual(t, m.Message, "test message") - checkmate.AssertEqual(t, m.Applied, false) + assert.Equal(t, m.Version, "20200101000000") + assert.Equal(t, m.Message, "test message") + assert.Equal(t, m.Applied, false) } func TestNewSequentialMigration(t *testing.T) { m := models.NewSequentialMigration(1, "test message") - checkmate.AssertEqual(t, m.Version, "001") - checkmate.AssertEqual(t, m.Message, "test message") - checkmate.AssertEqual(t, m.Applied, false) + assert.Equal(t, m.Version, "001") + assert.Equal(t, m.Message, "test message") + assert.Equal(t, m.Applied, false) m = models.NewSequentialMigration(100, "test message") - checkmate.AssertEqual(t, m.Version, "100") - checkmate.AssertEqual(t, m.Message, "test message") - checkmate.AssertEqual(t, m.Applied, false) + assert.Equal(t, m.Version, "100") + assert.Equal(t, m.Message, "test message") + assert.Equal(t, m.Applied, false) } diff --git a/internal/output/console_test.go b/internal/output/console_test.go index e006cd6..ff1f8b8 100644 --- a/internal/output/console_test.go +++ b/internal/output/console_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/eugenetriguba/checkmate" + "github.com/eugenetriguba/checkmate/assert" ) func NewConsoleOutputterWithWriters(stdout io.Writer, stderr io.Writer) ConsoleOutputter { @@ -19,8 +19,8 @@ func TestConsoleOutputter_Output(t *testing.T) { consoleOutputter.Output("test string") - checkmate.AssertEqual(t, stdout.String(), "test string\n") - checkmate.AssertEqual(t, stderr.String(), "") + assert.Equal(t, stdout.String(), "test string\n") + assert.Equal(t, stderr.String(), "") } func TestConsoleOutputter_Error(t *testing.T) { @@ -30,8 +30,8 @@ func TestConsoleOutputter_Error(t *testing.T) { consoleOutputter.Error("test string") - checkmate.AssertEqual(t, stdout.String(), "") - checkmate.AssertEqual(t, stderr.String(), "test string\n") + assert.Equal(t, stdout.String(), "") + assert.Equal(t, stderr.String(), "test string\n") } func TestConsoleOutputter_Table(t *testing.T) { @@ -70,7 +70,7 @@ func TestConsoleOutputter_Table(t *testing.T) { consoleOutputter.Table(tc.headers, tc.rows) - checkmate.AssertEqual(t, stdout.String(), tc.expectedStdout) - checkmate.AssertEqual(t, stderr.String(), "") + assert.Equal(t, stdout.String(), tc.expectedStdout) + assert.Equal(t, stderr.String(), "") } } diff --git a/internal/repositories/migration_db_repo_test.go b/internal/repositories/migration_db_repo_test.go index 5d1a9f1..4e41b36 100644 --- a/internal/repositories/migration_db_repo_test.go +++ b/internal/repositories/migration_db_repo_test.go @@ -8,7 +8,7 @@ import ( "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/models" "github.com/eugenetriguba/bolt/internal/repositories" - "github.com/eugenetriguba/checkmate" + "github.com/eugenetriguba/checkmate/assert" ) func TestMigrationDBRepo_NewMigrationDBRepoCreatesTable(t *testing.T) { @@ -21,10 +21,10 @@ func TestMigrationDBRepo_NewMigrationDBRepoCreatesTable(t *testing.T) { `) var scanResult int err := row.Scan(&scanResult) - checkmate.AssertErrorIs(t, err, sql.ErrNoRows) + assert.ErrorIs(t, err, sql.ErrNoRows) _, err = repositories.NewMigrationDBRepo(db) - checkmate.AssertNil(t, err) + assert.Nil(t, err) row = db.QueryRow(` SELECT 1 @@ -33,49 +33,49 @@ func TestMigrationDBRepo_NewMigrationDBRepoCreatesTable(t *testing.T) { AND TABLE_NAME = 'bolt_migrations' `) err = row.Scan(&scanResult) - checkmate.AssertNil(t, err) + assert.Nil(t, err) } func TestMigrationDBRepo_NewMigrationDBRepoLeavesCurrentTable(t *testing.T) { db := bolttest.NewTestDB(t, "postgres") _, err := db.Exec(`CREATE TABLE bolt_migrations(id INT NOT NULL PRIMARY KEY)`) - checkmate.AssertNil(t, err) + assert.Nil(t, err) _, err = db.Exec(`INSERT INTO bolt_migrations(id) VALUES (1);`) - checkmate.AssertNil(t, err) + assert.Nil(t, err) _, err = repositories.NewMigrationDBRepo(db) - checkmate.AssertNil(t, err) + assert.Nil(t, err) row := db.QueryRow(`SELECT id FROM bolt_migrations`) var scanResult int err = row.Scan(&scanResult) - checkmate.AssertNil(t, err) - checkmate.AssertEqual(t, scanResult, 1) + assert.Nil(t, err) + assert.Equal(t, scanResult, 1) } func TestMigrationDBRepo_ListWithEmptyTable(t *testing.T) { db := bolttest.NewTestDB(t, "postgres") repo, err := repositories.NewMigrationDBRepo(db) - checkmate.AssertNil(t, err) + assert.Nil(t, err) migrations, err := repo.List() - checkmate.AssertNil(t, err) - checkmate.AssertEqual(t, len(migrations), 0) + assert.Nil(t, err) + assert.Equal(t, len(migrations), 0) } func TestMigrationDBRepo_ListWithSingleResult(t *testing.T) { db := bolttest.NewTestDB(t, "postgres") repo, err := repositories.NewMigrationDBRepo(db) - checkmate.AssertNil(t, err) + assert.Nil(t, err) version := "20230101000000" _, err = db.Exec(`INSERT INTO bolt_migrations(version) VALUES ($1);`, version) - checkmate.AssertNil(t, err) + assert.Nil(t, err) migrations, err := repo.List() - checkmate.AssertNil(t, err) - checkmate.AssertEqual(t, len(migrations), 1) - checkmate.AssertDeepEqual( + assert.Nil(t, err) + assert.Equal(t, len(migrations), 1) + assert.DeepEqual( t, migrations[version], &models.Migration{Version: version, Message: "", Applied: true}, @@ -85,16 +85,16 @@ func TestMigrationDBRepo_ListWithSingleResult(t *testing.T) { func TestMigrationDBRepo_ListWithShortVersion(t *testing.T) { db := bolttest.NewTestDB(t, "postgres") repo, err := repositories.NewMigrationDBRepo(db) - checkmate.AssertNil(t, err) + assert.Nil(t, err) version := "20230101" _, err = db.Exec(`INSERT INTO bolt_migrations(version) VALUES ($1);`, version) - checkmate.AssertNil(t, err) + assert.Nil(t, err) migrations, err := repo.List() - checkmate.AssertNil(t, err) - checkmate.AssertEqual(t, len(migrations), 1) - checkmate.AssertDeepEqual( + assert.Nil(t, err) + assert.Equal(t, len(migrations), 1) + assert.DeepEqual( t, migrations[version], &models.Migration{Version: version, Message: "", Applied: true}, @@ -104,37 +104,37 @@ func TestMigrationDBRepo_ListWithShortVersion(t *testing.T) { func TestMigrationDBRepo_IsAppliedWithNotApplied(t *testing.T) { db := bolttest.NewTestDB(t, "postgres") repo, err := repositories.NewMigrationDBRepo(db) - checkmate.AssertNil(t, err) + assert.Nil(t, err) version := "20230101010101" applied, err := repo.IsApplied(version) - checkmate.AssertNil(t, err) - checkmate.AssertEqual(t, applied, false) + assert.Nil(t, err) + assert.Equal(t, applied, false) } func TestMigrationDBRepo_IsAppliedWithApplied(t *testing.T) { db := bolttest.NewTestDB(t, "postgres") repo, err := repositories.NewMigrationDBRepo(db) - checkmate.AssertNil(t, err) + assert.Nil(t, err) version := "20230101010101" _, err = db.Exec(`INSERT INTO bolt_migrations(version) VALUES ($1);`, version) - checkmate.AssertNil(t, err) + assert.Nil(t, err) applied, err := repo.IsApplied(version) - checkmate.AssertNil(t, err) - checkmate.AssertEqual(t, applied, true) + assert.Nil(t, err) + assert.Equal(t, applied, true) } func TestMigrationDBRepo_Apply(t *testing.T) { db := bolttest.NewTestDB(t, "postgres") repo, err := repositories.NewMigrationDBRepo(db) - checkmate.AssertNil(t, err) + assert.Nil(t, err) migration := models.NewTimestampMigration(time.Now(), "test") err = repo.Apply(`CREATE TABLE tmp(id INT NOT NULL PRIMARY KEY)`, migration) - checkmate.AssertNil(t, err) - checkmate.AssertEqual(t, migration.Applied, true) + assert.Nil(t, err) + assert.Equal(t, migration.Applied, true) row := db.QueryRow(` SELECT 1 @@ -144,31 +144,31 @@ func TestMigrationDBRepo_Apply(t *testing.T) { `) var scanResult int err = row.Scan(&scanResult) - checkmate.AssertNil(t, err) + assert.Nil(t, err) applied, err := repo.IsApplied(migration.Version) - checkmate.AssertNil(t, err) - checkmate.AssertEqual(t, applied, true) + assert.Nil(t, err) + assert.Equal(t, applied, true) } func TestMigrationDBRepo_Revert(t *testing.T) { db := bolttest.NewTestDB(t, "postgres") repo, err := repositories.NewMigrationDBRepo(db) - checkmate.AssertNil(t, err) + assert.Nil(t, err) _, err = db.Exec(`CREATE TABLE tmp(id INT NOT NULL PRIMARY KEY)`) - checkmate.AssertNil(t, err) + assert.Nil(t, err) migration := models.NewTimestampMigration(time.Now(), "test") _, err = db.Exec( `INSERT INTO bolt_migrations(version) VALUES ($1);`, migration.Version, ) - checkmate.AssertNil(t, err) + assert.Nil(t, err) migration.Applied = true err = repo.Revert(`DROP TABLE tmp;`, migration) - checkmate.AssertNil(t, err) - checkmate.AssertEqual(t, migration.Applied, false) + assert.Nil(t, err) + assert.Equal(t, migration.Applied, false) row := db.QueryRow(` SELECT 1 @@ -178,21 +178,21 @@ func TestMigrationDBRepo_Revert(t *testing.T) { `) var scanResult int err = row.Scan(&scanResult) - checkmate.AssertErrorIs(t, err, sql.ErrNoRows) + assert.ErrorIs(t, err, sql.ErrNoRows) row = db.QueryRow(`SELECT count(*) FROM bolt_migrations`) var count int err = row.Scan(&count) - checkmate.AssertNil(t, err) - checkmate.AssertEqual(t, count, 0) + assert.Nil(t, err) + assert.Equal(t, count, 0) } func TestMigrationDBRepo_ApplyAndRevertWithoutTransaction(t *testing.T) { db := bolttest.NewTestDB(t, "postgres") repo, err := repositories.NewMigrationDBRepo(db) - checkmate.AssertNil(t, err) + assert.Nil(t, err) _, err = db.Exec("CREATE TABLE tmp(id INT PRIMARY KEY, id2 INT, id3 INT)") - checkmate.AssertNil(t, err) + assert.Nil(t, err) migration := models.NewTimestampMigration(time.Now(), "test") // CREATE INDEX CONCURRENTLY cannot run inside a transaction. @@ -200,44 +200,44 @@ func TestMigrationDBRepo_ApplyAndRevertWithoutTransaction(t *testing.T) { `-- bolt: no-transaction\CREATE INDEX CONCURRENTLY i1 ON tmp(id2);`, migration, ) - checkmate.AssertNil(t, err) - checkmate.AssertEqual(t, migration.Applied, true) + assert.Nil(t, err) + assert.Equal(t, migration.Applied, true) err = repo.Revert( "-- bolt: no-transaction\nCREATE INDEX CONCURRENTLY i2 ON tmp(id3);", migration, ) - checkmate.AssertNil(t, err) - checkmate.AssertEqual(t, migration.Applied, false) + assert.Nil(t, err) + assert.Equal(t, migration.Applied, false) } func TestMigrationDBRepo_ApplyMalformedSql(t *testing.T) { db := bolttest.NewTestDB(t, "postgres") repo, err := repositories.NewMigrationDBRepo(db) - checkmate.AssertNil(t, err) + assert.Nil(t, err) migration := models.NewTimestampMigration(time.Now(), "test") err = repo.Apply("this is not SQL", migration) - checkmate.AssertErrorContains(t, err, "syntax error") - checkmate.AssertEqual(t, migration.Applied, false) + assert.ErrorContains(t, err, "syntax error") + assert.Equal(t, migration.Applied, false) err = repo.Apply("-- bolt: no-transaction\nthis is not SQL", migration) - checkmate.AssertErrorContains(t, err, "syntax error") - checkmate.AssertEqual(t, migration.Applied, false) + assert.ErrorContains(t, err, "syntax error") + assert.Equal(t, migration.Applied, false) } func TestMigrationDBRepo_RevertMalformedSql(t *testing.T) { db := bolttest.NewTestDB(t, "postgres") repo, err := repositories.NewMigrationDBRepo(db) - checkmate.AssertNil(t, err) + assert.Nil(t, err) migration := models.NewTimestampMigration(time.Now(), "test") migration.Applied = true err = repo.Revert("this is not SQL", migration) - checkmate.AssertErrorContains(t, err, "syntax error") - checkmate.AssertEqual(t, migration.Applied, true) + assert.ErrorContains(t, err, "syntax error") + assert.Equal(t, migration.Applied, true) err = repo.Revert("-- bolt: no-transaction\nthis is not SQL", migration) - checkmate.AssertErrorContains(t, err, "syntax error") - checkmate.AssertEqual(t, migration.Applied, true) + assert.ErrorContains(t, err, "syntax error") + assert.Equal(t, migration.Applied, true) } diff --git a/internal/repositories/migration_fs_repo_test.go b/internal/repositories/migration_fs_repo_test.go index 2398260..72ba792 100644 --- a/internal/repositories/migration_fs_repo_test.go +++ b/internal/repositories/migration_fs_repo_test.go @@ -10,12 +10,12 @@ import ( "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/models" "github.com/eugenetriguba/bolt/internal/repositories" - "github.com/eugenetriguba/checkmate" + "github.com/eugenetriguba/checkmate/assert" ) func assertFileExists(t *testing.T, path string) { _, err := os.Stat(path) - checkmate.AssertNil(t, err) + assert.Nil(t, err) } func TestNewMigrationFsRepoCreatesDirIfNotExists(t *testing.T) { @@ -24,7 +24,7 @@ func TestNewMigrationFsRepoCreatesDirIfNotExists(t *testing.T) { migrationsConfig := configloader.MigrationsConfig{DirectoryPath: migrationsDir} _, err := repositories.NewMigrationFsRepo(&migrationsConfig) - checkmate.AssertNil(t, err) + assert.Nil(t, err) assertFileExists(t, migrationsDir) } @@ -34,21 +34,21 @@ func TestNewMigrationFsRepoMigrationDirIsFile(t *testing.T) { migrationsDir := filepath.Join(tempDir, "migrations") migrationsConfig := configloader.MigrationsConfig{DirectoryPath: migrationsDir} _, err := os.Create(migrationsDir) - checkmate.AssertNil(t, err) + assert.Nil(t, err) _, err = repositories.NewMigrationFsRepo(&migrationsConfig) - checkmate.AssertErrorContains(t, err, "is not a directory") + assert.ErrorContains(t, err, "is not a directory") } func TestMigrationFsRepoCreate(t *testing.T) { tempDir := t.TempDir() migrationsConfig := configloader.MigrationsConfig{DirectoryPath: tempDir} repo, err := repositories.NewMigrationFsRepo(&migrationsConfig) - checkmate.AssertNil(t, err) + assert.Nil(t, err) migration := models.NewTimestampMigration(time.Now(), "add users table") err = repo.Create(migration) - checkmate.AssertNil(t, err) + assert.Nil(t, err) migrationDirName := fmt.Sprintf("%s_add_users_table", migration.Version) assertFileExists(t, filepath.Join(tempDir, migrationDirName)) @@ -60,11 +60,11 @@ func TestMigrationFsRepoReadUpgradeAndDowngradeScript(t *testing.T) { tempDir := t.TempDir() migrationsConfig := configloader.MigrationsConfig{DirectoryPath: tempDir} repo, err := repositories.NewMigrationFsRepo(&migrationsConfig) - checkmate.AssertNil(t, err) + assert.Nil(t, err) migration := models.NewTimestampMigration(time.Now(), "add users table") err = repo.Create(migration) - checkmate.AssertNil(t, err) + assert.Nil(t, err) migrationDirName := fmt.Sprintf("%s_add_users_table", migration.Version) expectedUpgradeScriptContents := []byte("CREATE TABLE users(id int PRIMARY KEY);") @@ -81,18 +81,18 @@ func TestMigrationFsRepoReadUpgradeAndDowngradeScript(t *testing.T) { ) upgradeScriptContents, err := repo.ReadUpgradeScript(migration) - checkmate.AssertNil(t, err) - checkmate.AssertEqual(t, upgradeScriptContents, string(expectedUpgradeScriptContents)) + assert.Nil(t, err) + assert.Equal(t, upgradeScriptContents, string(expectedUpgradeScriptContents)) downgradeScriptContents, err := repo.ReadDowngradeScript(migration) - checkmate.AssertNil(t, err) - checkmate.AssertEqual(t, downgradeScriptContents, string(expectedDowngradeScriptContents)) + assert.Nil(t, err) + assert.Equal(t, downgradeScriptContents, string(expectedDowngradeScriptContents)) } func TestMigrationFsRepo_List(t *testing.T) { tempDir := t.TempDir() migrationsConfig := configloader.MigrationsConfig{DirectoryPath: tempDir} repo, err := repositories.NewMigrationFsRepo(&migrationsConfig) - checkmate.AssertNil(t, err) + assert.Nil(t, err) migration1 := models.NewTimestampMigration( time.Date(2020, 10, 12, 1, 1, 1, 1, time.UTC), @@ -103,13 +103,13 @@ func TestMigrationFsRepo_List(t *testing.T) { "migration_2", ) err = repo.Create(migration1) - checkmate.AssertNil(t, err) + assert.Nil(t, err) repo.Create(migration2) - checkmate.AssertNil(t, err) + assert.Nil(t, err) migrations, err := repo.List() - checkmate.AssertNil(t, err) - checkmate.AssertEqual(t, len(migrations), 2) - checkmate.AssertDeepEqual(t, migrations[migration1.Version], migration1) - checkmate.AssertDeepEqual(t, migrations[migration2.Version], migration2) + assert.Nil(t, err) + assert.Equal(t, len(migrations), 2) + assert.DeepEqual(t, migrations[migration1.Version], migration1) + assert.DeepEqual(t, migrations[migration2.Version], migration2) } diff --git a/internal/sqlparse/sqlparse_test.go b/internal/sqlparse/sqlparse_test.go index 644a79f..17e2f10 100644 --- a/internal/sqlparse/sqlparse_test.go +++ b/internal/sqlparse/sqlparse_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/eugenetriguba/bolt/internal/sqlparse" - "github.com/eugenetriguba/checkmate" + "github.com/eugenetriguba/checkmate/assert" ) func TestSqlParser_Parse(t *testing.T) { @@ -49,8 +49,8 @@ func TestSqlParser_Parse(t *testing.T) { sqlParser := sqlparse.NewSqlParser(strings.NewReader(tc.buffer)) execOptions, err := sqlParser.Parse() - checkmate.AssertNil(t, err) + assert.Nil(t, err) - checkmate.AssertDeepEqual(t, execOptions, tc.expectedExecutionOptions) + assert.DeepEqual(t, execOptions, tc.expectedExecutionOptions) } } diff --git a/internal/storage/db_test.go b/internal/storage/db_test.go index 2f4c7db..61a9bf4 100644 --- a/internal/storage/db_test.go +++ b/internal/storage/db_test.go @@ -7,30 +7,30 @@ import ( "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/storage" - "github.com/eugenetriguba/checkmate" + "github.com/eugenetriguba/checkmate/assert" ) func TestDBConnectWithPostgres(t *testing.T) { cfg := bolttest.NewTestConnectionConfig(t, "postgres") conn, err := storage.DBConnect(cfg.Driver, storage.DBConnectionString(cfg)) - checkmate.AssertNil(t, err) + assert.Nil(t, err) defer conn.Close() _, err = conn.Exec("SELECT 1;") - checkmate.AssertNil(t, err) + assert.Nil(t, err) } func TestDBConnectMalformedConnectionString(t *testing.T) { _, err := storage.DBConnect("postgres", "pizza=123") - checkmate.AssertErrorContains(t, err, "connection refused") + assert.ErrorContains(t, err, "connection refused") } func TestDBConnectUnsupportedDriver(t *testing.T) { cfg := bolttest.NewTestConnectionConfig(t, "redis") _, err := storage.DBConnect(cfg.Driver, storage.DBConnectionString(cfg)) - checkmate.AssertErrorContains(t, err, `unknown driver "redis"`) + assert.ErrorContains(t, err, `unknown driver "redis"`) } func TestDBConnectionString(t *testing.T) { @@ -49,5 +49,5 @@ func TestDBConnectionString(t *testing.T) { "host=%s port=%d user=%s password=%s dbname=%s sslmode=disable", cfg.Host, cfg.Port, cfg.User, cfg.Password, cfg.DBName, ) - checkmate.AssertEqual(t, cs, expectedConnectionString) + assert.Equal(t, cs, expectedConnectionString) } -- cgit v1.2.3