Pr 311 2 (#312)

* Add a setup test for middleware/file

This fix adds a setup test for middleware/file so that there is
a basic coverage for the Corefile processing of middleware/file.

This fix is related to 308 (Will look into it).
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

* middleware/file: use helper function for test

Fixup setup_test.go and use the test.TempFile function to make things
somewhat shorter.

Use clean up the use of testing.T in TempFile - it is not used.

middleware/dnssec/cache_test.go

@@ -9,8 +9,8 @@ import (
 )
 
 func TestCacheSet(t *testing.T) {
-	fPriv, rmPriv, _ := test.TempFile(t, ".", privKey)
-	fPub, rmPub, _ := test.TempFile(t, ".", pubKey)
+	fPriv, rmPriv, _ := test.TempFile(".", privKey)
+	fPub, rmPub, _ := test.TempFile(".", pubKey)
 	defer rmPriv()
 	defer rmPub()
 

middleware/dnssec/dnssec_test.go

@@ -32,8 +32,8 @@ func TestZoneSigningDouble(t *testing.T) {
 	defer rm1()
 	defer rm2()
 
-	fPriv1, rmPriv1, _ := test.TempFile(t, ".", privKey1)
-	fPub1, rmPub1, _ := test.TempFile(t, ".", pubKey1)
+	fPriv1, rmPriv1, _ := test.TempFile(".", privKey1)
+	fPub1, rmPub1, _ := test.TempFile(".", pubKey1)
 	defer rmPriv1()
 	defer rmPub1()
 
@@ -57,8 +57,8 @@ func TestZoneSigningDouble(t *testing.T) {
 
 // TestSigningDifferentZone tests if a key for miek.nl and be used for example.org.
 func TestSigningDifferentZone(t *testing.T) {
-	fPriv, rmPriv, _ := test.TempFile(t, ".", privKey)
-	fPub, rmPub, _ := test.TempFile(t, ".", pubKey)
+	fPriv, rmPriv, _ := test.TempFile(".", privKey)
+	fPub, rmPub, _ := test.TempFile(".", pubKey)
 	defer rmPriv()
 	defer rmPub()
 
@@ -163,8 +163,8 @@ func newDnssec(t *testing.T, zones []string) (Dnssec, func(), func()) {
 }
 
 func newKey(t *testing.T) (*DNSKEY, func(), func()) {
-	fPriv, rmPriv, _ := test.TempFile(t, ".", privKey)
-	fPub, rmPub, _ := test.TempFile(t, ".", pubKey)
+	fPriv, rmPriv, _ := test.TempFile(".", privKey)
+	fPub, rmPub, _ := test.TempFile(".", pubKey)
 
 	key, err := ParseKeyFile(fPub, fPriv)
 	if err != nil {

middleware/file/reload_test.go

@@ -11,7 +11,7 @@ import (
 )
 
 func TestZoneReload(t *testing.T) {
-	fileName, rm, err := test.TempFile(t, ".", reloadZoneTest)
+	fileName, rm, err := test.TempFile(".", reloadZoneTest)
 	if err != nil {
 		t.Fatalf("failed to create zone: %s", err)
 	}

middleware/file/setup_test.go

+package file
+
+import (
+	"testing"
+
+	"github.com/miekg/coredns/middleware/test"
+
+	"github.com/mholt/caddy"
+)
+
+func TestFileParse(t *testing.T) {
+	zoneFileName1, rm, err := test.TempFile(".", dbMiekNL)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer rm()
+
+	zoneFileName2, rm, err := test.TempFile(".", dbDnssexNLSigned)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer rm()
+
+	tests := []struct {
+		inputFileRules string
+		shouldErr      bool
+		expectedZones  Zones
+	}{
+		{
+			`file`,
+			true,
+			Zones{},
+		},
+		{
+			`file ` + zoneFileName1 + ` miek.nl.`,
+			false,
+			Zones{Names: []string{"miek.nl."}},
+		},
+		{
+			`file ` + zoneFileName2 + ` dnssex.nl.`,
+			false,
+			Zones{Names: []string{"dnssex.nl."}},
+		},
+	}
+
+	for i, test := range tests {
+		c := caddy.NewTestController("file", test.inputFileRules)
+		actualZones, err := fileParse(c)
+
+		if err == nil && test.shouldErr {
+			t.Fatalf("Test %d expected errors, but got no error", i)
+		} else if err != nil && !test.shouldErr {
+			t.Fatalf("Test %d expected no errors, but got '%v'", i, err)
+		} else {
+			if len(actualZones.Names) != len(test.expectedZones.Names) {
+				t.Fatalf("Test %d expected %v, got %v", i, test.expectedZones.Names, actualZones.Names)
+			}
+			for j, name := range test.expectedZones.Names {
+				if actualZones.Names[j] != name {
+					t.Fatalf("Test %d expected %v for %d th zone, got %v", i, name, j, actualZones.Names[j])
+				}
+			}
+		}
+	}
+}

middleware/test/file.go

@@ -3,11 +3,10 @@ package test
 import (
 	"io/ioutil"
 	"os"
-	"testing"
 )
 
 // TempFile will create a temporary file on disk and returns the name and a cleanup function to remove it later.
-func TempFile(t *testing.T, dir, content string) (string, func(), error) {
+func TempFile(dir, content string) (string, func(), error) {
 	f, err := ioutil.TempFile(dir, "go-test-tmpfile")
 	if err != nil {
 		return "", nil, err

middleware/test/file_test.go

@@ -3,7 +3,7 @@ package test
 import "testing"
 
 func TestTempFile(t *testing.T) {
-	_, f, e := TempFile(t, ".", "test")
+	_, f, e := TempFile(".", "test")
 	if e != nil {
 		t.Fatalf("failed to create temp file: %s", e)
 	}

test/cache_test.go

@@ -17,7 +17,7 @@ import (
 
 func TestLookupCache(t *testing.T) {
 	// Start auth. CoreDNS holding the auth zone.
-	name, rm, err := test.TempFile(t, ".", exampleOrg)
+	name, rm, err := test.TempFile(".", exampleOrg)
 	if err != nil {
 		t.Fatalf("failed to created zone: %s", err)
 	}

test/file.go

@@ -3,11 +3,10 @@ package test
 import (
 	"io/ioutil"
 	"os"
-	"testing"
 )
 
 // TempFile will create a temporary file on disk and returns the name and a cleanup function to remove it later.
-func TempFile(t *testing.T, dir, content string) (string, func(), error) {
+func TempFile(dir, content string) (string, func(), error) {
 	f, err := ioutil.TempFile(dir, "go-test-tmpfile")
 	if err != nil {
 		return "", nil, err

test/file_test.go

@@ -3,7 +3,7 @@ package test
 import "testing"
 
 func TestTempFile(t *testing.T) {
-	_, f, e := TempFile(t, ".", "test")
+	_, f, e := TempFile(".", "test")
 	if e != nil {
 		t.Fatalf("failed to create temp file: %s", e)
 	}

test/middleware_dnssec_test.go

@@ -12,7 +12,7 @@ import (
 )
 
 func TestLookupBalanceRewriteCacheDnssec(t *testing.T) {
-	name, rm, err := test.TempFile(t, ".", exampleOrg)
+	name, rm, err := test.TempFile(".", exampleOrg)
 	if err != nil {
 		t.Fatalf("failed to created zone: %s", err)
 	}

test/middleware_test.go

@@ -12,7 +12,7 @@ import (
 
 func benchmarkLookupBalanceRewriteCache(b *testing.B) {
 	t := new(testing.T)
-	name, rm, err := test.TempFile(t, ".", exampleOrg)
+	name, rm, err := test.TempFile(".", exampleOrg)
 	if err != nil {
 		t.Fatalf("failed to created zone: %s", err)
 	}

test/proxy_test.go

@@ -21,7 +21,7 @@ example.org.		IN	A	127.0.0.2
 `
 
 func TestLookupProxy(t *testing.T) {
-	name, rm, err := test.TempFile(t, ".", exampleOrg)
+	name, rm, err := test.TempFile(".", exampleOrg)
 	if err != nil {
 		t.Fatalf("failed to created zone: %s", err)
 	}