mirrors/netboot
1
0
Fork 0
mirror of https://github.com/danderson/netboot.git synced 2025-10-16 10:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

dhcp4: Add tests for the option accessors... and fix a bug.

Browse Source 
Turns out tests are useful.
This commit is contained in:
David Anderson 2016-05-15 17:45:54 -07:00
parent c412f00cb8
commit 3fb28ed0f7
2 changed files with 154 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dhcp4/options.go
View File

@ -174,7 +174,7 @@ func (o Options) marshalLimited(w io.Writer, nBytes int, skip52 bool) (Options,
return ret, nil
}
// String returns the value of option n as a byte slice.
// Bytes returns the value of option n as a byte slice.
func (o Options) Bytes(n Option) ([]byte, error) {
bs := o[n]
if bs == nil {
@ -249,7 +249,7 @@ func (o Options) IPs(n Option) ([]net.IP, error) {
if len(bs) < 4 || len(bs)%4 != 0 {
return nil, errOptionWrongSize
}
ret := make([]net.IP, len(bs)/4)
ret := make([]net.IP, 0, len(bs)/4)
for i := 0; i < len(bs); i += 4 {
ret = append(ret, net.IP(bs[i:i+4]))
}

166
dhcp4/options_test.go
View File

@ -14,34 +14,172 @@
package dhcp
import "testing"
import (
"net"
"testing"
)
func TestOptionReading(t *testing.T) {
func TestOptionByte(t *testing.T) {
o := Options{
1: []byte{1, 2, 3},
2: []byte{3},
3: []byte{0, 1},
1: []byte{3},
2: []byte{1, 2, 3},
}
b, err := o.Byte(2)
b, err := o.Byte(1)
if err != nil {
t.Fatalf("Option 2 should be a valid byte, but got: %s", err)
t.Fatal(err)
}
if b != 3 {
t.Fatalf("Wanted value 3 for option 2, got %d", b)
t.Fatalf("wanted value 3, got %d", b)
}
b, err = o.Byte(3)
b, err = o.Byte(2)
if err == nil {
t.Fatalf("Option 3 shouldn't be a valid byte")
t.Fatalf("option shouldn't be a valid byte")
}
}
func TestOptionUint16(t *testing.T) {
o := Options{
1: []byte{1, 2},
2: []byte{1, 2, 3},
}
u, err := o.Uint16(3)
u, err := o.Uint16(1)
if err != nil {
t.Fatalf("Option 3 should be a valid byte, but got: %s", err)
t.Fatal(err)
}
if u != 1 {
t.Fatalf("Wanted value 1 for option 3, got %d", u)
if u != 258 {
t.Fatalf("wanted value 258, got %d", u)
}
u, err = o.Uint16(2)
if err == nil {
t.Fatal("option shouldn't be a valid uint16")
}
}
func TestOptionUint32(t *testing.T) {
o := Options{
1: []byte{1, 2, 3, 4},
2: []byte{1, 2, 3},
}
u, err := o.Uint32(1)
if err != nil {
t.Fatal(err)
}
if u != 16909060 {
t.Fatalf("wanted value 16909060, got %d", u)
}
u, err = o.Uint32(2)
if err == nil {
t.Fatal("option shouldn't be a valid uint32")
}
}
func TestOptionInt32(t *testing.T) {
o := Options{
1: []byte{0xff, 0xff, 0xff, 0xff},
2: []byte{1, 2, 3},
}
u, err := o.Int32(1)
if err != nil {
t.Fatal(err)
}
if u != -1 {
t.Fatalf("wanted value -1, got %d", u)
}
u, err = o.Int32(2)
if err == nil {
t.Fatal("option shouldn't be a valid int32")
}
}
func TestOptionIPs(t *testing.T) {
o := Options{
1: []byte{1, 2, 3, 4, 5, 6, 7, 8},
2: []byte{1, 2, 3, 4, 5, 6},
3: []byte{1, 2, 3},
}
ips, err := o.IPs(1)
if err != nil {
t.Fatal(err)
}
if len(ips) != 2 {
t.Fatal("wrong number of IPs")
}
if !ips[0].Equal(net.IPv4(1, 2, 3, 4)) {
t.Fatalf("wrong first IP, got %s", ips[0])
}
if !ips[1].Equal(net.IPv4(5, 6, 7, 8)) {
t.Fatalf("wrong second IP, got %s", ips[0])
}
ips, err = o.IPs(2)
if err == nil {
t.Fatal("option shouldn't be a valid IPs")
}
ips, err = o.IPs(3)
if err == nil {
t.Fatal("option shouldn't be a valid IPs")
}
}
func TestOptionIP(t *testing.T) {
o := Options{
1: []byte{1, 2, 3, 4},
2: []byte{1, 2, 3, 4, 5, 6},
3: []byte{1, 2, 3},
}
ip, err := o.IP(1)
if err != nil {
t.Fatal(err)
}
if !ip.Equal(net.IPv4(1, 2, 3, 4)) {
t.Fatalf("wrong first IP, got %s", ip)
}
ip, err = o.IP(2)
if err == nil {
t.Fatal("option shouldn't be a valid IPs")
}
ip, err = o.IP(3)
if err == nil {
t.Fatal("option shouldn't be a valid IPs")
}
}
func TestOptionIPMask(t *testing.T) {
o := Options{
1: []byte{1, 2, 3, 4},
2: []byte{1, 2, 3, 4, 5, 6},
3: []byte{1, 2, 3},
}
ipmask, err := o.IPMask(1)
if err != nil {
t.Fatal(err)
}
if !net.IP(ipmask).Equal(net.IP(net.IPv4Mask(1, 2, 3, 4))) {
t.Fatalf("wrong first IP, got %s", ipmask)
}
ipmask, err = o.IPMask(2)
if err == nil {
t.Fatal("option shouldn't be a valid IPs")
}
ipmask, err = o.IPMask(3)
if err == nil {
t.Fatal("option shouldn't be a valid IPs")
}
}