From 3a9d7a36a85cf8ae1098f213186ef83bbc3c56ba Mon Sep 17 00:00:00 2001 From: Max Resnick Date: Wed, 26 Mar 2025 22:21:03 -0700 Subject: fix: domain normalization, output format --- main_test.go | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) (limited to 'main_test.go') diff --git a/main_test.go b/main_test.go index 64c87cd..cd86d0b 100644 --- a/main_test.go +++ b/main_test.go @@ -75,10 +75,7 @@ func TestFetchDomainsAndWrite(t *testing.T) { content: `# comment 0.0.0.0 domain1.com 0.0.0.0 domain2.com`, - want: `server: - local-zone: "domain1.com" refuse - local-zone: "domain2.com" refuse -`, + want: "\tlocal-zone: \"domain1.com\" refuse\n\tlocal-zone: \"domain2.com\" refuse\n", wantSeen: map[string]struct{}{ "domain1.com": {}, "domain2.com": {}, @@ -89,10 +86,7 @@ func TestFetchDomainsAndWrite(t *testing.T) { content: `# comment domain1.com domain2.com`, - want: `server: - local-zone: "domain1.com" refuse - local-zone: "domain2.com" refuse -`, + want: "\tlocal-zone: \"domain1.com\" refuse\n\tlocal-zone: \"domain2.com\" refuse\n", wantSeen: map[string]struct{}{ "domain1.com": {}, "domain2.com": {}, @@ -104,15 +98,28 @@ domain2.com`, 0.0.0.0 domain1.com 0.0.0.0 DOMAIN1.COM domain2.com`, - want: `server: - local-zone: "domain1.com" refuse - local-zone: "domain2.com" refuse -`, + want: "\tlocal-zone: \"domain1.com\" refuse\n\tlocal-zone: \"domain2.com\" refuse\n", wantSeen: map[string]struct{}{ "domain1.com": {}, "domain2.com": {}, }, }, + { + name: "domains with pipe and caret", + content: `||domain1.com^ +||domain2.com^ +0.0.0.0 ||domain3.com^ +||sub.domain4.com^$important +||domain5.com^$third-party`, + want: "\tlocal-zone: \"domain1.com\" refuse\n\tlocal-zone: \"domain2.com\" refuse\n\tlocal-zone: \"domain3.com\" refuse\n\tlocal-zone: \"sub.domain4.com\" refuse\n\tlocal-zone: \"domain5.com\" refuse\n", + wantSeen: map[string]struct{}{ + "domain1.com": {}, + "domain2.com": {}, + "domain3.com": {}, + "sub.domain4.com": {}, + "domain5.com": {}, + }, + }, } for _, tt := range tests { -- cgit v1.2.3