Skip to content

Commit e1cf9fe

Browse files
EunEun
authored
chore: remove amount of dependencies (#1)
1 parent 5ee12d1 commit e1cf9fe

19 files changed

+802
-98
lines changed

‎builder_test.go

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

7-
"github.com/stretchr/testify/require"
8-
97
"github.com/Eun/serrors"
108
)
119

@@ -17,7 +15,7 @@ func testBuilderErrorFunc() error {
1715

1816
func TestBuilder(t *testing.T) {
1917
_, filename, _, ok := runtime.Caller(0)
20-
require.True(t, ok)
18+
Equal(t, true, ok)
2119

2220
t.Run("Errorf", func(t *testing.T) {
2321
errorBuilder := serrors.NewBuilder().
@@ -26,8 +24,8 @@ func TestBuilder(t *testing.T) {
2624
err := errorBuilder.Errorf("some error"). // [TestBuilderErrorf00]
2725
With("key2", "value2").
2826
With("key3", "value3")
29-
require.NotNil(t, err)
30-
require.Equal(t, "some error", err.Error())
27+
NotNil(t, err)
28+
Equal(t, "some error", err.Error())
3129

3230
expectedFields := map[string]any{
3331
"key1": "value1",
@@ -43,7 +41,7 @@ func TestBuilder(t *testing.T) {
4341
},
4442
},
4543
}
46-
require.Equal(t, expectedFields, serrors.GetFields(err))
44+
Equal(t, expectedFields, serrors.GetFields(err))
4745
CompareErrorStack(t, expectedStack, serrors.GetStack(err))
4846
})
4947

@@ -57,8 +55,8 @@ func TestBuilder(t *testing.T) {
5755
With("deep.key2", "value2").
5856
With("key2", "value2").
5957
With("key3", "value3")
60-
require.NotNil(t, err)
61-
require.Equal(t, "some error: deep error", err.Error())
58+
NotNil(t, err)
59+
Equal(t, "some error: deep error", err.Error())
6260

6361
expectedFields := map[string]any{
6462
"deep.key1": "value1",
@@ -92,7 +90,7 @@ func TestBuilder(t *testing.T) {
9290
},
9391
},
9492
}
95-
require.Equal(t, expectedFields, serrors.GetFields(err))
93+
Equal(t, expectedFields, serrors.GetFields(err))
9694
CompareErrorStack(t, expectedStack, serrors.GetStack(err))
9795
})
9896
}

‎error_example_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,8 @@ func addUserToRole(userName, roleName string) error {
6161
}
6262

6363
func ExampleError() {
64-
logger := NewSLogLogger()
6564
if err := addUserToRole("joe", "guest"); err != nil {
66-
logger.Error("name validation failed",
65+
slog.Error("name validation failed",
6766
"error", err.Error(),
6867
slog.Group("details", serrors.GetFieldsAsCombinedSlice(err)...),
6968
"stack", serrors.GetStack(err),

‎error_test.go

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import (
77
"runtime"
88
"testing"
99

10-
"github.com/stretchr/testify/require"
11-
1210
"github.com/Eun/serrors"
1311
)
1412

@@ -22,15 +20,14 @@ func testErrorFunc() error {
2220

2321
func TestError(t *testing.T) {
2422
_, filename, _, ok := runtime.Caller(0)
25-
require.True(t, ok)
23+
Equal(t, true, ok)
2624

2725
t.Run("Errorf", func(t *testing.T) {
2826
err := serrors.Errorf("some error"). // [TestErrorErrorf00]
2927
With("key1", "value1").
3028
With("key2", "value2")
31-
32-
require.NotNil(t, err)
33-
require.Equal(t, "some error", err.Error())
29+
NotNil(t, err)
30+
Equal(t, "some error", err.Error())
3431

3532
expectedFields := map[string]any{
3633
"key1": "value1",
@@ -45,7 +42,7 @@ func TestError(t *testing.T) {
4542
},
4643
},
4744
}
48-
require.Equal(t, expectedFields, serrors.GetFields(err))
45+
Equal(t, expectedFields, serrors.GetFields(err))
4946
CompareErrorStack(t, expectedStack, serrors.GetStack(err))
5047
})
5148

@@ -55,8 +52,8 @@ func TestError(t *testing.T) {
5552
With("deep.key2", "value2").
5653
With("key1", "value1").
5754
With("key2", "value2")
58-
require.NotNil(t, err)
59-
require.Equal(t, "some error: deep error", err.Error())
55+
NotNil(t, err)
56+
Equal(t, "some error: deep error", err.Error())
6057

6158
expectedFields := map[string]any{
6259
"deep.key1": "value1",
@@ -88,7 +85,7 @@ func TestError(t *testing.T) {
8885
},
8986
},
9087
}
91-
require.Equal(t, expectedFields, serrors.GetFields(err))
88+
Equal(t, expectedFields, serrors.GetFields(err))
9289
CompareErrorStack(t, expectedStack, serrors.GetStack(err))
9390
})
9491
}
@@ -129,7 +126,7 @@ func TestGetFields(t *testing.T) {
129126
for _, tc := range testCases {
130127
tc := tc
131128
t.Run(tc.name, func(t *testing.T) {
132-
require.Equal(t, tc.expectedFields, serrors.GetFields(tc.error))
129+
Equal(t, tc.expectedFields, serrors.GetFields(tc.error))
133130
})
134131
}
135132
}
@@ -170,7 +167,7 @@ func TestGetFieldsAsArguments(t *testing.T) {
170167
for _, tc := range testCases {
171168
tc := tc
172169
t.Run(tc.name, func(t *testing.T) {
173-
require.Equal(t, tc.expectedArguments, serrors.GetFieldsAsCombinedSlice(tc.error))
170+
Equal(t, tc.expectedArguments, serrors.GetFieldsAsCombinedSlice(tc.error))
174171
})
175172
}
176173
}
@@ -179,24 +176,24 @@ func TestUnwrap(t *testing.T) {
179176
t.Run("wrapped error", func(t *testing.T) {
180177
err1 := errors.New("error1")
181178
err := serrors.Wrap(err1, "error2")
182-
require.Equal(t, err1, errors.Unwrap(err))
179+
Equal(t, err1, errors.Unwrap(err))
183180
})
184181
t.Run("wrapped no error", func(t *testing.T) {
185182
err := serrors.Wrap(nil, "error2")
186-
require.Nil(t, errors.Unwrap(err))
183+
Nil(t, errors.Unwrap(err))
187184
})
188185
}
189186

190187
func TestIs(t *testing.T) {
191188
t.Run("wrapped error", func(t *testing.T) {
192189
err := serrors.Wrap(net.ErrClosed, "error")
193-
require.True(t, errors.Is(err, net.ErrClosed))
194-
require.False(t, errors.Is(err, net.ErrWriteToConnected))
190+
Equal(t, true, errors.Is(err, net.ErrClosed))
191+
Equal(t, false, errors.Is(err, net.ErrWriteToConnected))
195192
})
196193
t.Run("wrapped no error", func(t *testing.T) {
197194
err := serrors.Wrap(nil, "error")
198-
require.False(t, errors.Is(err, net.ErrClosed))
199-
require.False(t, errors.Is(err, net.ErrWriteToConnected))
195+
Equal(t, false, errors.Is(err, net.ErrClosed))
196+
Equal(t, false, errors.Is(err, net.ErrWriteToConnected))
200197
})
201198
}
202199

@@ -205,21 +202,21 @@ func TestAs(t *testing.T) {
205202
err := serrors.Wrap(&net.AddrError{Addr: "127.0.0.1"}, "error")
206203

207204
var cause1 *net.AddrError
208-
require.True(t, errors.As(err, &cause1))
209-
require.Equal(t, cause1.Addr, "127.0.0.1")
205+
Equal(t, true, errors.As(err, &cause1))
206+
Equal(t, "127.0.0.1", cause1.Addr)
210207

211208
var cause2 *net.OpError
212-
require.False(t, errors.As(err, &cause2))
213-
require.Nil(t, cause2)
209+
Equal(t, false, errors.As(err, &cause2))
210+
Nil(t, cause2)
214211
})
215212
t.Run("wrapped no error", func(t *testing.T) {
216213
err := serrors.Wrap(nil, "error")
217214
var cause1 *net.AddrError
218-
require.False(t, errors.As(err, &cause1))
219-
require.Nil(t, cause1)
215+
Equal(t, false, errors.As(err, &cause1))
216+
Nil(t, cause1)
220217

221218
var cause2 *net.OpError
222-
require.False(t, errors.As(err, &cause2))
223-
require.Nil(t, cause2)
219+
Equal(t, false, errors.As(err, &cause2))
220+
Nil(t, cause2)
224221
})
225222
}

‎format_test.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import (
77
"strings"
88
"testing"
99

10-
"github.com/stretchr/testify/require"
11-
1210
"github.com/Eun/serrors"
1311
)
1412

@@ -53,33 +51,33 @@ func TestError_Error(t *testing.T) {
5351
for _, tc := range testCases {
5452
tc := tc
5553
t.Run(tc.name, func(t *testing.T) {
56-
require.Equal(t, tc.expectedErrorText, tc.error.Error())
54+
Equal(t, tc.expectedErrorText, tc.error.Error())
5755
})
5856
}
5957
}
6058

6159
func TestError_Format(t *testing.T) {
6260
_, filename, _, ok := runtime.Caller(0)
63-
require.True(t, ok)
61+
Equal(t, true, ok)
6462

6563
cause := serrors.New("error 1").With("k1", "v1") // [TestError_Format01]
6664
err := serrors.Wrap(cause, "error 2").With("k2", "v2") // [TestError_Format00]
6765

6866
t.Run("normal string", func(t *testing.T) {
69-
require.Equal(t, "error 2: error 1", fmt.Sprintf("%s", err))
67+
Equal(t, "error 2: error 1", fmt.Sprintf("%s", err))
7068
})
7169
t.Run("quoted string", func(t *testing.T) {
72-
require.Equal(t, `"error 2: error 1"`, fmt.Sprintf("%q", err))
70+
Equal(t, `"error 2: error 1"`, fmt.Sprintf("%q", err))
7371
})
7472
t.Run("verbose", func(t *testing.T) {
75-
require.Equal(t, "error 2: error 1[k1=v1 k2=v2]", fmt.Sprintf("%v", err))
73+
Equal(t, "error 2: error 1[k1=v1 k2=v2]", fmt.Sprintf("%v", err))
7674
})
7775
t.Run("extra verbose", func(t *testing.T) {
7876
expected := fmt.Sprintf("error 2\n[k2=v2]\n%s\nerror 1\n[k1=v1]\n%s\n",
7977
generateExpectedStack(t, filename, "TestError_Format00"),
8078
generateExpectedStack(t, filename, "TestError_Format01"),
8179
)
82-
require.Equal(t, expected, fmt.Sprintf("%+v", err))
80+
Equal(t, expected, fmt.Sprintf("%+v", err))
8381
})
8482
}
8583

‎go.mod

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,4 @@ module github.com/Eun/serrors
22

33
go 1.21
44

5-
require (
6-
github.com/pkg/errors v0.9.1
7-
github.com/stretchr/testify v1.8.4
8-
)
9-
10-
require (
11-
github.com/davecgh/go-spew v1.1.1 // indirect
12-
github.com/pmezard/go-difflib v1.0.0 // indirect
13-
gopkg.in/yaml.v3 v3.0.1 // indirect
14-
)
5+
require github.com/pkg/errors v0.9.1

‎go.sum

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,2 @@
1-
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
2-
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
31
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
42
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
5-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
6-
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
7-
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
8-
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
9-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
10-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
11-
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
12-
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎stack_test.go

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,22 @@ import (
88
"strings"
99
"testing"
1010

11-
"github.com/stretchr/testify/require"
12-
1311
"github.com/Eun/serrors"
1412
)
1513

1614
func TestGetStack(t *testing.T) {
1715
// just generic testing
1816
// the real test are happening in TestError & TestBuilder.
1917
t.Run("get stack from nil value", func(t *testing.T) {
20-
require.Nil(t, serrors.GetStack(nil))
18+
Nil(t, serrors.GetStack(nil))
2119
})
2220
t.Run("get original error from stack", func(t *testing.T) {
2321
err := serrors.New("some error")
2422

2523
stack := serrors.GetStack(err)
26-
require.Len(t, stack, 1)
27-
require.Equal(t, err, stack[0].Error())
28-
require.Equal(t, err.Error(), stack[0].ErrorMessage)
24+
Equal(t, 1, len(stack))
25+
Equal(t, err, stack[0].Error())
26+
Equal(t, err.Error(), stack[0].ErrorMessage)
2927
})
3028
}
3129

@@ -36,7 +34,7 @@ func buildStackFrameFromMarker(t *testing.T, fileName, marker string) serrors.St
3634

3735
// Parse the Go file
3836
file, err := parser.ParseFile(fileSet, fileName, nil, parser.AllErrors|parser.ParseComments)
39-
require.NoError(t, err)
37+
Nil(t, err)
4038
packageName := "github.com/Eun/" + file.Name.Name
4139

4240
var inspectNode func(n ast.Node) bool
@@ -56,7 +54,7 @@ func buildStackFrameFromMarker(t *testing.T, fileName, marker string) serrors.St
5654
// Get the function name and line number
5755
pos := fileSet.Position(v.Slash)
5856
funcName := findEnclosingFunc(fileSet, file, pos.Offset)
59-
require.Nil(t, result, "found a marker %q already", marker)
57+
Nil(t, result)
6058
result = &serrors.StackFrame{
6159
File: fileName,
6260
Func: packageName + "." + funcName,
@@ -70,7 +68,7 @@ func buildStackFrameFromMarker(t *testing.T, fileName, marker string) serrors.St
7068

7169
// Traverse the AST
7270
ast.Inspect(file, inspectNode)
73-
require.NotNil(t, result, "no marker found %s", marker)
71+
NotNil(t, result)
7472
return *result
7573
}
7674

‎thirdparty_test.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ import (
77
"testing"
88

99
pkgerrors "github.com/pkg/errors"
10-
"github.com/stretchr/testify/require"
1110

1211
"github.com/Eun/serrors"
1312
)
1413

1514
func TestGetStack_WithPkgErrors(t *testing.T) {
1615
_, filename, _, ok := runtime.Caller(0)
17-
require.True(t, ok)
16+
Equal(t, true, ok)
1817

1918
err := serrors.Wrap( // [TestGetStack_WithPkgErrors00]
2019
pkgerrors.Wrap( // [TestGetStack_WithPkgErrors10]
@@ -47,7 +46,7 @@ func TestGetStack_WithPkgErrors(t *testing.T) {
4746

4847
func TestError_Format_WithPkgErrors(t *testing.T) {
4948
_, filename, _, ok := runtime.Caller(0)
50-
require.True(t, ok)
49+
Equal(t, true, ok)
5150

5251
err := serrors.Wrap( // [TestError_Format_WithPkgErrors01]
5352
pkgerrors.Wrap( // [TestError_Format_WithPkgErrors02]
@@ -60,7 +59,7 @@ func TestError_Format_WithPkgErrors(t *testing.T) {
6059
generateExpectedStack(t, filename, "TestError_Format_WithPkgErrors01"),
6160
generateExpectedStack(t, filename, "TestError_Format_WithPkgErrors02"),
6261
)
63-
require.Equal(t, expected, fmt.Sprintf("%+v", err))
62+
Equal(t, expected, fmt.Sprintf("%+v", err))
6463
}
6564

6665
func TestError_Error_WithPkgErrors(t *testing.T) {
@@ -71,6 +70,5 @@ func TestError_Error_WithPkgErrors(t *testing.T) {
7170
"serrors",
7271
)
7372

74-
expected := "serrors: pkgerrors: errors"
75-
require.Equal(t, expected, err.Error())
73+
Equal(t, "serrors: pkgerrors: errors", err.Error())
7674
}

0 commit comments

Comments
 (0)