Update tests to incorporate the latest library changes

This commit is contained in:
richtr 2014-05-25 18:55:28 +02:00
parent a8a4397315
commit 2f2002e875
2 changed files with 17 additions and 24 deletions

View File

@ -1,7 +1,6 @@
package mdns package mdns
import ( import (
"bytes"
"testing" "testing"
"time" "time"
) )
@ -33,9 +32,6 @@ func TestServer_Lookup(t *testing.T) {
if e.Name != "hostname._foobar._tcp.local." { if e.Name != "hostname._foobar._tcp.local." {
t.Fatalf("bad: %v", e) t.Fatalf("bad: %v", e)
} }
if !bytes.Equal(e.Addr.To4(), []byte{127, 0, 0, 1}) {
t.Fatalf("bad: %v", e)
}
if e.Port != 80 { if e.Port != 80 {
t.Fatalf("bad: %v", e) t.Fatalf("bad: %v", e)
} }

View File

@ -11,7 +11,6 @@ func makeService(t *testing.T) *MDNSService {
m := &MDNSService{ m := &MDNSService{
Instance: "hostname.", Instance: "hostname.",
Service: "_http._tcp.", Service: "_http._tcp.",
Addr: []byte{127, 0, 0, 1},
Port: 80, Port: 80,
Info: "Local web server", Info: "Local web server",
Domain: "local.", Domain: "local.",
@ -41,7 +40,7 @@ func TestMDNSService_ServiceAddr(t *testing.T) {
Qtype: dns.TypeANY, Qtype: dns.TypeANY,
} }
recs := s.Records(q) recs := s.Records(q)
if len(recs) != 4 { if len(recs) != 5 {
t.Fatalf("bad: %v", recs) t.Fatalf("bad: %v", recs)
} }
@ -55,9 +54,12 @@ func TestMDNSService_ServiceAddr(t *testing.T) {
if _, ok := recs[2].(*dns.A); !ok { if _, ok := recs[2].(*dns.A); !ok {
t.Fatalf("bad: %v", recs[2]) t.Fatalf("bad: %v", recs[2])
} }
if _, ok := recs[3].(*dns.TXT); !ok { if _, ok := recs[3].(*dns.AAAA); !ok {
t.Fatalf("bad: %v", recs[3]) t.Fatalf("bad: %v", recs[3])
} }
if _, ok := recs[4].(*dns.TXT); !ok {
t.Fatalf("bad: %v", recs[4])
}
if ptr.Ptr != s.instanceAddr { if ptr.Ptr != s.instanceAddr {
t.Fatalf("bad: %v", recs[0]) t.Fatalf("bad: %v", recs[0])
@ -77,7 +79,7 @@ func TestMDNSService_InstanceAddr_ANY(t *testing.T) {
Qtype: dns.TypeANY, Qtype: dns.TypeANY,
} }
recs := s.Records(q) recs := s.Records(q)
if len(recs) != 3 { if len(recs) != 4 {
t.Fatalf("bad: %v", recs) t.Fatalf("bad: %v", recs)
} }
if _, ok := recs[0].(*dns.SRV); !ok { if _, ok := recs[0].(*dns.SRV); !ok {
@ -86,9 +88,12 @@ func TestMDNSService_InstanceAddr_ANY(t *testing.T) {
if _, ok := recs[1].(*dns.A); !ok { if _, ok := recs[1].(*dns.A); !ok {
t.Fatalf("bad: %v", recs[1]) t.Fatalf("bad: %v", recs[1])
} }
if _, ok := recs[2].(*dns.TXT); !ok { if _, ok := recs[2].(*dns.AAAA); !ok {
t.Fatalf("bad: %v", recs[2]) t.Fatalf("bad: %v", recs[2])
} }
if _, ok := recs[3].(*dns.TXT); !ok {
t.Fatalf("bad: %v", recs[3])
}
} }
func TestMDNSService_InstanceAddr_SRV(t *testing.T) { func TestMDNSService_InstanceAddr_SRV(t *testing.T) {
@ -98,7 +103,7 @@ func TestMDNSService_InstanceAddr_SRV(t *testing.T) {
Qtype: dns.TypeSRV, Qtype: dns.TypeSRV,
} }
recs := s.Records(q) recs := s.Records(q)
if len(recs) != 2 { if len(recs) != 3 {
t.Fatalf("bad: %v", recs) t.Fatalf("bad: %v", recs)
} }
srv, ok := recs[0].(*dns.SRV) srv, ok := recs[0].(*dns.SRV)
@ -108,10 +113,10 @@ func TestMDNSService_InstanceAddr_SRV(t *testing.T) {
if _, ok := recs[1].(*dns.A); !ok { if _, ok := recs[1].(*dns.A); !ok {
t.Fatalf("bad: %v", recs[1]) t.Fatalf("bad: %v", recs[1])
} }
if _, ok := recs[2].(*dns.AAAA); !ok {
if srv.Target != s.instanceAddr { t.Fatalf("bad: %v", recs[2])
t.Fatalf("bad: %v", recs[0])
} }
if srv.Port != uint16(s.Port) { if srv.Port != uint16(s.Port) {
t.Fatalf("bad: %v", recs[0]) t.Fatalf("bad: %v", recs[0])
} }
@ -131,26 +136,18 @@ func TestMDNSService_InstanceAddr_A(t *testing.T) {
if !ok { if !ok {
t.Fatalf("bad: %v", recs[0]) t.Fatalf("bad: %v", recs[0])
} }
if !bytes.Equal(a.A, s.Addr) { if !bytes.Equal(a.A, s.ipv4Addr) {
t.Fatalf("bad: %v", recs[0]) t.Fatalf("bad: %v", recs[0])
} }
} }
func TestMDNSService_InstanceAddr_AAAA(t *testing.T) { func TestMDNSService_InstanceAddr_AAAA(t *testing.T) {
s := makeService(t) s := makeService(t)
s.Addr = []byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16}
q := dns.Question{ q := dns.Question{
Name: "hostname._http._tcp.local.", Name: "hostname._http._tcp.local.",
Qtype: dns.TypeA, Qtype: dns.TypeAAAA,
} }
recs := s.Records(q) recs := s.Records(q)
if len(recs) != 0 {
t.Fatalf("bad: %v", recs)
}
q.Qtype = dns.TypeAAAA
recs = s.Records(q)
if len(recs) != 1 { if len(recs) != 1 {
t.Fatalf("bad: %v", recs) t.Fatalf("bad: %v", recs)
} }
@ -158,7 +155,7 @@ func TestMDNSService_InstanceAddr_AAAA(t *testing.T) {
if !ok { if !ok {
t.Fatalf("bad: %v", recs[0]) t.Fatalf("bad: %v", recs[0])
} }
if !bytes.Equal(a4.AAAA, s.Addr) { if !bytes.Equal(a4.AAAA, s.ipv6Addr) {
t.Fatalf("bad: %v", recs[0]) t.Fatalf("bad: %v", recs[0])
} }
} }