1 files changed, 6 insertions, 46 deletions
diff --git a/test/proxy_test.go b/test/proxy_test.go
index 87a05a21e..50e5dae46 100644
--- a/test/proxy_test.go
+++ b/test/proxy_test.go
@@ -3,9 +3,7 @@ package test
 import (
 	"testing"
 
-	"github.com/coredns/coredns/plugin/proxy"
 	"github.com/coredns/coredns/plugin/test"
-	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
 )
@@ -29,46 +27,9 @@ func TestLookupProxy(t *testing.T) {
 	}
 	defer i.Stop()
 
-	p := proxy.NewLookup([]string{udp})
-	state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
-	resp, err := p.Lookup(state, "example.org.", dns.TypeA)
-	if err != nil {
-		t.Fatal("Expected to receive reply, but didn't")
-	}
-	// expect answer section with A record in it
-	if len(resp.Answer) == 0 {
-		t.Fatalf("Expected to at least one RR in the answer section, got none: %s", resp)
-	}
-	if resp.Answer[0].Header().Rrtype != dns.TypeA {
-		t.Errorf("Expected RR to A, got: %d", resp.Answer[0].Header().Rrtype)
-	}
-	if resp.Answer[0].(*dns.A).A.String() != "127.0.0.1" {
-		t.Errorf("Expected 127.0.0.1, got: %s", resp.Answer[0].(*dns.A).A.String())
-	}
-}
-
-func TestLookupDnsWithForcedTcp(t *testing.T) {
-	t.Parallel()
-	name, rm, err := test.TempFile(".", exampleOrg)
-	if err != nil {
-		t.Fatalf("Failed to create zone: %s", err)
-	}
-	defer rm()
-
-	corefile := `example.org:0 {
-       file ` + name + `
-}
-`
-
-	i, _, tcp, err := CoreDNSServerAndPorts(corefile)
-	if err != nil {
-		t.Fatalf("Could not get CoreDNS serving instance: %s", err)
-	}
-	defer i.Stop()
-
-	p := proxy.NewLookupWithOption([]string{tcp}, proxy.Options{ForceTCP: true})
-	state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
-	resp, err := p.Lookup(state, "example.org.", dns.TypeA)
+	m := new(dns.Msg)
+	m.SetQuestion("example.org.", dns.TypeA)
+	resp, err := dns.Exchange(m, udp)
 	if err != nil {
 		t.Fatal("Expected to receive reply, but didn't")
 	}
@@ -108,13 +69,12 @@ func BenchmarkProxyLookup(b *testing.B) {
 	}
 	defer i.Stop()
 
-	p := proxy.NewLookup([]string{udp})
-	state := request.Request{W: &test.ResponseWriter{}, Req: new(dns.Msg)}
+	m := new(dns.Msg)
+	m.SetQuestion("example.org.", dns.TypeA)
 
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		_, err := p.Lookup(state, "example.org.", dns.TypeA)
-		if err != nil {
+		if _, err := dns.Exchange(m, udp); err != nil {
 			b.Fatal("Expected to receive reply, but didn't")
 		}
 	}