Skip to content

Commit ca31cf6

Browse files
erizocosmicoerizocosmico
authored
Merge pull request #16 from erizocosmico/tests/require
*: move tests to require
2 parents f4a41a1 + 087e171 commit ca31cf6

File tree

9 files changed

+102
-102
lines changed

9 files changed

+102
-102
lines changed

‎Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎blobs_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,41 @@ package gitquery
33
import (
44
"testing"
55

6+
"github.com/stretchr/testify/require"
67
"gopkg.in/src-d/go-mysql-server.v0/sql"
78

89
"gopkg.in/src-d/go-git-fixtures.v3"
9-
"github.com/stretchr/testify/assert"
1010
)
1111

1212
func TestBlobsTable_Name(t *testing.T) {
13-
assert := assert.New(t)
13+
require := require.New(t)
1414

1515
f := fixtures.Basic().One()
16-
table := getTable(assert, f, blobsTableName)
17-
assert.Equal(blobsTableName, table.Name())
16+
table := getTable(require, f, blobsTableName)
17+
require.Equal(blobsTableName, table.Name())
1818
}
1919

2020
func TestBlobsTable_Children(t *testing.T) {
21-
assert := assert.New(t)
21+
require := require.New(t)
2222

2323
f := fixtures.Basic().One()
24-
table := getTable(assert, f, blobsTableName)
25-
assert.Equal(0, len(table.Children()))
24+
table := getTable(require, f, blobsTableName)
25+
require.Equal(0, len(table.Children()))
2626
}
2727

2828
func TestBlobsTable_RowIter(t *testing.T) {
29-
assert := assert.New(t)
29+
require := require.New(t)
3030

3131
f := fixtures.Basic().One()
32-
table := getTable(assert, f, blobsTableName)
32+
table := getTable(require, f, blobsTableName)
3333

3434
rows, err := sql.NodeToRows(table)
35-
assert.Nil(err)
36-
assert.Len(rows, 10)
35+
require.Nil(err)
36+
require.Len(rows, 10)
3737

3838
schema := table.Schema()
3939
for idx, row := range rows {
4040
err := schema.CheckRow(row)
41-
assert.Nil(err, "row %d doesn't conform to schema", idx)
41+
require.Nil(err, "row %d doesn't conform to schema", idx)
4242
}
4343
}

‎commits_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,41 @@ package gitquery
33
import (
44
"testing"
55

6+
"github.com/stretchr/testify/require"
67
"gopkg.in/src-d/go-mysql-server.v0/sql"
78

8-
"github.com/stretchr/testify/assert"
99
"gopkg.in/src-d/go-git-fixtures.v3"
1010
)
1111

1212
func TestCommitsTable_Name(t *testing.T) {
13-
assert := assert.New(t)
13+
require := require.New(t)
1414

1515
f := fixtures.Basic().One()
16-
table := getTable(assert, f, commitsTableName)
17-
assert.Equal(commitsTableName, table.Name())
16+
table := getTable(require, f, commitsTableName)
17+
require.Equal(commitsTableName, table.Name())
1818
}
1919

2020
func TestCommitsTable_Children(t *testing.T) {
21-
assert := assert.New(t)
21+
require := require.New(t)
2222

2323
f := fixtures.Basic().One()
24-
table := getTable(assert, f, commitsTableName)
25-
assert.Equal(0, len(table.Children()))
24+
table := getTable(require, f, commitsTableName)
25+
require.Equal(0, len(table.Children()))
2626
}
2727

2828
func TestCommitsTable_RowIter(t *testing.T) {
29-
assert := assert.New(t)
29+
require := require.New(t)
3030

3131
f := fixtures.Basic().One()
32-
table := getTable(assert, f, commitsTableName)
32+
table := getTable(require, f, commitsTableName)
3333

3434
rows, err := sql.NodeToRows(table)
35-
assert.Nil(err)
36-
assert.Len(rows, 9)
35+
require.Nil(err)
36+
require.Len(rows, 9)
3737

3838
schema := table.Schema()
3939
for idx, row := range rows {
4040
err := schema.CheckRow(row)
41-
assert.Nil(err, "row %d doesn't conform to schema", idx)
41+
require.Nil(err, "row %d doesn't conform to schema", idx)
4242
}
4343
}

‎database_test.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"sort"
55
"testing"
66

7+
"github.com/stretchr/testify/require"
78
"gopkg.in/src-d/go-mysql-server.v0/sql"
89

9-
"github.com/stretchr/testify/assert"
1010
"gopkg.in/src-d/go-billy.v4/memfs"
1111
"gopkg.in/src-d/go-git-fixtures.v3"
1212
"gopkg.in/src-d/go-git.v4"
@@ -22,10 +22,10 @@ const (
2222
)
2323

2424
func TestDatabase_Tables(t *testing.T) {
25-
assert := assert.New(t)
25+
require := require.New(t)
2626

2727
f := fixtures.Basic().One()
28-
db := getDB(assert, f, testDBName)
28+
db := getDB(require, f, testDBName)
2929

3030
tables := db.Tables()
3131
var tableNames []string
@@ -44,43 +44,43 @@ func TestDatabase_Tables(t *testing.T) {
4444
}
4545
sort.Strings(expected)
4646

47-
assert.Equal(expected, tableNames)
47+
require.Equal(expected, tableNames)
4848
}
4949

5050
func TestDatabase_Name(t *testing.T) {
51-
assert := assert.New(t)
51+
require := require.New(t)
5252

5353
f := fixtures.Basic().One()
54-
db := getDB(assert, f, testDBName)
55-
assert.Equal(testDBName, db.Name())
54+
db := getDB(require, f, testDBName)
55+
require.Equal(testDBName, db.Name())
5656
}
5757

58-
func getDB(assert *assert.Assertions, fixture *fixtures.Fixture,
58+
func getDB(require *require.Assertions, fixture *fixtures.Fixture,
5959
name string) sql.Database {
6060

6161
s, err := filesystem.NewStorage(fixture.DotGit())
62-
assert.NoError(err)
62+
require.NoError(err)
6363

6464
r, err := git.Open(s, memfs.New())
65-
assert.NoError(err)
65+
require.NoError(err)
6666

6767
db := NewDatabase(name, r)
68-
assert.NotNil(db)
68+
require.NotNil(db)
6969

7070
return db
7171
}
7272

73-
func getTable(assert *assert.Assertions, fixture *fixtures.Fixture,
73+
func getTable(require *require.Assertions, fixture *fixtures.Fixture,
7474
name string) sql.Table {
7575

76-
db := getDB(assert, fixture, "foo")
77-
assert.NotNil(db)
78-
assert.Equal(db.Name(), "foo")
76+
db := getDB(require, fixture, "foo")
77+
require.NotNil(db)
78+
require.Equal(db.Name(), "foo")
7979

8080
tables := db.Tables()
8181
table, ok := tables[name]
82-
assert.True(ok, "table %s does not exist", table)
83-
assert.NotNil(table)
82+
require.True(ok, "table %s does not exist", table)
83+
require.NotNil(table)
8484

8585
return table
8686
}

‎internal/format/common_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,39 @@ import (
44
"bytes"
55
"testing"
66

7-
"github.com/stretchr/testify/assert"
7+
"github.com/stretchr/testify/require"
88
)
99

1010
func TestNewFormat_InvalidId(t *testing.T) {
11-
assert := assert.New(t)
11+
require := require.New(t)
1212

1313
f, err := NewFormat("INVALID", bytes.NewBuffer(nil))
14-
assert.Nil(f)
15-
assert.NotNil(err)
14+
require.Nil(f)
15+
require.NotNil(err)
1616
}
1717

1818
func testNewFormat(id string, t *testing.T) {
19-
assert := assert.New(t)
19+
require := require.New(t)
2020

2121
w := bytes.NewBuffer(nil)
2222
f, err := NewFormat(id, w)
23-
assert.Nil(err)
24-
assert.NotNil(f)
23+
require.Nil(err)
24+
require.NotNil(f)
2525
}
2626

2727
func testFormat(fs *formatSpec, writer *bytes.Buffer, t *testing.T) {
28-
assert := assert.New(t)
28+
require := require.New(t)
2929

3030
err := fs.Format.WriteHeader(fs.Headers)
31-
assert.Nil(err)
31+
require.Nil(err)
3232
for _, l := range fs.Lines {
3333
err := fs.Format.Write(l)
34-
assert.Nil(err)
34+
require.Nil(err)
3535
}
3636
err = fs.Format.Close()
37-
assert.Nil(err)
37+
require.Nil(err)
3838

39-
assert.Equal(fs.Result, writer.String())
39+
require.Equal(fs.Result, writer.String())
4040

4141
writer.Reset()
4242
}

‎objects_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,41 @@ package gitquery
33
import (
44
"testing"
55

6+
"github.com/stretchr/testify/require"
67
"gopkg.in/src-d/go-mysql-server.v0/sql"
78

8-
"github.com/stretchr/testify/assert"
99
"gopkg.in/src-d/go-git-fixtures.v3"
1010
)
1111

1212
func TestObjectsTable_Name(t *testing.T) {
13-
assert := assert.New(t)
13+
require := require.New(t)
1414

1515
f := fixtures.Basic().One()
16-
table := getTable(assert, f, objectsTableName)
17-
assert.Equal(objectsTableName, table.Name())
16+
table := getTable(require, f, objectsTableName)
17+
require.Equal(objectsTableName, table.Name())
1818
}
1919

2020
func TestObjectsTable_Children(t *testing.T) {
21-
assert := assert.New(t)
21+
require := require.New(t)
2222

2323
f := fixtures.Basic().One()
24-
table := getTable(assert, f, objectsTableName)
25-
assert.Equal(0, len(table.Children()))
24+
table := getTable(require, f, objectsTableName)
25+
require.Equal(0, len(table.Children()))
2626
}
2727

2828
func TestObjectsTable_RowIter(t *testing.T) {
29-
assert := assert.New(t)
29+
require := require.New(t)
3030

3131
f := fixtures.Basic().One()
32-
table := getTable(assert, f, objectsTableName)
32+
table := getTable(require, f, objectsTableName)
3333

3434
rows, err := sql.NodeToRows(table)
35-
assert.Nil(err)
36-
assert.Len(rows, 31)
35+
require.Nil(err)
36+
require.Len(rows, 31)
3737

3838
schema := table.Schema()
3939
for idx, row := range rows {
4040
err := schema.CheckRow(row)
41-
assert.Nil(err, "row %d doesn't conform to schema", idx)
41+
require.Nil(err, "row %d doesn't conform to schema", idx)
4242
}
4343
}

‎references_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,40 @@ package gitquery
33
import (
44
"testing"
55

6+
"github.com/stretchr/testify/require"
67
"gopkg.in/src-d/go-mysql-server.v0/sql"
78
"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
89
"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
910

10-
"github.com/stretchr/testify/assert"
1111
"gopkg.in/src-d/go-git-fixtures.v3"
1212
)
1313

1414
func TestReferencesTable_Name(t *testing.T) {
15-
assert := assert.New(t)
15+
require := require.New(t)
1616

1717
f := fixtures.Basic().One()
18-
table := getTable(assert, f, referencesTableName)
19-
assert.Equal(referencesTableName, table.Name())
18+
table := getTable(require, f, referencesTableName)
19+
require.Equal(referencesTableName, table.Name())
2020
}
2121

2222
func TestReferencesTable_Children(t *testing.T) {
23-
assert := assert.New(t)
23+
require := require.New(t)
2424

2525
f := fixtures.Basic().One()
26-
table := getTable(assert, f, referencesTableName)
27-
assert.Equal(0, len(table.Children()))
26+
table := getTable(require, f, referencesTableName)
27+
require.Equal(0, len(table.Children()))
2828
}
2929

3030
func TestReferencesTable_RowIter(t *testing.T) {
31-
assert := assert.New(t)
31+
require := require.New(t)
3232

3333
f := fixtures.Basic().One()
34-
table := getTable(assert, f, referencesTableName)
34+
table := getTable(require, f, referencesTableName)
3535

3636
rows, err := sql.NodeToRows(plan.NewSort(
3737
[]plan.SortField{{Column: expression.NewGetField(0, sql.Text, "name", false), Order: plan.Ascending}},
3838
table))
39-
assert.Nil(err)
39+
require.Nil(err)
4040

4141
expected := []sql.Row{
4242
sql.NewRow("HEAD", "symbolic-reference", nil, "refs/heads/master", false, false, false, false),
@@ -47,11 +47,11 @@ func TestReferencesTable_RowIter(t *testing.T) {
4747
sql.NewRow("refs/remotes/origin/master", "hash-reference", "6ecf0ef2c2dffb796033e5a02219af86ec6584e5", nil, false, false, true, false),
4848
sql.NewRow("refs/tags/v1.0.0", "hash-reference", "6ecf0ef2c2dffb796033e5a02219af86ec6584e5", nil, false, false, false, true),
4949
}
50-
assert.Equal(expected, rows)
50+
require.Equal(expected, rows)
5151

5252
schema := table.Schema()
5353
for idx, row := range rows {
5454
err := schema.CheckRow(row)
55-
assert.Nil(err, "row %d doesn't conform to schema", idx)
55+
require.Nil(err, "row %d doesn't conform to schema", idx)
5656
}
5757
}

0 commit comments

Comments
 (0)