mirror of
https://github.com/coredns/coredns.git
synced 2025-10-30 09:43:17 -04:00
Cleanup: put middleware helper functions in pkgs (#245)
Move all (almost all) Go files in middleware into their own packages. This makes for better naming and discoverability. Lot of changes elsewhere to make this change. The middleware.State was renamed to request.Request which is better, but still does not cover all use-cases. It was also moved out middleware because it is used by `dnsserver` as well. A pkg/dnsutil packages was added for shared, handy, dns util functions. All normalize functions are now put in normalize.go
This commit is contained in:
81
middleware/file/tree/less_test.go
Normal file
81
middleware/file/tree/less_test.go
Normal file
@@ -0,0 +1,81 @@
|
||||
package tree
|
||||
|
||||
import (
|
||||
"sort"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
type set []string
|
||||
|
||||
func (p set) Len() int { return len(p) }
|
||||
func (p set) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
|
||||
func (p set) Less(i, j int) bool { d := less(p[i], p[j]); return d <= 0 }
|
||||
|
||||
func TestLess(t *testing.T) {
|
||||
tests := []struct {
|
||||
in []string
|
||||
out []string
|
||||
}{
|
||||
{
|
||||
[]string{"aaa.powerdns.de", "bbb.powerdns.net.", "xxx.powerdns.com."},
|
||||
[]string{"xxx.powerdns.com.", "aaa.powerdns.de", "bbb.powerdns.net."},
|
||||
},
|
||||
{
|
||||
[]string{"aaa.POWERDNS.de", "bbb.PoweRdnS.net.", "xxx.powerdns.com."},
|
||||
[]string{"xxx.powerdns.com.", "aaa.POWERDNS.de", "bbb.PoweRdnS.net."},
|
||||
},
|
||||
{
|
||||
[]string{"aaa.aaaa.aa.", "aa.aaa.a.", "bbb.bbbb.bb."},
|
||||
[]string{"aa.aaa.a.", "aaa.aaaa.aa.", "bbb.bbbb.bb."},
|
||||
},
|
||||
{
|
||||
[]string{"aaaaa.", "aaa.", "bbb."},
|
||||
[]string{"aaa.", "aaaaa.", "bbb."},
|
||||
},
|
||||
{
|
||||
[]string{"a.a.a.a.", "a.a.", "a.a.a."},
|
||||
[]string{"a.a.", "a.a.a.", "a.a.a.a."},
|
||||
},
|
||||
{
|
||||
[]string{"example.", "z.example.", "a.example."},
|
||||
[]string{"example.", "a.example.", "z.example."},
|
||||
},
|
||||
{
|
||||
[]string{"a.example.", "Z.a.example.", "z.example.", "yljkjljk.a.example.", "\\001.z.example.", "example.", "*.z.example.", "\\200.z.example.", "zABC.a.EXAMPLE."},
|
||||
[]string{"example.", "a.example.", "yljkjljk.a.example.", "Z.a.example.", "zABC.a.EXAMPLE.", "z.example.", "\\001.z.example.", "*.z.example.", "\\200.z.example."},
|
||||
},
|
||||
{
|
||||
// RFC3034 example.
|
||||
[]string{"a.example.", "Z.a.example.", "z.example.", "yljkjljk.a.example.", "example.", "*.z.example.", "zABC.a.EXAMPLE."},
|
||||
[]string{"example.", "a.example.", "yljkjljk.a.example.", "Z.a.example.", "zABC.a.EXAMPLE.", "z.example.", "*.z.example."},
|
||||
},
|
||||
}
|
||||
|
||||
Tests:
|
||||
for j, test := range tests {
|
||||
// Need to lowercase these example as the Less function does lowercase for us anymore.
|
||||
for i, b := range test.in {
|
||||
test.in[i] = strings.ToLower(b)
|
||||
}
|
||||
for i, b := range test.out {
|
||||
test.out[i] = strings.ToLower(b)
|
||||
}
|
||||
|
||||
sort.Sort(set(test.in))
|
||||
for i := 0; i < len(test.in); i++ {
|
||||
if test.in[i] != test.out[i] {
|
||||
t.Errorf("test %d: expected %s, got %s\n", j, test.out[i], test.in[i])
|
||||
n := ""
|
||||
for k, in := range test.in {
|
||||
if k+1 == len(test.in) {
|
||||
n = "\n"
|
||||
}
|
||||
t.Logf("%s <-> %s\n%s", in, test.out[k], n)
|
||||
}
|
||||
continue Tests
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user