diff options
author | 2016-09-07 11:10:16 +0100 | |
---|---|---|
committer | 2016-09-07 11:10:16 +0100 | |
commit | d1f17fa7e061d91aa0af7e1fb959a68db899c812 (patch) | |
tree | 0f828a0e7bd8ca86051a721dae48e8c19a0a2f0e /middleware/dnssec/handler_test.go | |
parent | 684330fd28f65a7a8d1ad01fb4c6c5db78240f29 (diff) | |
download | coredns-d1f17fa7e061d91aa0af7e1fb959a68db899c812.tar.gz coredns-d1f17fa7e061d91aa0af7e1fb959a68db899c812.tar.zst coredns-d1f17fa7e061d91aa0af7e1fb959a68db899c812.zip |
Cleanup: put middleware helper functions in pkgs (#245)
Move all (almost all) Go files in middleware into their
own packages. This makes for better naming and discoverability.
Lot of changes elsewhere to make this change.
The middleware.State was renamed to request.Request which is better,
but still does not cover all use-cases. It was also moved out middleware
because it is used by `dnsserver` as well.
A pkg/dnsutil packages was added for shared, handy, dns util functions.
All normalize functions are now put in normalize.go
Diffstat (limited to 'middleware/dnssec/handler_test.go')
-rw-r--r-- | middleware/dnssec/handler_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/middleware/dnssec/handler_test.go b/middleware/dnssec/handler_test.go index f7cb7e680..a490c3744 100644 --- a/middleware/dnssec/handler_test.go +++ b/middleware/dnssec/handler_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/miekg/coredns/middleware" "github.com/miekg/coredns/middleware/file" + "github.com/miekg/coredns/middleware/pkg/dnsrecorder" "github.com/miekg/coredns/middleware/test" "github.com/miekg/dns" @@ -83,14 +83,14 @@ func TestLookupZone(t *testing.T) { for _, tc := range dnsTestCases { m := tc.Msg() - rec := middleware.NewResponseRecorder(&test.ResponseWriter{}) + rec := dnsrecorder.New(&test.ResponseWriter{}) _, err := dh.ServeDNS(ctx, rec, m) if err != nil { t.Errorf("expected no error, got %v\n", err) return } - resp := rec.Msg() + resp := rec.Msg sort.Sort(test.RRSet(resp.Answer)) sort.Sort(test.RRSet(resp.Ns)) sort.Sort(test.RRSet(resp.Extra)) @@ -121,14 +121,14 @@ func TestLookupDNSKEY(t *testing.T) { for _, tc := range dnssecTestCases { m := tc.Msg() - rec := middleware.NewResponseRecorder(&test.ResponseWriter{}) + rec := dnsrecorder.New(&test.ResponseWriter{}) _, err := dh.ServeDNS(ctx, rec, m) if err != nil { t.Errorf("expected no error, got %v\n", err) return } - resp := rec.Msg() + resp := rec.Msg if !resp.Authoritative { t.Errorf("Authoritative Answer should be true, got false") } |