Skip to content

Commit 940056f

Browse files
ImSingeeImSingee
committed
use github.com/stretchr/testify/assert instead of depreated github.com/ImSingee/tt
1 parent 4e82487 commit 940056f

File tree

15 files changed

+157
-135
lines changed

15 files changed

+157
-135
lines changed

‎dt/bool_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"testing"
66

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

1010
func TestParseBool(t *testing.T) {
@@ -23,16 +23,16 @@ func TestParseBool(t *testing.T) {
2323
for _, c := range trueCases {
2424
t.Run(fmt.Sprintf("Should Be True: %#+v", c), func(t *testing.T) {
2525
b, ok := ParseBool(c)
26-
tt.AssertTrue(t, ok)
27-
tt.AssertTrue(t, b)
26+
assert.True(t, ok)
27+
assert.True(t, b)
2828
})
2929
}
3030

3131
for _, c := range falseCases {
3232
t.Run(fmt.Sprintf("Should Be False: %#+v", c), func(t *testing.T) {
3333
b, ok := ParseBool(c)
34-
tt.AssertTrue(t, ok)
35-
tt.AssertFalse(t, b)
34+
assert.True(t, ok)
35+
assert.False(t, b)
3636
})
3737
}
3838

‎dt/in_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ package dt
22

33
import (
44
"fmt"
5-
"github.com/ImSingee/tt"
65
"testing"
6+
7+
"github.com/stretchr/testify/assert"
78
)
89

910
func TestInSlice(t *testing.T) {
@@ -16,7 +17,7 @@ func TestInSlice(t *testing.T) {
1617

1718
for i, c := range trueCases {
1819
t.Run(fmt.Sprintf("true - %d", i), func(t *testing.T) {
19-
tt.AssertTrue(t, InSlice(c[0], c[1]))
20+
assert.True(t, InSlice(c[0], c[1]))
2021
})
2122
}
2223

@@ -29,7 +30,7 @@ func TestInSlice(t *testing.T) {
2930

3031
for i, c := range falseCases {
3132
t.Run(fmt.Sprintf("false - %d", i), func(t *testing.T) {
32-
tt.AssertFalse(t, InSlice(c[0], c[1]))
33+
assert.False(t, InSlice(c[0], c[1]))
3334
})
3435
}
3536
}

‎dt/number_test.go‎

Lines changed: 94 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -5,182 +5,182 @@ import (
55
"math/big"
66
"testing"
77

8-
"github.com/ImSingee/tt"
8+
"github.com/stretchr/testify/assert"
99
)
1010

1111
func TestNumberFromString(t *testing.T) {
1212
// Integer int64
1313
// Range [-1 << 63, 1<<63 - 1] => [-9223372036854775808, 9223372036854775807]
1414
//fmt.Printf("int64 range: [%d, %d]\n", math.MinInt64, math.MaxInt64)
1515
number, ok := NumberFromString("123")
16-
tt.AssertTrue(t, ok)
16+
assert.True(t, ok)
1717
fmt.Printf("%#+v (%T)\n", number, number.number)
18-
tt.AssertFalse(t, number.float)
19-
tt.AssertFalse(t, number.unsigned)
20-
tt.AssertFalse(t, number.above64bit)
21-
tt.AssertEqual(t, int64(123), number.number)
18+
assert.False(t, number.float)
19+
assert.False(t, number.unsigned)
20+
assert.False(t, number.above64bit)
21+
assert.Equal(t, int64(123), number.number)
2222

2323
// Unsigned integer uint64
2424
// Range [0, 1<<64 - 1] => [0, 18446744073709551615]
2525
//fmt.Printf("uint64 range: [0, %d]\n", uint64(math.MaxUint64))
2626
number, ok = NumberFromString("9223372036854775999") // Numbers greater than MaxInt64 should be inferred as uint64
27-
tt.AssertTrue(t, ok)
27+
assert.True(t, ok)
2828
fmt.Printf("%#+v (%T)\n", number, number.number)
29-
tt.AssertFalse(t, number.float)
30-
tt.AssertTrue(t, number.unsigned)
31-
tt.AssertFalse(t, number.above64bit)
32-
tt.AssertEqual(t, uint64(9223372036854775999), number.number)
29+
assert.False(t, number.float)
30+
assert.True(t, number.unsigned)
31+
assert.False(t, number.above64bit)
32+
assert.Equal(t, uint64(9223372036854775999), number.number)
3333

3434
// Decimal
3535
number, ok = NumberFromString("123.456")
36-
tt.AssertTrue(t, ok)
36+
assert.True(t, ok)
3737
fmt.Printf("%#+v (%T)\n", number, number.number)
38-
tt.AssertTrue(t, number.float)
39-
tt.AssertFalse(t, number.above64bit)
40-
tt.AssertEqual(t, 123.456, number.number)
38+
assert.True(t, number.float)
39+
assert.False(t, number.above64bit)
40+
assert.Equal(t, 123.456, number.number)
4141

4242
number, ok = NumberFromString("18446744073709559999.888")
43-
tt.AssertTrue(t, ok)
43+
assert.True(t, ok)
4444
fmt.Printf("%#+v (%T)\n", number, number.number)
45-
tt.AssertTrue(t, number.float)
46-
tt.AssertFalse(t, number.above64bit)
47-
tt.AssertEqual(t, 18446744073709559999.888, number.number)
45+
assert.True(t, number.float)
46+
assert.False(t, number.above64bit)
47+
assert.Equal(t, 18446744073709559999.888, number.number)
4848

4949
// Big integer
5050
number, ok = NumberFromString("18446744073709559999")
51-
tt.AssertTrue(t, ok)
51+
assert.True(t, ok)
5252
fmt.Printf("%#+v (%T)\n", number, number.number)
53-
tt.AssertFalse(t, number.float)
54-
tt.AssertTrue(t, number.above64bit)
55-
tt.AssertFalse(t, number.number.(*big.Int).IsUint64())
56-
tt.AssertFalse(t, number.number.(*big.Int).IsInt64())
53+
assert.False(t, number.float)
54+
assert.True(t, number.above64bit)
55+
assert.False(t, number.number.(*big.Int).IsUint64())
56+
assert.False(t, number.number.(*big.Int).IsInt64())
5757
// python: list((18446744073709559999).to_bytes(9, 'big'))
5858
// [1, 0, 0, 0, 0, 0, 0, 32, 191]
59-
tt.AssertEqual(t, []byte{1, 0, 0, 0, 0, 0, 0, 32, 191}, number.number.(*big.Int).Bytes())
59+
assert.Equal(t, []byte{1, 0, 0, 0, 0, 0, 0, 32, 191}, number.number.(*big.Int).Bytes())
6060

6161
// Big decimal
6262
// MaxFloat64 = 1.797693134862315708145274237317043567981e+308 // 2**1023 * (2**53 - 1) / 2**52
6363
//s := "18567834567832456789234567899765433567897656783456783245678923456789976543356789765678345678324567892345678997654335678976567834567832456789234567899765433567897656783456783245678923456789976543356789765678345678324567892345678997654335678976567834567832456789234567899765433567897656783456783245678923456789976543356789765678345678324567892345678997654335678976567834567832456789234567899765433567897656783456783245678923456789976543356789765678345678324567892345678997654335678976567834567832456789234567899765433567897656783456783245678923456789976543356789765678345678324567892345678997654335678976567834567832456789234567899765433567897602456783456783245678923456789976543356789768927459823459872905472980534727864781239482345678987654234567376489231486432764178919265478429363896785962378139468721463178463827136478164217834617349817234891742839749812374981473891423798347198234719234238947834658924374798234446744073709559999.123999"
6464
//number, ok = NumberFromString(s)
65-
//tt.AssertTrue(t, ok)
65+
//assert.True(t, ok)
6666
//fmt.Printf("%#+v (%T)\n", number, number.number)
67-
//tt.AssertTrue(t, number.float)
68-
//tt.AssertTrue(t, number.above64bit)
69-
////tt.AssertFalse(t, number.number.(*big.Float).IsInt())
70-
//tt.AssertFalse(t, number.number.(*big.Float).IsInf())
71-
//tt.AssertEqual(t, s, fmt.Sprintf("%f", number.number.(*big.Float)))
67+
//assert.True(t, number.float)
68+
//assert.True(t, number.above64bit)
69+
////assert.False(t, number.number.(*big.Float).IsInt())
70+
//assert.False(t, number.number.(*big.Float).IsInf())
71+
//assert.Equal(t, s, fmt.Sprintf("%f", number.number.(*big.Float)))
7272
}
7373

7474
func TestNewGenericNumber(t *testing.T) {
7575
// Integer int/int8/int16/int32/int64
7676
number, ok := ParseNumber(int(123))
77-
tt.AssertTrue(t, ok)
77+
assert.True(t, ok)
7878
fmt.Printf("%#+v (%T)\n", number, number.number)
79-
tt.AssertFalse(t, number.float)
80-
tt.AssertFalse(t, number.unsigned)
81-
tt.AssertFalse(t, number.above64bit)
82-
tt.AssertEqual(t, int64(123), number.number)
79+
assert.False(t, number.float)
80+
assert.False(t, number.unsigned)
81+
assert.False(t, number.above64bit)
82+
assert.Equal(t, int64(123), number.number)
8383

8484
number, ok = ParseNumber(int8(123))
85-
tt.AssertTrue(t, ok)
85+
assert.True(t, ok)
8686
fmt.Printf("%#+v (%T)\n", number, number.number)
87-
tt.AssertFalse(t, number.float)
88-
tt.AssertFalse(t, number.unsigned)
89-
tt.AssertFalse(t, number.above64bit)
90-
tt.AssertEqual(t, int64(123), number.number)
87+
assert.False(t, number.float)
88+
assert.False(t, number.unsigned)
89+
assert.False(t, number.above64bit)
90+
assert.Equal(t, int64(123), number.number)
9191

9292
number, ok = ParseNumber(int16(123))
93-
tt.AssertTrue(t, ok)
93+
assert.True(t, ok)
9494
fmt.Printf("%#+v (%T)\n", number, number.number)
95-
tt.AssertFalse(t, number.float)
96-
tt.AssertFalse(t, number.unsigned)
97-
tt.AssertFalse(t, number.above64bit)
98-
tt.AssertEqual(t, int64(123), number.number)
95+
assert.False(t, number.float)
96+
assert.False(t, number.unsigned)
97+
assert.False(t, number.above64bit)
98+
assert.Equal(t, int64(123), number.number)
9999

100100
number, ok = ParseNumber(int32(123))
101-
tt.AssertTrue(t, ok)
101+
assert.True(t, ok)
102102
fmt.Printf("%#+v (%T)\n", number, number.number)
103-
tt.AssertFalse(t, number.float)
104-
tt.AssertFalse(t, number.unsigned)
105-
tt.AssertFalse(t, number.above64bit)
106-
tt.AssertEqual(t, int64(123), number.number)
103+
assert.False(t, number.float)
104+
assert.False(t, number.unsigned)
105+
assert.False(t, number.above64bit)
106+
assert.Equal(t, int64(123), number.number)
107107

108108
number, ok = ParseNumber(int64(123))
109-
tt.AssertTrue(t, ok)
109+
assert.True(t, ok)
110110
fmt.Printf("%#+v (%T)\n", number, number.number)
111-
tt.AssertFalse(t, number.float)
112-
tt.AssertFalse(t, number.unsigned)
113-
tt.AssertFalse(t, number.above64bit)
114-
tt.AssertEqual(t, int64(123), number.number)
111+
assert.False(t, number.float)
112+
assert.False(t, number.unsigned)
113+
assert.False(t, number.above64bit)
114+
assert.Equal(t, int64(123), number.number)
115115

116116
// Unsigned integer uint/uint8/uint16/uint32/uint64
117117
number, ok = ParseNumber(uint(123))
118-
tt.AssertTrue(t, ok)
118+
assert.True(t, ok)
119119
fmt.Printf("%#+v (%T)\n", number, number.number)
120-
tt.AssertFalse(t, number.float)
121-
tt.AssertTrue(t, number.unsigned)
122-
tt.AssertFalse(t, number.above64bit)
123-
tt.AssertEqual(t, uint64(123), number.number)
120+
assert.False(t, number.float)
121+
assert.True(t, number.unsigned)
122+
assert.False(t, number.above64bit)
123+
assert.Equal(t, uint64(123), number.number)
124124

125125
number, ok = ParseNumber(uint8(123))
126-
tt.AssertTrue(t, ok)
126+
assert.True(t, ok)
127127
fmt.Printf("%#+v (%T)\n", number, number.number)
128-
tt.AssertFalse(t, number.float)
129-
tt.AssertTrue(t, number.unsigned)
130-
tt.AssertFalse(t, number.above64bit)
131-
tt.AssertEqual(t, uint64(123), number.number)
128+
assert.False(t, number.float)
129+
assert.True(t, number.unsigned)
130+
assert.False(t, number.above64bit)
131+
assert.Equal(t, uint64(123), number.number)
132132

133133
number, ok = ParseNumber(uint16(123))
134-
tt.AssertTrue(t, ok)
134+
assert.True(t, ok)
135135
fmt.Printf("%#+v (%T)\n", number, number.number)
136-
tt.AssertFalse(t, number.float)
137-
tt.AssertTrue(t, number.unsigned)
138-
tt.AssertFalse(t, number.above64bit)
139-
tt.AssertEqual(t, uint64(123), number.number)
136+
assert.False(t, number.float)
137+
assert.True(t, number.unsigned)
138+
assert.False(t, number.above64bit)
139+
assert.Equal(t, uint64(123), number.number)
140140

141141
number, ok = ParseNumber(uint32(123))
142-
tt.AssertTrue(t, ok)
142+
assert.True(t, ok)
143143
fmt.Printf("%#+v (%T)\n", number, number.number)
144-
tt.AssertFalse(t, number.float)
145-
tt.AssertTrue(t, number.unsigned)
146-
tt.AssertFalse(t, number.above64bit)
147-
tt.AssertEqual(t, uint64(123), number.number)
144+
assert.False(t, number.float)
145+
assert.True(t, number.unsigned)
146+
assert.False(t, number.above64bit)
147+
assert.Equal(t, uint64(123), number.number)
148148

149149
number, ok = ParseNumber(uint64(123))
150-
tt.AssertTrue(t, ok)
150+
assert.True(t, ok)
151151
fmt.Printf("%#+v (%T)\n", number, number.number)
152-
tt.AssertFalse(t, number.float)
153-
tt.AssertTrue(t, number.unsigned)
154-
tt.AssertFalse(t, number.above64bit)
155-
tt.AssertEqual(t, uint64(123), number.number)
152+
assert.False(t, number.float)
153+
assert.True(t, number.unsigned)
154+
assert.False(t, number.above64bit)
155+
assert.Equal(t, uint64(123), number.number)
156156

157157
// Floating-point float32/float64
158158
number, ok = ParseNumber(float32(123.45))
159-
tt.AssertTrue(t, ok)
159+
assert.True(t, ok)
160160
fmt.Printf("%#+v (%T)\n", number, number.number)
161-
tt.AssertTrue(t, number.float)
162-
tt.AssertFalse(t, number.above64bit)
163-
//tt.AssertEqual(t, float32(123.45), number.number)
161+
assert.True(t, number.float)
162+
assert.False(t, number.above64bit)
163+
//assert.Equal(t, float32(123.45), number.number)
164164

165165
number, ok = ParseNumber(123.45)
166-
tt.AssertTrue(t, ok)
166+
assert.True(t, ok)
167167
fmt.Printf("%#+v (%T)\n", number, number.number)
168-
tt.AssertTrue(t, number.float)
169-
tt.AssertFalse(t, number.above64bit)
170-
tt.AssertEqual(t, 123.45, number.number)
168+
assert.True(t, number.float)
169+
assert.False(t, number.above64bit)
170+
assert.Equal(t, 123.45, number.number)
171171

172172
// String
173173
number, ok = ParseNumber("123")
174-
tt.AssertTrue(t, ok)
174+
assert.True(t, ok)
175175
fmt.Printf("%#+v (%T)\n", number, number.number)
176-
tt.AssertEqual(t, int64(123), number.number)
176+
assert.Equal(t, int64(123), number.number)
177177

178178
number, ok = ParseNumber("123.456")
179-
tt.AssertTrue(t, ok)
179+
assert.True(t, ok)
180180
fmt.Printf("%#+v (%T)\n", number, number.number)
181-
tt.AssertEqual(t, 123.456, number.number)
181+
assert.Equal(t, 123.456, number.number)
182182

183183
// Exception cases
184184
number, ok = ParseNumber(nil)
185-
tt.AssertFalse(t, ok)
185+
assert.False(t, ok)
186186
}

‎dt/string_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package dt
22

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

89
func TestToString(t *testing.T) {
@@ -15,7 +16,7 @@ func TestToString(t *testing.T) {
1516

1617
for v, s := range cases {
1718
t.Run("case", func(t *testing.T) {
18-
tt.AssertEqual(t, s, ToString(v))
19+
assert.Equal(t, s, ToString(v))
1920
})
2021
}
2122
}

‎ee/errors_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"strings"
66
"testing"
77

8-
"github.com/ImSingee/tt"
8+
"github.com/stretchr/testify/assert"
99
)
1010

1111
func f1() error {
@@ -21,5 +21,5 @@ func TestErrorStack(t *testing.T) {
2121

2222
stack := err.singeeErrStack()
2323
s := fmt.Sprintf("%+v\n", stack)
24-
tt.AssertTrue(t, strings.Contains(s, "ee.f1"))
24+
assert.True(t, strings.Contains(s, "ee.f1"))
2525
}

‎ee/marshal_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ package ee
33
import (
44
"encoding/json"
55
"fmt"
6-
"github.com/ImSingee/tt"
76
"strconv"
87
"testing"
8+
9+
"github.com/stretchr/testify/assert"
910
)
1011

1112
func TestMarshalJson(t *testing.T) {
@@ -20,9 +21,9 @@ func TestMarshalJson(t *testing.T) {
2021
for _, err := range errs {
2122
t.Run("marshal "+err.Error(), func(t *testing.T) {
2223
p, e := json.Marshal(err)
23-
tt.AssertIsNotError(t, e)
24+
assert.NoError(t, e)
2425

25-
tt.AssertEqual(t, strconv.Quote(err.Error()), string(p))
26+
assert.Equal(t, strconv.Quote(err.Error()), string(p))
2627
})
2728
}
2829
}

0 commit comments

Comments
 (0)