e08a64ebe4
Updates #2624. Updates #3162. Squashed commit of the following: commit 68860da717a23a0bfeba14b7fe10b5e4ad38726d Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jun 29 15:41:33 2021 +0300 all: imp types, names commit ebd4ec26636853d0d58c4e331e6a78feede20813 Merge: 239eb72116e5e09c
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jun 29 15:14:33 2021 +0300 Merge branch 'master' into 2624-clientid-access commit 239eb7215abc47e99a0300a0f4cf56002689b1a9 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jun 29 15:13:10 2021 +0300 all: fix client blocking check commit e6bece3ea8367b3cbe3d90702a3368c870ad4f13 Merge: 9935f2a39d1656b5
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jun 29 13:12:28 2021 +0300 Merge branch 'master' into 2624-clientid-access commit 9935f2a30bcfae2b853f3ef610c0ab7a56a8f448 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jun 29 11:26:51 2021 +0300 client: show block button for client id commit ed786a6a74a081cd89e9d67df3537a4fadd54831 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Jun 25 15:56:23 2021 +0300 client: imp i18n commit 4fed21c68473ad408960c08a7d87624cabce1911 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Jun 25 15:34:09 2021 +0300 all: imp i18n, docs commit 55e65c0d6b939560c53dcb834a4557eb3853d194 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Jun 25 13:34:01 2021 +0300 all: fix cache, imp code, docs, tests commit c1e5a83e76deb44b1f92729bb9ddfcc6a96ac4a8 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Jun 24 19:27:12 2021 +0300 all: allow clientid in access settings
143 lines
2.3 KiB
Go
143 lines
2.3 KiB
Go
package aghnet
|
|
|
|
import (
|
|
"net"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestIPMap_allocs(t *testing.T) {
|
|
ip4 := net.IP{1, 2, 3, 4}
|
|
m := NewIPMap(0)
|
|
m.Set(ip4, 42)
|
|
|
|
t.Run("get", func(t *testing.T) {
|
|
var v interface{}
|
|
var ok bool
|
|
allocs := testing.AllocsPerRun(100, func() {
|
|
v, ok = m.Get(ip4)
|
|
})
|
|
|
|
require.True(t, ok)
|
|
require.Equal(t, 42, v)
|
|
|
|
assert.Equal(t, float64(0), allocs)
|
|
})
|
|
|
|
t.Run("len", func(t *testing.T) {
|
|
var n int
|
|
allocs := testing.AllocsPerRun(100, func() {
|
|
n = m.Len()
|
|
})
|
|
|
|
require.Equal(t, 1, n)
|
|
|
|
assert.Equal(t, float64(0), allocs)
|
|
})
|
|
}
|
|
|
|
func TestIPMap(t *testing.T) {
|
|
ip4 := net.IP{1, 2, 3, 4}
|
|
ip6 := net.IP{
|
|
0x12, 0x34, 0x00, 0x00,
|
|
0x00, 0x00, 0x00, 0x00,
|
|
0x00, 0x00, 0x00, 0x00,
|
|
0x00, 0x00, 0x56, 0x78,
|
|
}
|
|
|
|
val := 42
|
|
|
|
t.Run("nil", func(t *testing.T) {
|
|
var m *IPMap
|
|
|
|
assert.NotPanics(t, func() {
|
|
m.Del(ip4)
|
|
m.Del(ip6)
|
|
})
|
|
|
|
assert.NotPanics(t, func() {
|
|
v, ok := m.Get(ip4)
|
|
assert.Nil(t, v)
|
|
assert.False(t, ok)
|
|
|
|
v, ok = m.Get(ip6)
|
|
assert.Nil(t, v)
|
|
assert.False(t, ok)
|
|
})
|
|
|
|
assert.NotPanics(t, func() {
|
|
assert.Equal(t, 0, m.Len())
|
|
})
|
|
|
|
assert.NotPanics(t, func() {
|
|
n := 0
|
|
m.Range(func(_ net.IP, _ interface{}) (cont bool) {
|
|
n++
|
|
|
|
return true
|
|
})
|
|
|
|
assert.Equal(t, 0, n)
|
|
})
|
|
|
|
assert.Panics(t, func() {
|
|
m.Set(ip4, val)
|
|
})
|
|
|
|
assert.Panics(t, func() {
|
|
m.Set(ip6, val)
|
|
})
|
|
|
|
assert.NotPanics(t, func() {
|
|
sclone := m.ShallowClone()
|
|
assert.Nil(t, sclone)
|
|
})
|
|
})
|
|
|
|
testIPMap := func(t *testing.T, ip net.IP, s string) {
|
|
m := NewIPMap(0)
|
|
assert.Equal(t, 0, m.Len())
|
|
|
|
v, ok := m.Get(ip)
|
|
assert.Nil(t, v)
|
|
assert.False(t, ok)
|
|
|
|
m.Set(ip, val)
|
|
v, ok = m.Get(ip)
|
|
assert.Equal(t, val, v)
|
|
assert.True(t, ok)
|
|
|
|
n := 0
|
|
m.Range(func(ipKey net.IP, v interface{}) (cont bool) {
|
|
assert.Equal(t, ip.To16(), ipKey)
|
|
assert.Equal(t, val, v)
|
|
|
|
n++
|
|
|
|
return false
|
|
})
|
|
assert.Equal(t, 1, n)
|
|
|
|
sclone := m.ShallowClone()
|
|
assert.Equal(t, m, sclone)
|
|
|
|
assert.Equal(t, s, m.String())
|
|
|
|
m.Del(ip)
|
|
v, ok = m.Get(ip)
|
|
assert.Nil(t, v)
|
|
assert.False(t, ok)
|
|
assert.Equal(t, 0, m.Len())
|
|
}
|
|
|
|
t.Run("ipv4", func(t *testing.T) {
|
|
testIPMap(t, ip4, "map[1.2.3.4:42]")
|
|
})
|
|
|
|
t.Run("ipv6", func(t *testing.T) {
|
|
testIPMap(t, ip6, "map[1234::5678:42]")
|
|
})
|
|
}
|