diff options
Diffstat (limited to 'conf/parser_test.go')
| -rw-r--r-- | conf/parser_test.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/conf/parser_test.go b/conf/parser_test.go index a6afbf53..25d906fd 100644 --- a/conf/parser_test.go +++ b/conf/parser_test.go @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: MIT * - * Copyright (C) 2019 WireGuard LLC. All Rights Reserved. + * Copyright (C) 2019-2022 WireGuard LLC. All Rights Reserved. */ package conf import ( - "net" + "net/netip" "reflect" "runtime" "testing" @@ -45,7 +45,7 @@ func noError(t *testing.T, err error) bool { return false } -func equal(t *testing.T, expected, actual interface{}) bool { +func equal(t *testing.T, expected, actual any) bool { if reflect.DeepEqual(expected, actual) { return true } @@ -53,7 +53,8 @@ func equal(t *testing.T, expected, actual interface{}) bool { t.Errorf("Failed equals at %s:%d\nactual %#v\nexpected %#v", fn, line, actual, expected) return false } -func lenTest(t *testing.T, actualO interface{}, expected int) bool { + +func lenTest(t *testing.T, actualO any, expected int) bool { actual := reflect.ValueOf(actualO).Len() if reflect.DeepEqual(expected, actual) { return true @@ -62,7 +63,8 @@ func lenTest(t *testing.T, actualO interface{}, expected int) bool { t.Errorf("Wrong length at %s:%d\nactual %#v\nexpected %#v", fn, line, actual, expected) return false } -func contains(t *testing.T, list, element interface{}) bool { + +func contains(t *testing.T, list, element any) bool { listValue := reflect.ValueOf(list) for i := 0; i < listValue.Len(); i++ { if reflect.DeepEqual(listValue.Index(i).Interface(), element) { @@ -77,10 +79,9 @@ func contains(t *testing.T, list, element interface{}) bool { func TestFromWgQuick(t *testing.T) { conf, err := FromWgQuick(testInput, "test") if noError(t, err) { - lenTest(t, conf.Interface.Addresses, 2) - contains(t, conf.Interface.Addresses, IPCidr{net.IPv4(10, 10, 0, 1), uint8(16)}) - contains(t, conf.Interface.Addresses, IPCidr{net.IPv4(10, 192, 122, 1), uint8(24)}) + contains(t, conf.Interface.Addresses, netip.PrefixFrom(netip.AddrFrom4([4]byte{0, 10, 0, 1}), 16)) + contains(t, conf.Interface.Addresses, netip.PrefixFrom(netip.AddrFrom4([4]byte{10, 192, 122, 1}), 24)) equal(t, "yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk=", conf.Interface.PrivateKey.String()) equal(t, uint16(51820), conf.Interface.ListenPort) |