From ee91a6084f70873c3e57621a78a6724644bdeddc Mon Sep 17 00:00:00 2001 From: Stanislav Chzhen Date: Tue, 11 Mar 2025 19:40:14 +0300 Subject: [PATCH] Pull request 2361: imp-test-file-names Merge in DNS/adguard-home from imp-test-file-names to master Squashed commit of the following: commit a0827efdf633fba012c5eb0e0f69eaabf7629724 Author: Stanislav Chzhen Date: Mon Mar 10 21:41:46 2025 +0300 all: imp tests commit 21fc274d9276ce0442572261ea39a1c018490870 Author: Stanislav Chzhen Date: Mon Mar 10 19:40:40 2025 +0300 all: imp test file names --- internal/aghalg/sortedmap_test.go | 9 +-- internal/aghnet/hostgen_test.go | 7 +- internal/aghnet/interfaces_test.go | 68 +++++++++++-------- internal/aghnet/ipmut_test.go | 7 +- ...in_test.go => net_darwin_internal_test.go} | 2 + ...d_test.go => net_freebsd_internal_test.go} | 0 ...nux_test.go => net_linux_internal_test.go} | 0 ...d_test.go => net_openbsd_internal_test.go} | 0 .../aghos/{os_test.go => os_internal_test.go} | 0 ...bitset_test.go => bitset_internal_test.go} | 0 ...test.go => broadcast_bsd_internal_test.go} | 0 ...t.go => broadcast_others_internal_test.go} | 0 ...ix_test.go => dhcpd_unix_internal_test.go} | 0 ..._test.go => http_windows_internal_test.go} | 0 ...range_test.go => iprange_internal_test.go} | 0 ..._test.go => options_unix_internal_test.go} | 0 ..._unix_test.go => v4_unix_internal_test.go} | 0 ..._unix_test.go => v6_unix_internal_test.go} | 0 ...access_test.go => access_internal_test.go} | 0 ...ntid_test.go => clientid_internal_test.go} | 0 ...config_test.go => config_internal_test.go} | 0 .../{dns64_test.go => dns64_internal_test.go} | 0 ...rd_test.go => dnsforward_internal_test.go} | 0 ...te_test.go => dnsrewrite_internal_test.go} | 0 ...filter_test.go => filter_internal_test.go} | 0 .../{http_test.go => http_internal_test.go} | 0 .../{stats_test.go => stats_internal_test.go} | 0 ...cbmsg_test.go => svcbmsg_internal_test.go} | 0 internal/filtering/dnsrewrite_test.go | 34 +++++++--- ...filter_test.go => filter_internal_test.go} | 0 ...ing_test.go => filtering_internal_test.go} | 0 internal/filtering/hosts_test.go | 29 ++++---- .../{http_test.go => http_internal_test.go} | 0 ...orage_test.go => storage_internal_test.go} | 0 ...ites_test.go => rewrites_internal_test.go} | 0 ...et_test.go => authglinet_internal_test.go} | 0 ...st.go => authratelimiter_internal_test.go} | 0 .../{home_test.go => home_internal_test.go} | 0 ...s_test.go => middlewares_internal_test.go} | 0 ...tions_test.go => options_internal_test.go} | 0 ...decode_test.go => decode_internal_test.go} | 0 .../{qlog_test.go => qlog_internal_test.go} | 0 ...file_test.go => qlogfile_internal_test.go} | 0 ...er_test.go => qlogreader_internal_test.go} | 0 ...search_test.go => search_internal_test.go} | 0 .../{http_test.go => http_internal_test.go} | 0 46 files changed, 93 insertions(+), 63 deletions(-) rename internal/aghnet/{net_darwin_test.go => net_darwin_internal_test.go} (99%) rename internal/aghnet/{net_freebsd_test.go => net_freebsd_internal_test.go} (100%) rename internal/aghnet/{net_linux_test.go => net_linux_internal_test.go} (100%) rename internal/aghnet/{net_openbsd_test.go => net_openbsd_internal_test.go} (100%) rename internal/aghos/{os_test.go => os_internal_test.go} (100%) rename internal/dhcpd/{bitset_test.go => bitset_internal_test.go} (100%) rename internal/dhcpd/{broadcast_bsd_test.go => broadcast_bsd_internal_test.go} (100%) rename internal/dhcpd/{broadcast_others_test.go => broadcast_others_internal_test.go} (100%) rename internal/dhcpd/{dhcpd_unix_test.go => dhcpd_unix_internal_test.go} (100%) rename internal/dhcpd/{http_windows_test.go => http_windows_internal_test.go} (100%) rename internal/dhcpd/{iprange_test.go => iprange_internal_test.go} (100%) rename internal/dhcpd/{options_unix_test.go => options_unix_internal_test.go} (100%) rename internal/dhcpd/{v4_unix_test.go => v4_unix_internal_test.go} (100%) rename internal/dhcpd/{v6_unix_test.go => v6_unix_internal_test.go} (100%) rename internal/dnsforward/{access_test.go => access_internal_test.go} (100%) rename internal/dnsforward/{clientid_test.go => clientid_internal_test.go} (100%) rename internal/dnsforward/{config_test.go => config_internal_test.go} (100%) rename internal/dnsforward/{dns64_test.go => dns64_internal_test.go} (100%) rename internal/dnsforward/{dnsforward_test.go => dnsforward_internal_test.go} (100%) rename internal/dnsforward/{dnsrewrite_test.go => dnsrewrite_internal_test.go} (100%) rename internal/dnsforward/{filter_test.go => filter_internal_test.go} (100%) rename internal/dnsforward/{http_test.go => http_internal_test.go} (100%) rename internal/dnsforward/{stats_test.go => stats_internal_test.go} (100%) rename internal/dnsforward/{svcbmsg_test.go => svcbmsg_internal_test.go} (100%) rename internal/filtering/{filter_test.go => filter_internal_test.go} (100%) rename internal/filtering/{filtering_test.go => filtering_internal_test.go} (100%) rename internal/filtering/{http_test.go => http_internal_test.go} (100%) rename internal/filtering/rewrite/{storage_test.go => storage_internal_test.go} (100%) rename internal/filtering/{rewrites_test.go => rewrites_internal_test.go} (100%) rename internal/home/{authglinet_test.go => authglinet_internal_test.go} (100%) rename internal/home/{authratelimiter_test.go => authratelimiter_internal_test.go} (100%) rename internal/home/{home_test.go => home_internal_test.go} (100%) rename internal/home/{middlewares_test.go => middlewares_internal_test.go} (100%) rename internal/home/{options_test.go => options_internal_test.go} (100%) rename internal/querylog/{decode_test.go => decode_internal_test.go} (100%) rename internal/querylog/{qlog_test.go => qlog_internal_test.go} (100%) rename internal/querylog/{qlogfile_test.go => qlogfile_internal_test.go} (100%) rename internal/querylog/{qlogreader_test.go => qlogreader_internal_test.go} (100%) rename internal/querylog/{search_test.go => search_internal_test.go} (100%) rename internal/stats/{http_test.go => http_internal_test.go} (100%) diff --git a/internal/aghalg/sortedmap_test.go b/internal/aghalg/sortedmap_test.go index 6e563802..a3806639 100644 --- a/internal/aghalg/sortedmap_test.go +++ b/internal/aghalg/sortedmap_test.go @@ -1,14 +1,15 @@ -package aghalg +package aghalg_test import ( "strings" "testing" + "github.com/AdguardTeam/AdGuardHome/internal/aghalg" "github.com/stretchr/testify/assert" ) func TestNewSortedMap(t *testing.T) { - var m SortedMap[string, int] + var m aghalg.SortedMap[string, int] letters := []string{} for i := range 10 { @@ -17,7 +18,7 @@ func TestNewSortedMap(t *testing.T) { } t.Run("create_and_fill", func(t *testing.T) { - m = NewSortedMap[string, int](strings.Compare) + m = aghalg.NewSortedMap[string, int](strings.Compare) nums := []int{} for i, r := range letters { @@ -68,7 +69,7 @@ func TestNewSortedMap_nil(t *testing.T) { val = "val" ) - var m SortedMap[string, string] + var m aghalg.SortedMap[string, string] assert.Panics(t, func() { m.Set(key, val) diff --git a/internal/aghnet/hostgen_test.go b/internal/aghnet/hostgen_test.go index 5896720d..8ac43872 100644 --- a/internal/aghnet/hostgen_test.go +++ b/internal/aghnet/hostgen_test.go @@ -1,9 +1,10 @@ -package aghnet +package aghnet_test import ( "net/netip" "testing" + "github.com/AdguardTeam/AdGuardHome/internal/aghnet" "github.com/stretchr/testify/assert" ) @@ -29,13 +30,13 @@ func TestGenerateHostName(t *testing.T) { for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { - hostname := GenerateHostname(tc.ip) + hostname := aghnet.GenerateHostname(tc.ip) assert.Equal(t, tc.want, hostname) }) } }) t.Run("invalid", func(t *testing.T) { - assert.Panics(t, func() { GenerateHostname(netip.Addr{}) }) + assert.Panics(t, func() { aghnet.GenerateHostname(netip.Addr{}) }) }) } diff --git a/internal/aghnet/interfaces_test.go b/internal/aghnet/interfaces_test.go index ca829fb1..83bb81d5 100644 --- a/internal/aghnet/interfaces_test.go +++ b/internal/aghnet/interfaces_test.go @@ -1,22 +1,24 @@ -package aghnet +package aghnet_test import ( "net" "testing" + "github.com/AdguardTeam/AdGuardHome/internal/aghnet" "github.com/AdguardTeam/golibs/errors" "github.com/AdguardTeam/golibs/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) -// fakeIface is a stub implementation of aghnet.NetIface to simplify testing. +// fakeIface is a stub implementation of [aghnet.NetIface] interface to simplify +// testing. type fakeIface struct { err error addrs []net.Addr } -// Addrs implements the NetIface interface for *fakeIface. +// Addrs implements the [aghnet.NetIface] interface for *fakeIface. func (iface *fakeIface) Addrs() (addrs []net.Addr, err error) { if iface.err != nil { return nil, iface.err @@ -25,6 +27,9 @@ func (iface *fakeIface) Addrs() (addrs []net.Addr, err error) { return iface.addrs, nil } +// type check +var _ aghnet.NetIface = (*fakeIface)(nil) + func TestIfaceIPAddrs(t *testing.T) { const errTest errors.Error = "test error" @@ -35,76 +40,76 @@ func TestIfaceIPAddrs(t *testing.T) { addr6 := &net.IPNet{IP: ip6} testCases := []struct { - iface NetIface + iface aghnet.NetIface name string wantErrMsg string want []net.IP - ipv IPVersion + ipv aghnet.IPVersion }{{ iface: &fakeIface{addrs: []net.Addr{addr4}, err: nil}, name: "ipv4_success", wantErrMsg: "", want: []net.IP{ip4}, - ipv: IPVersion4, + ipv: aghnet.IPVersion4, }, { iface: &fakeIface{addrs: []net.Addr{addr6, addr4}, err: nil}, name: "ipv4_success_with_ipv6", wantErrMsg: "", want: []net.IP{ip4}, - ipv: IPVersion4, + ipv: aghnet.IPVersion4, }, { iface: &fakeIface{addrs: []net.Addr{addr4}, err: errTest}, name: "ipv4_error", wantErrMsg: errTest.Error(), want: nil, - ipv: IPVersion4, + ipv: aghnet.IPVersion4, }, { iface: &fakeIface{addrs: []net.Addr{addr6}, err: nil}, name: "ipv6_success", wantErrMsg: "", want: []net.IP{ip6}, - ipv: IPVersion6, + ipv: aghnet.IPVersion6, }, { iface: &fakeIface{addrs: []net.Addr{addr6, addr4}, err: nil}, name: "ipv6_success_with_ipv4", wantErrMsg: "", want: []net.IP{ip6}, - ipv: IPVersion6, + ipv: aghnet.IPVersion6, }, { iface: &fakeIface{addrs: []net.Addr{addr6}, err: errTest}, name: "ipv6_error", wantErrMsg: errTest.Error(), want: nil, - ipv: IPVersion6, + ipv: aghnet.IPVersion6, }, { iface: &fakeIface{addrs: nil, err: nil}, name: "bad_proto", wantErrMsg: "invalid ip version 10", want: nil, - ipv: IPVersion6 + IPVersion4, + ipv: aghnet.IPVersion6 + aghnet.IPVersion4, }, { iface: &fakeIface{addrs: []net.Addr{&net.IPAddr{IP: ip4}}, err: nil}, name: "ipaddr_v4", wantErrMsg: "", want: []net.IP{ip4}, - ipv: IPVersion4, + ipv: aghnet.IPVersion4, }, { iface: &fakeIface{addrs: []net.Addr{&net.IPAddr{IP: ip6, Zone: ""}}, err: nil}, name: "ipaddr_v6", wantErrMsg: "", want: []net.IP{ip6}, - ipv: IPVersion6, + ipv: aghnet.IPVersion6, }, { iface: &fakeIface{addrs: []net.Addr{&net.UnixAddr{}}, err: nil}, name: "non-ipv4", wantErrMsg: "", want: nil, - ipv: IPVersion4, + ipv: aghnet.IPVersion4, }} for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { - got, err := IfaceIPAddrs(tc.iface, tc.ipv) + got, err := aghnet.IfaceIPAddrs(tc.iface, tc.ipv) testutil.AssertErrorMsg(t, tc.wantErrMsg, err) assert.Equal(t, tc.want, got) @@ -118,7 +123,10 @@ type waitingFakeIface struct { n int } -// Addrs implements the NetIface interface for *waitingFakeIface. +// type check +var _ aghnet.NetIface = (*waitingFakeIface)(nil) + +// Addrs implements the [aghnet.NetIface] interface for *waitingFakeIface. func (iface *waitingFakeIface) Addrs() (addrs []net.Addr, err error) { if iface.err != nil { return nil, iface.err @@ -143,76 +151,76 @@ func TestIfaceDNSIPAddrs(t *testing.T) { addr6 := &net.IPNet{IP: ip6} testCases := []struct { - iface NetIface + iface aghnet.NetIface wantErr error name string want []net.IP - ipv IPVersion + ipv aghnet.IPVersion }{{ name: "ipv4_success", iface: &fakeIface{addrs: []net.Addr{addr4}, err: nil}, - ipv: IPVersion4, + ipv: aghnet.IPVersion4, want: []net.IP{ip4, ip4}, wantErr: nil, }, { name: "ipv4_success_with_ipv6", iface: &fakeIface{addrs: []net.Addr{addr6, addr4}, err: nil}, - ipv: IPVersion4, + ipv: aghnet.IPVersion4, want: []net.IP{ip4, ip4}, wantErr: nil, }, { name: "ipv4_error", iface: &fakeIface{addrs: []net.Addr{addr4}, err: errTest}, - ipv: IPVersion4, + ipv: aghnet.IPVersion4, want: nil, wantErr: errTest, }, { name: "ipv4_wait", iface: &waitingFakeIface{addrs: []net.Addr{addr4}, err: nil, n: 1}, - ipv: IPVersion4, + ipv: aghnet.IPVersion4, want: []net.IP{ip4, ip4}, wantErr: nil, }, { name: "ipv6_success", iface: &fakeIface{addrs: []net.Addr{addr6}, err: nil}, - ipv: IPVersion6, + ipv: aghnet.IPVersion6, want: []net.IP{ip6, ip6}, wantErr: nil, }, { name: "ipv6_success_with_ipv4", iface: &fakeIface{addrs: []net.Addr{addr6, addr4}, err: nil}, - ipv: IPVersion6, + ipv: aghnet.IPVersion6, want: []net.IP{ip6, ip6}, wantErr: nil, }, { name: "ipv6_error", iface: &fakeIface{addrs: []net.Addr{addr6}, err: errTest}, - ipv: IPVersion6, + ipv: aghnet.IPVersion6, want: nil, wantErr: errTest, }, { name: "ipv6_wait", iface: &waitingFakeIface{addrs: []net.Addr{addr6}, err: nil, n: 1}, - ipv: IPVersion6, + ipv: aghnet.IPVersion6, want: []net.IP{ip6, ip6}, wantErr: nil, }, { name: "empty", iface: &fakeIface{addrs: nil, err: nil}, - ipv: IPVersion4, + ipv: aghnet.IPVersion4, want: nil, wantErr: nil, }, { name: "many", iface: &fakeIface{addrs: []net.Addr{addr4, addr4}}, - ipv: IPVersion4, + ipv: aghnet.IPVersion4, want: []net.IP{ip4, ip4}, wantErr: nil, }} for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { - got, err := IfaceDNSIPAddrs(tc.iface, tc.ipv, 2, 0) + got, err := aghnet.IfaceDNSIPAddrs(tc.iface, tc.ipv, 2, 0) require.ErrorIs(t, err, tc.wantErr) assert.Equal(t, tc.want, got) diff --git a/internal/aghnet/ipmut_test.go b/internal/aghnet/ipmut_test.go index 51fc16ba..10beee3f 100644 --- a/internal/aghnet/ipmut_test.go +++ b/internal/aghnet/ipmut_test.go @@ -1,9 +1,10 @@ -package aghnet +package aghnet_test import ( "net" "testing" + "github.com/AdguardTeam/AdGuardHome/internal/aghnet" "github.com/AdguardTeam/golibs/netutil" "github.com/stretchr/testify/assert" ) @@ -18,7 +19,7 @@ func TestIPMut(t *testing.T) { }} t.Run("nil_no_mut", func(t *testing.T) { - ipmut := NewIPMut(nil) + ipmut := aghnet.NewIPMut(nil) ips := netutil.CloneIPs(testIPs) for i := range ips { @@ -28,7 +29,7 @@ func TestIPMut(t *testing.T) { }) t.Run("not_nil_mut", func(t *testing.T) { - ipmut := NewIPMut(func(ip net.IP) { + ipmut := aghnet.NewIPMut(func(ip net.IP) { for i := range ip { ip[i] = 0 } diff --git a/internal/aghnet/net_darwin_test.go b/internal/aghnet/net_darwin_internal_test.go similarity index 99% rename from internal/aghnet/net_darwin_test.go rename to internal/aghnet/net_darwin_internal_test.go index 06e7eeaf..7593a969 100644 --- a/internal/aghnet/net_darwin_test.go +++ b/internal/aghnet/net_darwin_internal_test.go @@ -1,3 +1,5 @@ +//go:build darwin + package aghnet import ( diff --git a/internal/aghnet/net_freebsd_test.go b/internal/aghnet/net_freebsd_internal_test.go similarity index 100% rename from internal/aghnet/net_freebsd_test.go rename to internal/aghnet/net_freebsd_internal_test.go diff --git a/internal/aghnet/net_linux_test.go b/internal/aghnet/net_linux_internal_test.go similarity index 100% rename from internal/aghnet/net_linux_test.go rename to internal/aghnet/net_linux_internal_test.go diff --git a/internal/aghnet/net_openbsd_test.go b/internal/aghnet/net_openbsd_internal_test.go similarity index 100% rename from internal/aghnet/net_openbsd_test.go rename to internal/aghnet/net_openbsd_internal_test.go diff --git a/internal/aghos/os_test.go b/internal/aghos/os_internal_test.go similarity index 100% rename from internal/aghos/os_test.go rename to internal/aghos/os_internal_test.go diff --git a/internal/dhcpd/bitset_test.go b/internal/dhcpd/bitset_internal_test.go similarity index 100% rename from internal/dhcpd/bitset_test.go rename to internal/dhcpd/bitset_internal_test.go diff --git a/internal/dhcpd/broadcast_bsd_test.go b/internal/dhcpd/broadcast_bsd_internal_test.go similarity index 100% rename from internal/dhcpd/broadcast_bsd_test.go rename to internal/dhcpd/broadcast_bsd_internal_test.go diff --git a/internal/dhcpd/broadcast_others_test.go b/internal/dhcpd/broadcast_others_internal_test.go similarity index 100% rename from internal/dhcpd/broadcast_others_test.go rename to internal/dhcpd/broadcast_others_internal_test.go diff --git a/internal/dhcpd/dhcpd_unix_test.go b/internal/dhcpd/dhcpd_unix_internal_test.go similarity index 100% rename from internal/dhcpd/dhcpd_unix_test.go rename to internal/dhcpd/dhcpd_unix_internal_test.go diff --git a/internal/dhcpd/http_windows_test.go b/internal/dhcpd/http_windows_internal_test.go similarity index 100% rename from internal/dhcpd/http_windows_test.go rename to internal/dhcpd/http_windows_internal_test.go diff --git a/internal/dhcpd/iprange_test.go b/internal/dhcpd/iprange_internal_test.go similarity index 100% rename from internal/dhcpd/iprange_test.go rename to internal/dhcpd/iprange_internal_test.go diff --git a/internal/dhcpd/options_unix_test.go b/internal/dhcpd/options_unix_internal_test.go similarity index 100% rename from internal/dhcpd/options_unix_test.go rename to internal/dhcpd/options_unix_internal_test.go diff --git a/internal/dhcpd/v4_unix_test.go b/internal/dhcpd/v4_unix_internal_test.go similarity index 100% rename from internal/dhcpd/v4_unix_test.go rename to internal/dhcpd/v4_unix_internal_test.go diff --git a/internal/dhcpd/v6_unix_test.go b/internal/dhcpd/v6_unix_internal_test.go similarity index 100% rename from internal/dhcpd/v6_unix_test.go rename to internal/dhcpd/v6_unix_internal_test.go diff --git a/internal/dnsforward/access_test.go b/internal/dnsforward/access_internal_test.go similarity index 100% rename from internal/dnsforward/access_test.go rename to internal/dnsforward/access_internal_test.go diff --git a/internal/dnsforward/clientid_test.go b/internal/dnsforward/clientid_internal_test.go similarity index 100% rename from internal/dnsforward/clientid_test.go rename to internal/dnsforward/clientid_internal_test.go diff --git a/internal/dnsforward/config_test.go b/internal/dnsforward/config_internal_test.go similarity index 100% rename from internal/dnsforward/config_test.go rename to internal/dnsforward/config_internal_test.go diff --git a/internal/dnsforward/dns64_test.go b/internal/dnsforward/dns64_internal_test.go similarity index 100% rename from internal/dnsforward/dns64_test.go rename to internal/dnsforward/dns64_internal_test.go diff --git a/internal/dnsforward/dnsforward_test.go b/internal/dnsforward/dnsforward_internal_test.go similarity index 100% rename from internal/dnsforward/dnsforward_test.go rename to internal/dnsforward/dnsforward_internal_test.go diff --git a/internal/dnsforward/dnsrewrite_test.go b/internal/dnsforward/dnsrewrite_internal_test.go similarity index 100% rename from internal/dnsforward/dnsrewrite_test.go rename to internal/dnsforward/dnsrewrite_internal_test.go diff --git a/internal/dnsforward/filter_test.go b/internal/dnsforward/filter_internal_test.go similarity index 100% rename from internal/dnsforward/filter_test.go rename to internal/dnsforward/filter_internal_test.go diff --git a/internal/dnsforward/http_test.go b/internal/dnsforward/http_internal_test.go similarity index 100% rename from internal/dnsforward/http_test.go rename to internal/dnsforward/http_internal_test.go diff --git a/internal/dnsforward/stats_test.go b/internal/dnsforward/stats_internal_test.go similarity index 100% rename from internal/dnsforward/stats_test.go rename to internal/dnsforward/stats_internal_test.go diff --git a/internal/dnsforward/svcbmsg_test.go b/internal/dnsforward/svcbmsg_internal_test.go similarity index 100% rename from internal/dnsforward/svcbmsg_test.go rename to internal/dnsforward/svcbmsg_internal_test.go diff --git a/internal/filtering/dnsrewrite_test.go b/internal/filtering/dnsrewrite_test.go index 06cd921b..89b6b30d 100644 --- a/internal/filtering/dnsrewrite_test.go +++ b/internal/filtering/dnsrewrite_test.go @@ -1,10 +1,11 @@ -package filtering +package filtering_test import ( "net/netip" "path" "testing" + "github.com/AdguardTeam/AdGuardHome/internal/filtering" "github.com/AdguardTeam/golibs/netutil" "github.com/miekg/dns" "github.com/stretchr/testify/assert" @@ -50,8 +51,17 @@ func TestDNSFilter_CheckHostRules_dnsrewrite(t *testing.T) { |1.2.3.5.in-addr.arpa^$dnsrewrite=NOERROR;PTR;new-ptr-with-dot. ` - f, _ := newForTest(t, nil, []Filter{{ID: 0, Data: []byte(text)}}) - setts := &Settings{ + conf := &filtering.Config{ + SafeBrowsingCacheSize: 10000, + ParentalCacheSize: 10000, + SafeSearchCacheSize: 1000, + CacheTime: 30, + } + + f, err := filtering.New(conf, []filtering.Filter{{ID: 0, Data: []byte(text)}}) + require.NoError(t, err) + + setts := &filtering.Settings{ FilteringEnabled: true, } @@ -117,7 +127,8 @@ func TestDNSFilter_CheckHostRules_dnsrewrite(t *testing.T) { t.Run(tc.name, func(t *testing.T) { host := path.Base(tc.name) - res, err := f.CheckHostRules(host, tc.dtyp, setts) + var res filtering.Result + res, err = f.CheckHostRules(host, tc.dtyp, setts) require.NoError(t, err) dnsrr := res.DNSRewriteResult @@ -141,7 +152,8 @@ func TestDNSFilter_CheckHostRules_dnsrewrite(t *testing.T) { dtyp := dns.TypeA host := path.Base(t.Name()) - res, err := f.CheckHostRules(host, dtyp, setts) + var res filtering.Result + res, err = f.CheckHostRules(host, dtyp, setts) require.NoError(t, err) assert.Equal(t, "new-cname", res.CanonName) @@ -151,7 +163,8 @@ func TestDNSFilter_CheckHostRules_dnsrewrite(t *testing.T) { dtyp := dns.TypeA host := path.Base(t.Name()) - res, err := f.CheckHostRules(host, dtyp, setts) + var res filtering.Result + res, err = f.CheckHostRules(host, dtyp, setts) require.NoError(t, err) assert.Equal(t, "new-cname-2", res.CanonName) @@ -162,7 +175,8 @@ func TestDNSFilter_CheckHostRules_dnsrewrite(t *testing.T) { dtyp := dns.TypeA host := path.Base(t.Name()) - res, err := f.CheckHostRules(host, dtyp, setts) + var res filtering.Result + res, err = f.CheckHostRules(host, dtyp, setts) require.NoError(t, err) assert.Empty(t, res.CanonName) @@ -173,7 +187,8 @@ func TestDNSFilter_CheckHostRules_dnsrewrite(t *testing.T) { dtyp := dns.TypePTR host := path.Base(t.Name()) - res, err := f.CheckHostRules(host, dtyp, setts) + var res filtering.Result + res, err = f.CheckHostRules(host, dtyp, setts) require.NoError(t, err) require.NotNil(t, res.DNSRewriteResult) @@ -193,7 +208,8 @@ func TestDNSFilter_CheckHostRules_dnsrewrite(t *testing.T) { dtyp := dns.TypePTR host := path.Base(t.Name()) - res, err := f.CheckHostRules(host, dtyp, setts) + var res filtering.Result + res, err = f.CheckHostRules(host, dtyp, setts) require.NoError(t, err) require.NotNil(t, res.DNSRewriteResult) diff --git a/internal/filtering/filter_test.go b/internal/filtering/filter_internal_test.go similarity index 100% rename from internal/filtering/filter_test.go rename to internal/filtering/filter_internal_test.go diff --git a/internal/filtering/filtering_test.go b/internal/filtering/filtering_internal_test.go similarity index 100% rename from internal/filtering/filtering_test.go rename to internal/filtering/filtering_internal_test.go diff --git a/internal/filtering/hosts_test.go b/internal/filtering/hosts_test.go index e94603a0..14e20adc 100644 --- a/internal/filtering/hosts_test.go +++ b/internal/filtering/hosts_test.go @@ -1,4 +1,4 @@ -package filtering +package filtering_test import ( "fmt" @@ -8,6 +8,7 @@ import ( "github.com/AdguardTeam/AdGuardHome/internal/aghnet" "github.com/AdguardTeam/AdGuardHome/internal/aghtest" + "github.com/AdguardTeam/AdGuardHome/internal/filtering" "github.com/AdguardTeam/AdGuardHome/internal/filtering/rulelist" "github.com/AdguardTeam/golibs/testutil" "github.com/AdguardTeam/urlfilter/rules" @@ -50,27 +51,27 @@ func TestDNSFilter_CheckHost_hostsContainer(t *testing.T) { require.NoError(t, err) testutil.CleanupAndRequireSuccess(t, hc.Close) - conf := &Config{ + conf := &filtering.Config{ EtcHosts: hc, } - f, err := New(conf, nil) + f, err := filtering.New(conf, nil) require.NoError(t, err) - setts := &Settings{ + setts := &filtering.Settings{ FilteringEnabled: true, } testCases := []struct { name string host string - wantRules []*ResultRule + wantRules []*filtering.ResultRule wantResps []rules.RRValue dtyp uint16 }{{ name: "v4", host: "v4.host.example", dtyp: dns.TypeA, - wantRules: []*ResultRule{{ + wantRules: []*filtering.ResultRule{{ Text: "1.2.3.4 v4.host.example", FilterListID: rulelist.URLFilterIDEtcHosts, }}, @@ -79,7 +80,7 @@ func TestDNSFilter_CheckHost_hostsContainer(t *testing.T) { name: "v6", host: "v6.host.example", dtyp: dns.TypeAAAA, - wantRules: []*ResultRule{{ + wantRules: []*filtering.ResultRule{{ Text: "::1 v6.host.example", FilterListID: rulelist.URLFilterIDEtcHosts, }}, @@ -88,7 +89,7 @@ func TestDNSFilter_CheckHost_hostsContainer(t *testing.T) { name: "mapped", host: "mapped.host.example", dtyp: dns.TypeAAAA, - wantRules: []*ResultRule{{ + wantRules: []*filtering.ResultRule{{ Text: "::ffff:1.2.3.4 mapped.host.example", FilterListID: rulelist.URLFilterIDEtcHosts, }}, @@ -97,7 +98,7 @@ func TestDNSFilter_CheckHost_hostsContainer(t *testing.T) { name: "ptr", host: "4.3.2.1.in-addr.arpa", dtyp: dns.TypePTR, - wantRules: []*ResultRule{{ + wantRules: []*filtering.ResultRule{{ Text: "1.2.3.4 v4.host.example", FilterListID: rulelist.URLFilterIDEtcHosts, }}, @@ -106,7 +107,7 @@ func TestDNSFilter_CheckHost_hostsContainer(t *testing.T) { name: "ptr-mapped", host: "4.0.3.0.2.0.1.0.f.f.f.f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa", dtyp: dns.TypePTR, - wantRules: []*ResultRule{{ + wantRules: []*filtering.ResultRule{{ Text: "::ffff:1.2.3.4 mapped.host.example", FilterListID: rulelist.URLFilterIDEtcHosts, }}, @@ -133,7 +134,7 @@ func TestDNSFilter_CheckHost_hostsContainer(t *testing.T) { name: "v4_mismatch", host: "v4.host.example", dtyp: dns.TypeAAAA, - wantRules: []*ResultRule{{ + wantRules: []*filtering.ResultRule{{ Text: fmt.Sprintf("%s v4.host.example", addrv4), FilterListID: rulelist.URLFilterIDEtcHosts, }}, @@ -142,7 +143,7 @@ func TestDNSFilter_CheckHost_hostsContainer(t *testing.T) { name: "v6_mismatch", host: "v6.host.example", dtyp: dns.TypeA, - wantRules: []*ResultRule{{ + wantRules: []*filtering.ResultRule{{ Text: fmt.Sprintf("%s v6.host.example", addrv6), FilterListID: rulelist.URLFilterIDEtcHosts, }}, @@ -163,7 +164,7 @@ func TestDNSFilter_CheckHost_hostsContainer(t *testing.T) { name: "v4_dup", host: "v4.host.with-dup", dtyp: dns.TypeA, - wantRules: []*ResultRule{{ + wantRules: []*filtering.ResultRule{{ Text: "4.3.2.1 v4.host.with-dup", FilterListID: rulelist.URLFilterIDEtcHosts, }}, @@ -172,7 +173,7 @@ func TestDNSFilter_CheckHost_hostsContainer(t *testing.T) { for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { - var res Result + var res filtering.Result res, err = f.CheckHost(tc.host, tc.dtyp, setts) require.NoError(t, err) diff --git a/internal/filtering/http_test.go b/internal/filtering/http_internal_test.go similarity index 100% rename from internal/filtering/http_test.go rename to internal/filtering/http_internal_test.go diff --git a/internal/filtering/rewrite/storage_test.go b/internal/filtering/rewrite/storage_internal_test.go similarity index 100% rename from internal/filtering/rewrite/storage_test.go rename to internal/filtering/rewrite/storage_internal_test.go diff --git a/internal/filtering/rewrites_test.go b/internal/filtering/rewrites_internal_test.go similarity index 100% rename from internal/filtering/rewrites_test.go rename to internal/filtering/rewrites_internal_test.go diff --git a/internal/home/authglinet_test.go b/internal/home/authglinet_internal_test.go similarity index 100% rename from internal/home/authglinet_test.go rename to internal/home/authglinet_internal_test.go diff --git a/internal/home/authratelimiter_test.go b/internal/home/authratelimiter_internal_test.go similarity index 100% rename from internal/home/authratelimiter_test.go rename to internal/home/authratelimiter_internal_test.go diff --git a/internal/home/home_test.go b/internal/home/home_internal_test.go similarity index 100% rename from internal/home/home_test.go rename to internal/home/home_internal_test.go diff --git a/internal/home/middlewares_test.go b/internal/home/middlewares_internal_test.go similarity index 100% rename from internal/home/middlewares_test.go rename to internal/home/middlewares_internal_test.go diff --git a/internal/home/options_test.go b/internal/home/options_internal_test.go similarity index 100% rename from internal/home/options_test.go rename to internal/home/options_internal_test.go diff --git a/internal/querylog/decode_test.go b/internal/querylog/decode_internal_test.go similarity index 100% rename from internal/querylog/decode_test.go rename to internal/querylog/decode_internal_test.go diff --git a/internal/querylog/qlog_test.go b/internal/querylog/qlog_internal_test.go similarity index 100% rename from internal/querylog/qlog_test.go rename to internal/querylog/qlog_internal_test.go diff --git a/internal/querylog/qlogfile_test.go b/internal/querylog/qlogfile_internal_test.go similarity index 100% rename from internal/querylog/qlogfile_test.go rename to internal/querylog/qlogfile_internal_test.go diff --git a/internal/querylog/qlogreader_test.go b/internal/querylog/qlogreader_internal_test.go similarity index 100% rename from internal/querylog/qlogreader_test.go rename to internal/querylog/qlogreader_internal_test.go diff --git a/internal/querylog/search_test.go b/internal/querylog/search_internal_test.go similarity index 100% rename from internal/querylog/search_test.go rename to internal/querylog/search_internal_test.go diff --git a/internal/stats/http_test.go b/internal/stats/http_internal_test.go similarity index 100% rename from internal/stats/http_test.go rename to internal/stats/http_internal_test.go