Use require.NoError where appropriate (#39)

This commit is contained in:
Adrian Macneil 2018-04-15 20:47:24 -07:00 committed by GitHub
parent c5afa36962
commit 28ea62eef2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 160 additions and 163 deletions

View file

@ -13,7 +13,7 @@ import (
func sqliteTestURL(t *testing.T) *url.URL {
u, err := url.Parse("sqlite3:////tmp/dbmate.sqlite3")
require.Nil(t, err)
require.NoError(t, err)
return u
}
@ -24,15 +24,15 @@ func prepTestSQLiteDB(t *testing.T) *sql.DB {
// drop any existing database
err := drv.DropDatabase(u)
require.Nil(t, err)
require.NoError(t, err)
// create database
err = drv.CreateDatabase(u)
require.Nil(t, err)
require.NoError(t, err)
// connect database
db, err := drv.Open(u)
require.Nil(t, err)
require.NoError(t, err)
return db
}
@ -44,19 +44,19 @@ func TestSQLiteCreateDropDatabase(t *testing.T) {
// drop any existing database
err := drv.DropDatabase(u)
require.Nil(t, err)
require.NoError(t, err)
// create database
err = drv.CreateDatabase(u)
require.Nil(t, err)
require.NoError(t, err)
// check that database exists
_, err = os.Stat(path)
require.Nil(t, err)
require.NoError(t, err)
// drop the database
err = drv.DropDatabase(u)
require.Nil(t, err)
require.NoError(t, err)
// check that database no longer exists
_, err = os.Stat(path)
@ -72,17 +72,17 @@ func TestSQLiteDumpSchema(t *testing.T) {
db := prepTestSQLiteDB(t)
defer mustClose(db)
err := drv.CreateMigrationsTable(db)
require.Nil(t, err)
require.NoError(t, err)
// insert migration
err = drv.InsertMigration(db, "abc1")
require.Nil(t, err)
require.NoError(t, err)
err = drv.InsertMigration(db, "abc2")
require.Nil(t, err)
require.NoError(t, err)
// DumpSchema should return schema
schema, err := drv.DumpSchema(u, db)
require.Nil(t, err)
require.NoError(t, err)
require.Contains(t, string(schema), "CREATE TABLE schema_migrations")
require.Contains(t, string(schema), ");\n-- Dbmate schema migrations\n"+
"INSERT INTO schema_migrations (version) VALUES\n"+
@ -93,9 +93,8 @@ func TestSQLiteDumpSchema(t *testing.T) {
u.Path = "/."
schema, err = drv.DumpSchema(u, db)
require.Nil(t, schema)
require.NotNil(t, err)
require.Equal(t, "Error: unable to open database \".\": unable to open database file",
err.Error())
require.EqualError(t, err, "Error: unable to open database \".\": "+
"unable to open database file")
}
func TestSQLiteDatabaseExists(t *testing.T) {
@ -104,20 +103,20 @@ func TestSQLiteDatabaseExists(t *testing.T) {
// drop any existing database
err := drv.DropDatabase(u)
require.Nil(t, err)
require.NoError(t, err)
// DatabaseExists should return false
exists, err := drv.DatabaseExists(u)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, false, exists)
// create database
err = drv.CreateDatabase(u)
require.Nil(t, err)
require.NoError(t, err)
// DatabaseExists should return true
exists, err = drv.DatabaseExists(u)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, true, exists)
}
@ -133,15 +132,15 @@ func TestSQLiteCreateMigrationsTable(t *testing.T) {
// create table
err = drv.CreateMigrationsTable(db)
require.Nil(t, err)
require.NoError(t, err)
// migrations table should exist
err = db.QueryRow("select count(*) from schema_migrations").Scan(&count)
require.Nil(t, err)
require.NoError(t, err)
// create table should be idempotent
err = drv.CreateMigrationsTable(db)
require.Nil(t, err)
require.NoError(t, err)
}
func TestSQLiteSelectMigrations(t *testing.T) {
@ -150,21 +149,21 @@ func TestSQLiteSelectMigrations(t *testing.T) {
defer mustClose(db)
err := drv.CreateMigrationsTable(db)
require.Nil(t, err)
require.NoError(t, err)
_, err = db.Exec(`insert into schema_migrations (version)
values ('abc2'), ('abc1'), ('abc3')`)
require.Nil(t, err)
require.NoError(t, err)
migrations, err := drv.SelectMigrations(db, -1)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, true, migrations["abc1"])
require.Equal(t, true, migrations["abc2"])
require.Equal(t, true, migrations["abc2"])
// test limit param
migrations, err = drv.SelectMigrations(db, 1)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, true, migrations["abc3"])
require.Equal(t, false, migrations["abc1"])
require.Equal(t, false, migrations["abc2"])
@ -176,20 +175,20 @@ func TestSQLiteInsertMigration(t *testing.T) {
defer mustClose(db)
err := drv.CreateMigrationsTable(db)
require.Nil(t, err)
require.NoError(t, err)
count := 0
err = db.QueryRow("select count(*) from schema_migrations").Scan(&count)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, 0, count)
// insert migration
err = drv.InsertMigration(db, "abc1")
require.Nil(t, err)
require.NoError(t, err)
err = db.QueryRow("select count(*) from schema_migrations where version = 'abc1'").
Scan(&count)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, 1, count)
}
@ -199,18 +198,18 @@ func TestSQLiteDeleteMigration(t *testing.T) {
defer mustClose(db)
err := drv.CreateMigrationsTable(db)
require.Nil(t, err)
require.NoError(t, err)
_, err = db.Exec(`insert into schema_migrations (version)
values ('abc1'), ('abc2')`)
require.Nil(t, err)
require.NoError(t, err)
err = drv.DeleteMigration(db, "abc2")
require.Nil(t, err)
require.NoError(t, err)
count := 0
err = db.QueryRow("select count(*) from schema_migrations").Scan(&count)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, 1, count)
}
@ -221,26 +220,26 @@ func TestSQLitePing(t *testing.T) {
// drop any existing database
err := drv.DropDatabase(u)
require.Nil(t, err)
require.NoError(t, err)
// ping database
err = drv.Ping(u)
require.Nil(t, err)
require.NoError(t, err)
// check that the database was created (sqlite-only behavior)
_, err = os.Stat(path)
require.Nil(t, err)
require.NoError(t, err)
// drop the database
err = drv.DropDatabase(u)
require.Nil(t, err)
require.NoError(t, err)
// create directory where database file is expected
err = os.Mkdir(path, 0755)
require.Nil(t, err)
require.NoError(t, err)
defer func() {
err = os.RemoveAll(path)
require.Nil(t, err)
require.NoError(t, err)
}()
// ping database should fail