Skip to content

Commit 75c6ea0

Browse files
rogpepperogpeppe
committed
use quicktest
1 parent 2393dcb commit 75c6ea0

File tree

3 files changed

+50
-46
lines changed

3 files changed

+50
-46
lines changed

Diff for: ‎errors_test.go

+44-40
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"strings"
1111
"testing"
1212

13-
gc "gopkg.in/check.v1"
13+
qt "github.com/frankban/quicktest"
1414

1515
"gopkg.in/errgo.v1"
1616
)
@@ -21,20 +21,14 @@ var (
2121
_ errgo.Causer = (*errgo.Err)(nil)
2222
)
2323

24-
func Test(t *testing.T) {
25-
gc.TestingT(t)
26-
}
27-
28-
type errorsSuite struct{}
29-
30-
var _ = gc.Suite(&errorsSuite{})
31-
32-
func (*errorsSuite) TestNew(c *gc.C) {
24+
func TestNew(t *testing.T) {
25+
c := qt.New(t)
3326
err := errgo.New("foo") //err TestNew
3427
checkErr(c, err, nil, "foo", "[{$TestNew$: foo}]", err)
3528
}
3629

37-
func (*errorsSuite) TestNewf(c *gc.C) {
30+
func TestNewf(t *testing.T) {
31+
c := qt.New(t)
3832
err := errgo.Newf("foo %d", 5) //err TestNewf
3933
checkErr(c, err, nil, "foo 5", "[{$TestNewf$: foo 5}]", err)
4034
}
@@ -52,10 +46,11 @@ func annotate2() error {
5246
return err
5347
}
5448

55-
func (*errorsSuite) TestNoteUsage(c *gc.C) {
49+
func TestNoteUsage(t *testing.T) {
50+
c := qt.New(t)
5651
err0 := annotate2()
5752
err, ok := err0.(errgo.Wrapper)
58-
c.Assert(ok, gc.Equals, true)
53+
c.Assert(ok, qt.Equals, true)
5954
underlying := err.Underlying()
6055
checkErr(
6156
c, err0, underlying,
@@ -64,16 +59,18 @@ func (*errorsSuite) TestNoteUsage(c *gc.C) {
6459
err0)
6560
}
6661

67-
func (*errorsSuite) TestMask(c *gc.C) {
62+
func TestMask(t *testing.T) {
63+
c := qt.New(t)
6864
err0 := errgo.WithCausef(nil, someErr, "foo") //err TestMask#0
6965
err := errgo.Mask(err0) //err TestMask#1
7066
checkErr(c, err, err0, "foo", "[{$TestMask#1$: } {$TestMask#0$: foo}]", err)
7167

7268
err = errgo.Mask(nil)
73-
c.Assert(err, gc.IsNil)
69+
c.Assert(err, qt.IsNil)
7470
}
7571

76-
func (*errorsSuite) TestNotef(c *gc.C) {
72+
func TestNotef(t *testing.T) {
73+
c := qt.New(t)
7774
err0 := errgo.WithCausef(nil, someErr, "foo") //err TestNotef#0
7875
err := errgo.Notef(err0, "bar") //err TestNotef#1
7976
checkErr(c, err, err0, "bar: foo", "[{$TestNotef#1$: bar} {$TestNotef#0$: foo}]", err)
@@ -82,7 +79,8 @@ func (*errorsSuite) TestNotef(c *gc.C) {
8279
checkErr(c, err, nil, "bar", "[{$TestNotef#2$: bar}]", err)
8380
}
8481

85-
func (*errorsSuite) TestNoteMask(c *gc.C) {
82+
func TestNoteMask(t *testing.T) {
83+
c := qt.New(t)
8684
err0 := errgo.WithCausef(nil, someErr, "foo") //err TestNoteMask#0
8785
err := errgo.NoteMask(err0, "bar") //err TestNoteMask#1
8886
checkErr(c, err, err0, "bar: foo", "[{$TestNoteMask#1$: bar} {$TestNoteMask#0$: foo}]", err)
@@ -94,7 +92,8 @@ func (*errorsSuite) TestNoteMask(c *gc.C) {
9492
checkErr(c, err, err0, "foo", "[{$TestNoteMask#3$: } {$TestNoteMask#0$: foo}]", err)
9593
}
9694

97-
func (*errorsSuite) TestMaskFunc(c *gc.C) {
95+
func TestMaskFunc(t *testing.T) {
96+
c := qt.New(t)
9897
err0 := errgo.New("zero")
9998
err1 := errgo.New("one")
10099

@@ -152,45 +151,49 @@ func (*errorsSuite) TestMaskFunc(c *gc.C) {
152151
if wantCause == nil {
153152
wantCause = err
154153
}
155-
c.Check(cause, gc.Equals, wantCause)
154+
c.Check(cause, qt.Equals, wantCause)
156155
}
157156
}
158157

159158
type embed struct {
160159
*errgo.Err
161160
}
162161

163-
func (*errorsSuite) TestCause(c *gc.C) {
164-
c.Assert(errgo.Cause(someErr), gc.Equals, someErr)
162+
func TestCause(t *testing.T) {
163+
c := qt.New(t)
164+
c.Assert(errgo.Cause(someErr), qt.Equals, someErr)
165165

166166
causeErr := errgo.New("cause error")
167167
underlyingErr := errgo.New("underlying error") //err TestCause#1
168168
err := errgo.WithCausef(underlyingErr, causeErr, "foo %d", 99) //err TestCause#2
169-
c.Assert(errgo.Cause(err), gc.Equals, causeErr)
169+
c.Assert(errgo.Cause(err), qt.Equals, causeErr)
170170

171171
checkErr(c, err, underlyingErr, "foo 99: underlying error", "[{$TestCause#2$: foo 99} {$TestCause#1$: underlying error}]", causeErr)
172172

173173
err = &embed{err.(*errgo.Err)}
174-
c.Assert(errgo.Cause(err), gc.Equals, causeErr)
174+
c.Assert(errgo.Cause(err), qt.Equals, causeErr)
175175
}
176176

177-
func (*errorsSuite) TestWithCausefNoMessage(c *gc.C) {
177+
func TestWithCausefNoMessage(t *testing.T) {
178+
c := qt.New(t)
178179
cause := errgo.New("cause")
179180
err := errgo.WithCausef(nil, cause, "")
180-
c.Assert(err, gc.ErrorMatches, "cause")
181-
c.Assert(errgo.Cause(err), gc.Equals, cause)
181+
c.Assert(err, qt.ErrorMatches, "cause")
182+
c.Assert(errgo.Cause(err), qt.Equals, cause)
182183
}
183184

184-
func (*errorsSuite) TestWithCausefWithUnderlyingButNoMessage(c *gc.C) {
185+
func TestWithCausefWithUnderlyingButNoMessage(t *testing.T) {
186+
c := qt.New(t)
185187
err := errgo.New("something")
186188
cause := errgo.New("cause")
187189
err = errgo.WithCausef(err, cause, "")
188-
c.Assert(err, gc.ErrorMatches, "something")
189-
c.Assert(errgo.Cause(err), gc.Equals, cause)
190+
c.Assert(err, qt.ErrorMatches, "something")
191+
c.Assert(errgo.Cause(err), qt.Equals, cause)
190192
}
191193

192-
func (*errorsSuite) TestDetails(c *gc.C) {
193-
c.Assert(errgo.Details(nil), gc.Equals, "[]")
194+
func TestDetails(t *testing.T) {
195+
c := qt.New(t)
196+
c.Assert(errgo.Details(nil), qt.Equals, "[]")
194197

195198
otherErr := fmt.Errorf("other")
196199
checkErr(c, otherErr, nil, "other", "[{other}]", otherErr)
@@ -205,7 +208,8 @@ func (*errorsSuite) TestDetails(c *gc.C) {
205208
checkErr(c, err2, err1, "bar: foo", "[{$TestStack#2$: } {$TestStack#1$: bar} {$TestStack#0$: foo}]", err2)
206209
}
207210

208-
func (*errorsSuite) TestMatch(c *gc.C) {
211+
func TestMatch(t *testing.T) {
212+
c := qt.New(t)
209213
type errTest func(error) bool
210214
allow := func(ss ...string) []func(error) bool {
211215
fns := make([]func(error) bool, len(ss))
@@ -245,21 +249,21 @@ func (*errorsSuite) TestMatch(c *gc.C) {
245249

246250
for i, test := range tests {
247251
c.Logf("test %d", i)
248-
c.Assert(errgo.Match(test.err, test.fns...), gc.Equals, test.ok)
252+
c.Assert(errgo.Match(test.err, test.fns...), qt.Equals, test.ok)
249253
}
250254
}
251255

252-
func checkErr(c *gc.C, err, underlying error, msg string, details string, cause error) {
253-
c.Assert(err, gc.NotNil)
254-
c.Assert(err.Error(), gc.Equals, msg)
256+
func checkErr(c *qt.C, err, underlying error, msg string, details string, cause error) {
257+
c.Assert(err, qt.Not(qt.IsNil))
258+
c.Assert(err.Error(), qt.Equals, msg)
255259
if err, ok := err.(errgo.Wrapper); ok {
256-
c.Assert(err.Underlying(), gc.Equals, underlying)
260+
c.Assert(err.Underlying(), qt.Equals, underlying)
257261
} else {
258-
c.Assert(underlying, gc.IsNil)
262+
c.Assert(underlying, qt.IsNil)
259263
}
260-
c.Assert(errgo.Cause(err), gc.Equals, cause)
264+
c.Assert(errgo.Cause(err), qt.Equals, cause)
261265
wantDetails := replaceLocations(details)
262-
c.Assert(errgo.Details(err), gc.Equals, wantDetails)
266+
c.Assert(errgo.Details(err), qt.Equals, wantDetails)
263267
}
264268

265269
func replaceLocations(s string) string {

Diff for: ‎go.mod

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
module gopkg.in/errgo.v1
22

3-
require (
4-
github.com/kr/pretty v0.1.0 // indirect
5-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127
6-
)
3+
require github.com/frankban/quicktest v1.2.2

Diff for: ‎go.sum

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
github.com/frankban/quicktest v1.2.2 h1:xfmOhhoH5fGPgbEAlhLpJH9p0z/0Qizio9osmvn9IUY=
2+
github.com/frankban/quicktest v1.2.2/go.mod h1:Qh/WofXFeiAFII1aEBu529AtJo6Zg2VHscnEsbBnJ20=
3+
github.com/google/go-cmp v0.2.1-0.20190312032427-6f77996f0c42 h1:q3pnF5JFBNRz8sRD+IRj7Y6DMyYGTNqnZ9axTbSfoNI=
4+
github.com/google/go-cmp v0.2.1-0.20190312032427-6f77996f0c42/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
15
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
26
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
7+
github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
38
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
49
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
510
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
6-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
7-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

0 commit comments

Comments
 (0)