tests: add SortAndCheck helper (#926)

There was quite some code duplication in a lot of tests to check if
an answer was considered Ok. Created a test.SortAndCheck helper function
that takes care of this.

2 files changed, 2 insertions, 38 deletions

diff --git a/middleware/kubernetes/handler_test.go b/middleware/kubernetes/handler_test.go
index b00f5382e..e8ef49999 100644
--- a/middleware/kubernetes/handler_test.go
+++ b/middleware/kubernetes/handler_test.go
@@ -1,7 +1,6 @@
 package kubernetes
 
 import (
-	"sort"
 	"testing"
 
 	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
@@ -201,24 +200,7 @@ func runServeDNSTests(ctx context.Context, t *testing.T, dnsTestCases map[string
 
 			}
 		}
-
-		sort.Sort(test.RRSet(resp.Answer))
-		sort.Sort(test.RRSet(resp.Ns))
-		sort.Sort(test.RRSet(resp.Extra))
-
-		if !test.Header(t, tc, resp) {
-			t.Logf("%v Received:\n %v\n", testname, resp)
-			continue
-		}
-		if !test.Section(t, tc, test.Answer, resp.Answer) {
-			t.Logf("%v Received:\n %v\n", testname, resp)
-		}
-		if !test.Section(t, tc, test.Ns, resp.Ns) {
-			t.Logf("%v Received:\n %v\n", testname, resp)
-		}
-		if !test.Section(t, tc, test.Extra, resp.Extra) {
-			t.Logf("%v Received:\n %v\n", testname, resp)
-		}
+		test.SortAndCheck(t, resp, tc)
 	}
 }
 
diff --git a/middleware/kubernetes/reverse_test.go b/middleware/kubernetes/reverse_test.go
index 4de3e0a96..7cc51da17 100644
--- a/middleware/kubernetes/reverse_test.go
+++ b/middleware/kubernetes/reverse_test.go
@@ -1,7 +1,6 @@
 package kubernetes
 
 import (
-	"sort"
 	"testing"
 
 	"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
@@ -118,23 +117,6 @@ func TestReverse(t *testing.T) {
 		if resp == nil {
 			t.Fatalf("Test %d: got nil message and no error for: %s %d", i, r.Question[0].Name, r.Question[0].Qtype)
 		}
-
-		sort.Sort(test.RRSet(resp.Answer))
-		sort.Sort(test.RRSet(resp.Ns))
-		sort.Sort(test.RRSet(resp.Extra))
-
-		if !test.Header(t, tc, resp) {
-			t.Logf("Test %d, received: %v", i, resp)
-			continue
-		}
-		if !test.Section(t, tc, test.Answer, resp.Answer) {
-			t.Logf("Test %d, received: %v", i, resp)
-		}
-		if !test.Section(t, tc, test.Ns, resp.Ns) {
-			t.Logf("Test %d, received: %v", i, resp)
-		}
-		if !test.Section(t, tc, test.Extra, resp.Extra) {
-			t.Logf("Test %d, received: %v", i, resp)
-		}
+		test.SortAndCheck(t, resp, tc)
 	}
 }