Skip to content

Commit e91e317

Browse files
author
Lann Martin
committed
Use assert in tests
1 parent e25457a commit e91e317

8 files changed

+74
-138
lines changed

‎.travis.yml

+4
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ go:
44
- 1.1
55
- 1.2
66
- tip
7+
8+
install:
9+
- go get
10+
- go get github.com/stretchr/testify/assert

‎placeholder_test.go

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package squirrel
22

3-
import "testing"
3+
import (
4+
"testing"
5+
6+
"github.com/stretchr/testify/assert"
7+
)
48

59
func TestQuestion(t *testing.T) {
610
sql := "x = ? AND y = ?"
711
s, _ := Question.ReplacePlaceholders(sql)
8-
if s != sql {
9-
t.Errorf("expected %v, got %v", sql, s)
10-
}
12+
assert.Equal(t, sql, s)
1113
}
1214

1315
func TestDollar(t *testing.T) {
1416
sql := "x = ? AND y = ?"
1517
s, _ := Dollar.ReplacePlaceholders(sql)
16-
expect := "x = $1 AND y = $2"
17-
if s != expect {
18-
t.Errorf("expected %v, got %v", expect, s)
19-
}
18+
assert.Equal(t, "x = $1 AND y = $2", s)
2019
}

‎row_test.go

+6-12
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package squirrel
33
import (
44
"fmt"
55
"testing"
6+
7+
"github.com/stretchr/testify/assert"
68
)
79

810
type RowStub struct {
@@ -18,23 +20,15 @@ func TestRowScan(t *testing.T) {
1820
stub := &RowStub{}
1921
row := &Row{RowScanner: stub}
2022
err := row.Scan()
21-
if !stub.Scanned {
22-
t.Error("row was not scanned")
23-
}
24-
if err != nil {
25-
t.Errorf("expected no error, got %s", err)
26-
}
23+
assert.True(t, stub.Scanned, "row was not scanned")
24+
assert.NoError(t, err)
2725
}
2826

2927
func TestRowScanErr(t *testing.T) {
3028
stub := &RowStub{}
3129
rowErr := fmt.Errorf("scan err")
3230
row := &Row{RowScanner: stub, err: rowErr}
3331
err := row.Scan()
34-
if stub.Scanned {
35-
t.Error("row was scanned")
36-
}
37-
if err != rowErr {
38-
t.Errorf("expected %v, got %v", rowErr, err)
39-
}
32+
assert.False(t, stub.Scanned, "row was scanned")
33+
assert.Equal(t, rowErr, err)
4034
}

‎select_test.go

+15-45
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package squirrel
22

33
import (
4-
"reflect"
54
"testing"
5+
6+
"github.com/stretchr/testify/assert"
67
)
78

89
func TestSelectBuilderToSql(t *testing.T) {
@@ -21,45 +22,31 @@ func TestSelectBuilderToSql(t *testing.T) {
2122
Offset(8)
2223

2324
sql, args, err := b.ToSql()
24-
if err != nil {
25-
t.Fatalf("expected no error, got %v", err)
26-
}
25+
assert.NoError(t, err)
2726

2827
expectedSql :=
2928
"SELECT DISTINCT a, b, c FROM d " +
3029
"WHERE e = ? AND f = ? AND g = ? AND h IN (?,?,?) " +
3130
"GROUP BY i HAVING j = k ORDER BY l LIMIT 7 OFFSET 8"
32-
if sql != expectedSql {
33-
t.Errorf("expected %v, got %v", expectedSql, sql)
34-
}
31+
assert.Equal(t, expectedSql, sql)
3532

3633
expectedArgs := []interface{}{1, 2, 3, 4, 5, 6}
37-
if !reflect.DeepEqual(args, expectedArgs) {
38-
t.Errorf("expected %v, got %v", expectedArgs, args)
39-
}
34+
assert.Equal(t, expectedArgs, args)
4035
}
4136

4237
func TestSelectBuilderToSqlErr(t *testing.T) {
4338
_, _, err := Select().From("x").ToSql()
44-
if err == nil {
45-
t.Error("expected error, got none")
46-
}
39+
assert.Error(t, err)
4740
}
4841

4942
func TestSelectBuilderPlaceholders(t *testing.T) {
5043
b := Select("test").Where("x = ? AND y = ?")
5144

5245
sql, _, _ := b.PlaceholderFormat(Question).ToSql()
53-
expect := "SELECT test WHERE x = ? AND y = ?"
54-
if sql != expect {
55-
t.Errorf("expected %v, got %v", expect, sql)
56-
}
46+
assert.Equal(t, "SELECT test WHERE x = ? AND y = ?", sql)
5747

5848
sql, _, _ = b.PlaceholderFormat(Dollar).ToSql()
59-
expect = "SELECT test WHERE x = $1 AND y = $2"
60-
if sql != expect {
61-
t.Errorf("expected %v, got %v", expect, sql)
62-
}
49+
assert.Equal(t, "SELECT test WHERE x = $1 AND y = $2", sql)
6350
}
6451

6552
func TestSelectBuilderRunners(t *testing.T) {
@@ -69,44 +56,27 @@ func TestSelectBuilderRunners(t *testing.T) {
6956
expectedSql := "SELECT test"
7057

7158
b.Exec()
72-
sql := db.LastExecSql
73-
if sql != sqlStr {
74-
t.Errorf("expected %v, got %v", expectedSql, sql)
75-
}
59+
assert.Equal(t, expectedSql, db.LastExecSql)
7660

7761
b.Query()
78-
sql = db.LastQuerySql
79-
if sql != sqlStr {
80-
t.Errorf("expected %v, got %v", expectedSql, sql)
81-
}
62+
assert.Equal(t, expectedSql, db.LastQuerySql)
8263

8364
b.QueryRow()
84-
sql = db.LastQueryRowSql
85-
if sql != sqlStr {
86-
t.Errorf("expected %v, got %v", expectedSql, sql)
87-
}
65+
assert.Equal(t, expectedSql, db.LastQueryRowSql)
8866

8967
err := b.Scan()
90-
if err != nil {
91-
t.Errorf("expected no error, got %v", err)
92-
}
68+
assert.NoError(t, err)
9369
}
9470

9571
func TestSelectBuilderNoRunner(t *testing.T) {
9672
b := Select("test")
9773

9874
_, err := b.Exec()
99-
if err != RunnerNotSet {
100-
t.Errorf("expected error %v, got %v", RunnerNotSet, err)
101-
}
75+
assert.Equal(t, RunnerNotSet, err)
10276

10377
_, err = b.Query()
104-
if err != RunnerNotSet {
105-
t.Errorf("expected error %v, got %v", RunnerNotSet, err)
106-
}
78+
assert.Equal(t, RunnerNotSet, err)
10779

10880
err = b.Scan()
109-
if err != RunnerNotSet {
110-
t.Errorf("expected error %v, got %v", RunnerNotSet, err)
111-
}
81+
assert.Equal(t, RunnerNotSet, err)
11282
}

‎squirrel_test.go

+9-19
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import (
44
"database/sql"
55
"fmt"
66
"testing"
7+
8+
"github.com/stretchr/testify/assert"
79
)
810

911
type DBStub struct {
@@ -54,43 +56,31 @@ var sqlStr = "SELECT test"
5456
func TestExecWith(t *testing.T) {
5557
db := &DBStub{}
5658
ExecWith(db, sqlizer)
57-
if db.LastExecSql != sqlStr {
58-
t.Errorf("expected %v, got %v", sqlStr, db.LastExecSql)
59-
}
59+
assert.Equal(t, sqlStr, db.LastExecSql)
6060
}
6161

6262
func TestQueryWith(t *testing.T) {
6363
db := &DBStub{}
6464
QueryWith(db, sqlizer)
65-
if db.LastQuerySql != sqlStr {
66-
t.Errorf("expected %v, got %v", sqlStr, db.LastQuerySql)
67-
}
65+
assert.Equal(t, sqlStr, db.LastQuerySql)
6866
}
6967

7068
func TestQueryRowWith(t *testing.T) {
7169
db := &DBStub{}
7270
QueryRowWith(db, sqlizer)
73-
if db.LastQueryRowSql != sqlStr {
74-
t.Errorf("expected %v, got %v", sqlStr, db.LastQueryRowSql)
75-
}
71+
assert.Equal(t, sqlStr, db.LastQueryRowSql)
7672
}
7773

7874
func TestWithToSqlErr(t *testing.T) {
7975
db := &DBStub{}
80-
sqlizer := Select()
76+
sqlizer := Select("test")
8177

8278
_, err := ExecWith(db, sqlizer)
83-
if err == nil {
84-
t.Error("expected error, got none")
85-
}
79+
assert.NoError(t, err)
8680

8781
_, err = QueryWith(db, sqlizer)
88-
if err == nil {
89-
t.Error("expected error, got none")
90-
}
82+
assert.NoError(t, err)
9183

9284
err = QueryRowWith(db, sqlizer).Scan()
93-
if err == nil {
94-
t.Error("expected error, got none")
95-
}
85+
assert.NoError(t, err)
9686
}

‎statement_test.go

+15-11
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
11
package squirrel
22

3-
import "testing"
3+
import (
4+
"testing"
5+
6+
"github.com/stretchr/testify/assert"
7+
)
48

59
func TestSelect(t *testing.T) {
610
sql, _, _ := Select("test").ToSql()
7-
expectedSql := "SELECT test"
8-
if sql != sqlStr {
9-
t.Errorf("expected %v, got %v", expectedSql, sql)
10-
}
11+
assert.Equal(t, "SELECT test", sql)
1112
}
1213

1314
func TestStatementBuilder(t *testing.T) {
1415
db := &DBStub{}
1516
sb := StatementBuilder.RunWith(db)
1617

17-
expectedSql := "SELECT test"
18-
1918
sb.Select("test").Exec()
20-
sql := db.LastExecSql
21-
if sql != sqlStr {
22-
t.Errorf("expected %v, got %v", expectedSql, sql)
23-
}
19+
assert.Equal(t, "SELECT test", db.LastExecSql)
20+
}
21+
22+
func TestStatementBuilderPlaceholderFormat(t *testing.T) {
23+
db := &DBStub{}
24+
sb := StatementBuilder.RunWith(db).PlaceholderFormat(Dollar)
25+
26+
sb.Select("test").Where("x = ?").Exec()
27+
assert.Equal(t, "SELECT test WHERE x = $1", db.LastExecSql)
2428
}

‎stmtcacher_test.go

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package squirrel
22

3-
import "testing"
3+
import (
4+
"testing"
5+
6+
"github.com/stretchr/testify/assert"
7+
)
48

59
func TestStmtCacherPrepare(t *testing.T) {
610
db := &DBStub{}
711
sc := NewStmtCacher(db)
812
query := "SELECT 1"
913

1014
sc.Prepare(query)
11-
lastSql := db.LastPrepareSql
12-
if lastSql != query {
13-
t.Errorf("expected %v, got %v", query, lastSql)
14-
}
15+
assert.Equal(t, query, db.LastPrepareSql)
1516

1617
sc.Prepare(query)
17-
if db.PrepareCount != 1 {
18-
t.Errorf("expected 1 Prepare, got %d", db.PrepareCount)
19-
}
18+
assert.Equal(t, 1, db.PrepareCount, "expected 1 Prepare, got %d", db.PrepareCount)
2019
}

0 commit comments

Comments
 (0)