diff options
| author | Eugene Triguba <eugenetriguba@gmail.com> | 2024-01-28 16:29:00 -0500 |
|---|---|---|
| committer | Eugene Triguba <eugenetriguba@gmail.com> | 2024-01-28 16:29:00 -0500 |
| commit | 345e28bd44ba6a38bf7ee9bfe2066f333bbbe894 (patch) | |
| tree | 7c516c1b8c54cee94ce2afae516ea17c1e5864e4 /internal/repositories | |
| parent | Use checkmate for tests (diff) | |
| download | cli-345e28bd44ba6a38bf7ee9bfe2066f333bbbe894.zip | |
Update to checkmate v0.2.0
Diffstat (limited to 'internal/repositories')
| -rw-r--r-- | internal/repositories/migration_db_repo_test.go | 118 | ||||
| -rw-r--r-- | internal/repositories/migration_fs_repo_test.go | 40 |
2 files changed, 79 insertions, 79 deletions
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) } |