diff options
Diffstat (limited to 'middleware/file/lookup_test.go')
| -rw-r--r-- | middleware/file/lookup_test.go | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/middleware/file/lookup_test.go b/middleware/file/lookup_test.go index 5be7494ab..53ca71001 100644 --- a/middleware/file/lookup_test.go +++ b/middleware/file/lookup_test.go @@ -6,56 +6,56 @@ import ( "testing" "github.com/miekg/coredns/middleware" - coretest "github.com/miekg/coredns/middleware/testing" + "github.com/miekg/coredns/middleware/test" "github.com/miekg/dns" "golang.org/x/net/context" ) -var dnsTestCases = []coretest.Case{ +var dnsTestCases = []test.Case{ { Qname: "www.miek.nl.", Qtype: dns.TypeA, Answer: []dns.RR{ - coretest.CNAME("www.miek.nl. 1800 IN CNAME a.miek.nl."), + test.CNAME("www.miek.nl. 1800 IN CNAME a.miek.nl."), }, Extra: []dns.RR{ - coretest.A("a.miek.nl. 1800 IN A 139.162.196.78"), + test.A("a.miek.nl. 1800 IN A 139.162.196.78"), }, }, { Qname: "miek.nl.", Qtype: dns.TypeSOA, Answer: []dns.RR{ - coretest.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"), + test.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"), }, }, { Qname: "miek.nl.", Qtype: dns.TypeAAAA, Answer: []dns.RR{ - coretest.AAAA("miek.nl. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"), + test.AAAA("miek.nl. 1800 IN AAAA 2a01:7e00::f03c:91ff:fef1:6735"), }, }, { Qname: "miek.nl.", Qtype: dns.TypeMX, Answer: []dns.RR{ - coretest.MX("miek.nl. 1800 IN MX 1 aspmx.l.google.com."), - coretest.MX("miek.nl. 1800 IN MX 10 aspmx2.googlemail.com."), - coretest.MX("miek.nl. 1800 IN MX 10 aspmx3.googlemail.com."), - coretest.MX("miek.nl. 1800 IN MX 5 alt1.aspmx.l.google.com."), - coretest.MX("miek.nl. 1800 IN MX 5 alt2.aspmx.l.google.com."), + test.MX("miek.nl. 1800 IN MX 1 aspmx.l.google.com."), + test.MX("miek.nl. 1800 IN MX 10 aspmx2.googlemail.com."), + test.MX("miek.nl. 1800 IN MX 10 aspmx3.googlemail.com."), + test.MX("miek.nl. 1800 IN MX 5 alt1.aspmx.l.google.com."), + test.MX("miek.nl. 1800 IN MX 5 alt2.aspmx.l.google.com."), }, }, { Qname: "a.miek.nl.", Qtype: dns.TypeSRV, Ns: []dns.RR{ - coretest.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"), + test.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"), }, }, { Qname: "b.miek.nl.", Qtype: dns.TypeA, Rcode: dns.RcodeNameError, Ns: []dns.RR{ - coretest.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"), + test.SOA("miek.nl. 1800 IN SOA linode.atoom.net. miek.miek.nl. 1282630057 14400 3600 604800 14400"), }, }, } @@ -71,13 +71,13 @@ func TestLookup(t *testing.T) { t.Fatalf("expect no error when reading zone, got %q", err) } - fm := File{Next: coretest.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: zone}, Names: []string{testzone}}} + fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: zone}, Names: []string{testzone}}} ctx := context.TODO() for _, tc := range dnsTestCases { m := tc.Msg() - rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) + rec := middleware.NewResponseRecorder(&test.ResponseWriter{}) _, err := fm.ServeDNS(ctx, rec, m) if err != nil { t.Errorf("expected no error, got %v\n", err) @@ -85,34 +85,34 @@ func TestLookup(t *testing.T) { } resp := rec.Msg() - sort.Sort(coretest.RRSet(resp.Answer)) - sort.Sort(coretest.RRSet(resp.Ns)) - sort.Sort(coretest.RRSet(resp.Extra)) + sort.Sort(test.RRSet(resp.Answer)) + sort.Sort(test.RRSet(resp.Ns)) + sort.Sort(test.RRSet(resp.Extra)) - if !coretest.Header(t, tc, resp) { + if !test.Header(t, tc, resp) { t.Logf("%v\n", resp) continue } - if !coretest.Section(t, tc, coretest.Answer, resp.Answer) { + if !test.Section(t, tc, test.Answer, resp.Answer) { t.Logf("%v\n", resp) } - if !coretest.Section(t, tc, coretest.Ns, resp.Ns) { + if !test.Section(t, tc, test.Ns, resp.Ns) { t.Logf("%v\n", resp) } - if !coretest.Section(t, tc, coretest.Extra, resp.Extra) { + if !test.Section(t, tc, test.Extra, resp.Extra) { t.Logf("%v\n", resp) } } } func TestLookupNil(t *testing.T) { - fm := File{Next: coretest.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: nil}, Names: []string{testzone}}} + fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: nil}, Names: []string{testzone}}} ctx := context.TODO() m := dnsTestCases[0].Msg() - rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) + rec := middleware.NewResponseRecorder(&test.ResponseWriter{}) fm.ServeDNS(ctx, rec, m) } @@ -122,18 +122,18 @@ func BenchmarkLookup(b *testing.B) { return } - fm := File{Next: coretest.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: zone}, Names: []string{testzone}}} + fm := File{Next: test.ErrorHandler(), Zones: Zones{Z: map[string]*Zone{testzone: zone}, Names: []string{testzone}}} ctx := context.TODO() - rec := middleware.NewResponseRecorder(&coretest.ResponseWriter{}) + rec := middleware.NewResponseRecorder(&test.ResponseWriter{}) - tc := coretest.Case{ + tc := test.Case{ Qname: "www.miek.nl.", Qtype: dns.TypeA, Answer: []dns.RR{ - coretest.CNAME("www.miek.nl. 1800 IN CNAME a.miek.nl."), + test.CNAME("www.miek.nl. 1800 IN CNAME a.miek.nl."), }, Extra: []dns.RR{ - coretest.A("a.miek.nl. 1800 IN A 139.162.196.78"), + test.A("a.miek.nl. 1800 IN A 139.162.196.78"), }, } |