diff options
Diffstat (limited to 'internal/cache/cache_test.go')
| -rw-r--r-- | internal/cache/cache_test.go | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/internal/cache/cache_test.go b/internal/cache/cache_test.go index 6556dcb..33e1d30 100644 --- a/internal/cache/cache_test.go +++ b/internal/cache/cache_test.go @@ -2,11 +2,12 @@ package cache import ( "fmt" - "net" + "net/netip" "testing" "time" - "github.com/miekg/dns" + "codeberg.org/miekg/dns" + "codeberg.org/miekg/dns/rdata" ) func TestSetGet(t *testing.T) { @@ -18,8 +19,8 @@ func TestSetGet(t *testing.T) { msg := new(dns.Msg) msg.Answer = append(msg.Answer, &dns.A{ - Hdr: dns.RR_Header{Name: "example.com.", Rrtype: dns.TypeA, Ttl:300}, - A: net.IPv4(1,2,3,4), + Hdr: dns.Header{Name: "example.com.", Class: dns.ClassINET, TTL: 300}, + A: rdata.A{Addr: netip.AddrFrom4([4]byte{1, 2, 3, 4})}, }) key := Key{Name: "example.com.", Qtype: dns.TypeA, Class: dns.ClassINET} @@ -33,8 +34,8 @@ func TestSetGet(t *testing.T) { t.Fatalf("expected 1 answer, got %d", len(got.Answer)) } a, _ := got.Answer[0].(*dns.A) - if !a.A.Equal(net.IPv4(1,2,3,4)) { - t.Errorf("IP = %s, want 1.2.3.4", a.A) + if a.A.Addr != netip.AddrFrom4([4]byte{1, 2, 3, 4}) { + t.Errorf("IP = %s, want 1.2.3.4", a.A.Addr) } } @@ -67,7 +68,7 @@ func TestEviction(t *testing.T) { func TestComputeTTL(t *testing.T) { msg := new(dns.Msg) msg.Answer = append(msg.Answer, &dns.A{ - Hdr: dns.RR_Header{Name: "x.", Rrtype: dns.TypeA, Ttl: 120}, + Hdr: dns.Header{Name: "x.", Class: dns.ClassINET, TTL: 120}, }) if d := computeTTL(msg); d != 120*time.Second { t.Errorf("TTL = %v, want 120s", d) @@ -78,8 +79,8 @@ func TestNegativeTTL(t *testing.T) { msg := new(dns.Msg) msg.Rcode = dns.RcodeNameError msg.Ns = append(msg.Ns, &dns.SOA{ - Hdr: dns.RR_Header{Name: "com.", Rrtype: dns.TypeSOA, Ttl: 900}, - Minttl: 300, + Hdr: dns.Header{Name: "com.", Class: dns.ClassINET, TTL: 900}, + SOA: rdata.SOA{Minttl: 300}, }) if d := computeTTL(msg); d != 300*time.Second { t.Errorf("negative TTL = %v, want 300s", d) @@ -116,8 +117,8 @@ func TestSQLitePersistence(t *testing.T) { msg := new(dns.Msg) msg.Answer = append(msg.Answer, &dns.A{ - Hdr: dns.RR_Header{Name: "x.com.", Rrtype: dns.TypeA, Ttl: 300}, - A: net.IPv4(1, 2, 3, 4), + Hdr: dns.Header{Name: "x.com.", Class: dns.ClassINET, TTL: 300}, + A: rdata.A{Addr: netip.AddrFrom4([4]byte{1, 2, 3, 4})}, }) key := Key{Name: "x.com.", Qtype: dns.TypeA, Class: dns.ClassINET} c.Set(key, msg, 300*time.Second) @@ -134,7 +135,7 @@ func TestSQLitePersistence(t *testing.T) { t.Fatal("expected cache hit from SQLite load") } a, _ := got.Answer[0].(*dns.A) - if !a.A.Equal(net.IPv4(1, 2, 3, 4)) { - t.Errorf("IP = %s, want 1.2.3.4", a.A) + if a.A.Addr != netip.AddrFrom4([4]byte{1, 2, 3, 4}) { + t.Errorf("IP = %s, want 1.2.3.4", a.A.Addr) } } |