From 9da89c300716bbf714eee9d90939a76bf903a083 Mon Sep 17 00:00:00 2001 From: ThinkChaos Date: Fri, 30 Aug 2024 12:57:11 -0400 Subject: [PATCH] refactor: move util package tests to dedicated package Allow helpertest to use util since only the tests need helpertests, we can use util from there without creating a circular dependency. --- util/arpa_test.go | 3 ++- util/common_test.go | 3 ++- util/context_test.go | 3 ++- util/edns0_test.go | 3 ++- util/http_test.go | 3 ++- util/tls_test.go | 3 ++- util/util_suite_test.go | 2 +- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/util/arpa_test.go b/util/arpa_test.go index d1085a792..14b7b7549 100644 --- a/util/arpa_test.go +++ b/util/arpa_test.go @@ -1,8 +1,9 @@ -package util +package util_test import ( "net" + . "github.com/0xERR0R/blocky/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/common_test.go b/util/common_test.go index f539e5a2e..70ea2c686 100644 --- a/util/common_test.go +++ b/util/common_test.go @@ -1,4 +1,4 @@ -package util +package util_test import ( "context" @@ -12,6 +12,7 @@ import ( "github.com/sirupsen/logrus/hooks/test" . "github.com/0xERR0R/blocky/log" + . "github.com/0xERR0R/blocky/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/context_test.go b/util/context_test.go index ccd3b0db7..d3295c49f 100644 --- a/util/context_test.go +++ b/util/context_test.go @@ -1,9 +1,10 @@ -package util +package util_test import ( "context" "time" + . "github.com/0xERR0R/blocky/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/edns0_test.go b/util/edns0_test.go index 2129bb935..627c6886f 100644 --- a/util/edns0_test.go +++ b/util/edns0_test.go @@ -1,9 +1,10 @@ -package util +package util_test import ( "net" . "github.com/0xERR0R/blocky/helpertest" + . "github.com/0xERR0R/blocky/util" "github.com/miekg/dns" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/util/http_test.go b/util/http_test.go index 52a7197ab..f36ec90e8 100644 --- a/util/http_test.go +++ b/util/http_test.go @@ -1,4 +1,4 @@ -package util +package util_test import ( "context" @@ -7,6 +7,7 @@ import ( "net/url" "reflect" + . "github.com/0xERR0R/blocky/util" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" . "github.com/onsi/ginkgo/v2" diff --git a/util/tls_test.go b/util/tls_test.go index 4fb4e0f55..5b773fd03 100644 --- a/util/tls_test.go +++ b/util/tls_test.go @@ -1,8 +1,9 @@ -package util +package util_test import ( "crypto/x509" + . "github.com/0xERR0R/blocky/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/util/util_suite_test.go b/util/util_suite_test.go index 184521ca5..cfcd46d11 100644 --- a/util/util_suite_test.go +++ b/util/util_suite_test.go @@ -1,4 +1,4 @@ -package util +package util_test import ( "testing"