Use require.NoError instead of Nil to check errors

Signed-off-by: Javi Fontan <[email protected]>

Author: jfontan

blobs_test.go

@@ -39,13 +39,13 @@ func TestBlobsTable_RowIter(t *testing.T) {
 	table := getTable(require, f, blobsTableName)
 
 	rows, err := sql.NodeToRows(sql.NewBaseSession(context.TODO()), table)
-	require.Nil(err)
+	require.NoError(err)
 	require.Len(rows, 10)
 
 	schema := table.Schema()
 	for idx, row := range rows {
 		err := schema.CheckRow(row)
-		require.Nil(err, "row %d doesn't conform to schema", idx)
+		require.NoError(err, "row %d doesn't conform to schema", idx)
 	}
 }
 

references_test.go

@@ -42,7 +42,7 @@ func TestReferencesTable_RowIter(t *testing.T) {
 	rows, err := sql.NodeToRows(sql.NewBaseSession(context.TODO()), plan.NewSort(
 		[]plan.SortField{{Column: expression.NewGetField(0, sql.Text, "name", false), Order: plan.Ascending}},
 		table))
-	require.Nil(err)
+	require.NoError(err)
 
 	expected := []sql.Row{
 		sql.NewRow("repo", "HEAD", "6ecf0ef2c2dffb796033e5a02219af86ec6584e5"),
@@ -55,7 +55,7 @@ func TestReferencesTable_RowIter(t *testing.T) {
 	schema := table.Schema()
 	for idx, row := range rows {
 		err := schema.CheckRow(row)
-		require.Nil(err, "row %d doesn't conform to schema", idx)
+		require.NoError(err, "row %d doesn't conform to schema", idx)
 	}
 }
 

remotes_test.go

@@ -45,7 +45,7 @@ func TestRemotesTable_RowIter(t *testing.T) {
 
 	pool := remotes.pool
 	repository, err := pool.GetPos(0)
-	require.Nil(err)
+	require.NoError(err)
 
 	repo := repository.Repo
 
@@ -59,16 +59,16 @@ func TestRemotesTable_RowIter(t *testing.T) {
 	}
 
 	_, err = repo.CreateRemote(&config)
-	require.Nil(err)
+	require.NoError(err)
 
 	rows, err := sql.NodeToRows(sql.NewBaseSession(context.TODO()), table)
-	require.Nil(err)
+	require.NoError(err)
 	require.Len(rows, 3)
 
 	schema := table.Schema()
 	for idx, row := range rows {
 		err := schema.CheckRow(row)
-		require.Nil(err, "row %d doesn't conform to schema", idx)
+		require.NoError(err, "row %d doesn't conform to schema", idx)
 
 		if row[1] == "my_remote" {
 			urlstring, ok := row[2].(string)

repositories_test.go

@@ -56,7 +56,7 @@ func TestRepositoriesTable_RowIter(t *testing.T) {
 	require.NotNil(table)
 
 	rows, err := sql.NodeToRows(sql.NewBaseSession(context.TODO()), table)
-	require.Nil(err)
+	require.NoError(err)
 	require.Len(rows, len(repoIDs))
 
 	idArray := make([]string, len(repoIDs))
@@ -68,7 +68,7 @@ func TestRepositoriesTable_RowIter(t *testing.T) {
 	schema := table.Schema()
 	for idx, row := range rows {
 		err := schema.CheckRow(row)
-		require.Nil(err, "row %d doesn't conform to schema", idx)
+		require.NoError(err, "row %d doesn't conform to schema", idx)
 	}
 }
 

repository_pool_test.go

@@ -46,7 +46,7 @@ func TestRepositoryPoolBasic(t *testing.T) {
 
 	pool.Add("0", "/directory/should/not/exist")
 	repo, err = pool.GetPos(0)
-	require.NotNil(err)
+	require.Error(err)
 
 	_, err = pool.GetPos(1)
 	require.Equal(io.EOF, err)
@@ -55,7 +55,7 @@ func TestRepositoryPoolBasic(t *testing.T) {
 
 	pool.Add("1", path)
 	repo, err = pool.GetPos(1)
-	require.Nil(err)
+	require.NoError(err)
 	require.Equal("1", repo.ID)
 	require.NotNil(repo.Repo)
 
@@ -74,15 +74,15 @@ func TestRepositoryPoolGit(t *testing.T) {
 	pool := NewRepositoryPool()
 	id, err := pool.AddGit(path)
 	require.Equal(dirName, id)
-	require.Nil(err)
+	require.NoError(err)
 
 	repo, err := pool.GetPos(0)
 	require.Equal(dirName, repo.ID)
 	require.NotNil(repo.Repo)
-	require.Nil(err)
+	require.NoError(err)
 
 	iter, err := repo.Repo.CommitObjects()
-	require.Nil(err)
+	require.NoError(err)
 
 	count := 0
 
@@ -110,7 +110,7 @@ func TestRepositoryPoolIterator(t *testing.T) {
 	pool.Add("1", path)
 
 	iter, err := pool.RepoIter()
-	require.Nil(err)
+	require.NoError(err)
 
 	count := 0
 
@@ -162,7 +162,7 @@ func testRepoIter(num int, require *require.Assertions, pool *RepositoryPool) {
 	cIter := &testCommitIter{}
 
 	repoIter, err := NewRowRepoIter(pool, cIter)
-	require.Nil(err)
+	require.NoError(err)
 
 	count := 0
 	for {
@@ -214,7 +214,7 @@ func TestRepositoryPoolAddDir(t *testing.T) {
 	require := require.New(t)
 
 	tmpDir, err := ioutil.TempDir("", "gitquery-test")
-	require.Nil(err)
+	require.NoError(err)
 
 	max := 64
 
@@ -223,12 +223,12 @@ func TestRepositoryPoolAddDir(t *testing.T) {
 		p := filepath.Join(tmpDir, strconv.Itoa(i))
 
 		err := os.Rename(orig, p)
-		require.Nil(err)
+		require.NoError(err)
 	}
 
 	pool := NewRepositoryPool()
 	err = pool.AddDir(tmpDir)
-	require.Nil(err)
+	require.NoError(err)
 
 	require.Equal(max, len(pool.repositories))
 
@@ -237,12 +237,12 @@ func TestRepositoryPoolAddDir(t *testing.T) {
 
 	for i := 0; i < max; i++ {
 		repo, err := pool.GetPos(i)
-		require.Nil(err)
+		require.NoError(err)
 		arrayID[i] = repo.ID
 		arrayExpected[i] = strconv.Itoa(i)
 
 		iter, err := repo.Repo.CommitObjects()
-		require.Nil(err)
+		require.NoError(err)
 
 		counter := 0
 		for {
@@ -251,7 +251,7 @@ func TestRepositoryPoolAddDir(t *testing.T) {
 				break
 			}
 
-			require.Nil(err)
+			require.NoError(err)
 			require.NotNil(commit)
 			counter++
 		}

tree_entries_test.go

@@ -39,13 +39,13 @@ func TestTreeEntriesTable_RowIter(t *testing.T) {
 	table := getTable(require, f, treeEntriesTableName)
 
 	rows, err := sql.NodeToRows(sql.NewBaseSession(context.TODO()), table)
-	require.Nil(err)
+	require.NoError(err)
 	require.Len(rows, 49)
 
 	schema := table.Schema()
 	for idx, row := range rows {
 		err := schema.CheckRow(row)
-		require.Nil(err, "row %d doesn't conform to schema", idx)
+		require.NoError(err, "row %d doesn't conform to schema", idx)
 	}
 }