3b2f5d7842
Merge in DNS/adguard-home from 2704-local-addresses-vol.1 to master Updates #2704. Updates #2829. Updates #2846. Squashed commit of the following: commit 9a49b3d27edcb30da7f16a065226907833b1dc81 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Mar 22 15:39:17 2021 +0300 aghnet: imp docs and logging commit 74f95a29c55b9e732276601b0ecc63fb7c3a9f9e Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Mar 19 20:56:51 2021 +0300 all: fix friday evening mistakes commit 0e2066bc5c16ed807fa601780b99e154502361a9 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Mar 19 20:51:15 2021 +0300 all: upd testify, imp code quality commit 8237c50b670c58361ccf7adec3ff2452b1196677 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Mar 19 20:19:29 2021 +0300 aghnet: imp test naming commit 14eb1e189339554c0a6d38e2ba7a93917774ebab Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Mar 19 19:41:43 2021 +0300 aghnet: isolate windows-specific functionality commit d461ac8b18c187999da3e3aba116571b7ebe6785 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Mar 19 14:50:05 2021 +0300 aghnet: imp code quality commit d0ee01cb1f8613de2085c0f2f2f396e46beb52a5 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Mar 19 11:59:10 2021 +0300 all: mv funcs to agherr, mk system resolvers getter
161 lines
3.1 KiB
Go
161 lines
3.1 KiB
Go
package agherr
|
|
|
|
import (
|
|
"bytes"
|
|
"errors"
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestError_Error(t *testing.T) {
|
|
testCases := []struct {
|
|
err error
|
|
name string
|
|
want string
|
|
}{{
|
|
err: Many("a"),
|
|
name: "simple",
|
|
want: "a",
|
|
}, {
|
|
err: Many("a", errors.New("b")),
|
|
name: "wrapping",
|
|
want: "a: b",
|
|
}, {
|
|
err: Many("a", errors.New("b"), errors.New("c"), errors.New("d")),
|
|
name: "wrapping several",
|
|
want: "a: b (hidden: c, d)",
|
|
}, {
|
|
err: Many("a", Many("b", errors.New("c"), errors.New("d"))),
|
|
name: "wrapping wrapper",
|
|
want: "a: b: c (hidden: d)",
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
assert.Equal(t, tc.want, tc.err.Error(), tc.name)
|
|
}
|
|
}
|
|
|
|
func TestError_Unwrap(t *testing.T) {
|
|
var _ wrapper = &manyError{}
|
|
|
|
const (
|
|
errSimple = iota
|
|
errWrapped
|
|
errNil
|
|
)
|
|
|
|
errs := []error{
|
|
errSimple: errors.New("a"),
|
|
errWrapped: fmt.Errorf("err: %w", errors.New("nested")),
|
|
errNil: nil,
|
|
}
|
|
|
|
testCases := []struct {
|
|
want error
|
|
wrapped error
|
|
name string
|
|
}{{
|
|
want: errs[errSimple],
|
|
wrapped: Many("a", errs[errSimple]),
|
|
name: "simple",
|
|
}, {
|
|
want: errs[errWrapped],
|
|
wrapped: Many("b", errs[errWrapped]),
|
|
name: "nested",
|
|
}, {
|
|
want: errs[errNil],
|
|
wrapped: Many("c", errs[errNil]),
|
|
name: "nil passed",
|
|
}, {
|
|
want: nil,
|
|
wrapped: Many("d"),
|
|
name: "nil not passed",
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
assert.Equal(t, tc.want, errors.Unwrap(tc.wrapped), tc.name)
|
|
}
|
|
}
|
|
|
|
func TestAnnotate(t *testing.T) {
|
|
const s = "1234"
|
|
const wantMsg = `bad string "1234": test`
|
|
|
|
// Don't use const, because we can't take a pointer of a constant.
|
|
var errTest error = Error("test")
|
|
|
|
t.Run("nil", func(t *testing.T) {
|
|
var errPtr *error
|
|
assert.NotPanics(t, func() {
|
|
Annotate("bad string %q: %w", errPtr, s)
|
|
})
|
|
})
|
|
|
|
t.Run("non_nil", func(t *testing.T) {
|
|
errPtr := &errTest
|
|
assert.NotPanics(t, func() {
|
|
Annotate("bad string %q: %w", errPtr, s)
|
|
})
|
|
|
|
require.NotNil(t, errPtr)
|
|
|
|
err := *errPtr
|
|
require.NotNil(t, err)
|
|
|
|
assert.Equal(t, wantMsg, err.Error())
|
|
})
|
|
|
|
t.Run("defer", func(t *testing.T) {
|
|
f := func() (err error) {
|
|
defer Annotate("bad string %q: %w", &errTest, s)
|
|
|
|
return errTest
|
|
}
|
|
|
|
err := f()
|
|
require.NotNil(t, err)
|
|
|
|
assert.Equal(t, wantMsg, err.Error())
|
|
})
|
|
}
|
|
|
|
func TestLogPanic(t *testing.T) {
|
|
buf := &bytes.Buffer{}
|
|
aghtest.ReplaceLogWriter(t, buf)
|
|
|
|
t.Run("prefix", func(t *testing.T) {
|
|
const (
|
|
panicMsg = "spooky!"
|
|
prefix = "packagename"
|
|
errWithNoPrefix = "[error] recovered from panic: spooky!"
|
|
errWithPrefix = "[error] packagename: recovered from panic: spooky!"
|
|
)
|
|
|
|
panicFunc := func(prefix string) {
|
|
defer LogPanic(prefix)
|
|
|
|
panic(panicMsg)
|
|
}
|
|
|
|
panicFunc("")
|
|
assert.Contains(t, buf.String(), errWithNoPrefix)
|
|
buf.Reset()
|
|
|
|
panicFunc(prefix)
|
|
assert.Contains(t, buf.String(), errWithPrefix)
|
|
buf.Reset()
|
|
})
|
|
|
|
t.Run("don't_panic", func(t *testing.T) {
|
|
require.NotPanics(t, func() {
|
|
defer LogPanic("")
|
|
})
|
|
|
|
assert.Empty(t, buf.String())
|
|
})
|
|
}
|