cleaning up tests and adding arp marshal test

protocol/arp/arp_test.go

@@ -0,0 +1,32 @@
+package arp
+
+import (
+ "encoding/hex"
+ "strings"
+ "testing"
+)
+
+func TestArpMarshalBinary(t *testing.T) {
+ b := " 00 01 " + // HWType
+ "08 00 " + // ProtoType
+ "06 04 " + // HWLength ProtoLength
+ "00 01 " + // Type_Request
+ "00 00 00 00 00 00 " + // HWSrc
+ "00 00 00 00 " + // IPSrc
+ "00 00 00 00 00 00 " + // HWDst
+ "00 00 00 00 " // IPDst
+ b = strings.Replace(b, " ", "", -1)
+
+ a, _ := New(Type_Request)
+ data, _ := a.MarshalBinary()
+ d := hex.EncodeToString(data)
+ if (len(b) != len(d)) || (b != d) {
+ t.Log("Exp:", b)
+ t.Log("Rec:", d)
+ t.Errorf("Received length of %d, expected %d", len(d), len(b))
+ }
+}
+
+func TestArpUnmarshalBinary(t *testing.T) {
+
+}

protocol/ofpxx/header_test.go

@@ -7,21 +7,18 @@ import (
 )
 
 func TestHelloMarshalBinary(t *testing.T) {
- s := " 01 00 00 08 00 00 00 03 " + // Header
+ b := " 01 00 00 08 00 00 00 03 " + // Header
  "00 01 00 08 " + // Element Header
  "00 00 00 09 " // Bitmap = 1001
- s = strings.Replace(s, " ", "", -1)
- bytes, _ := hex.DecodeString(s)
+ b = strings.Replace(b, " ", "", -1)
 
  h, _ := NewHello(1)
  data, _ := h.MarshalBinary()
-
- b := hex.EncodeToString(bytes)
  d := hex.EncodeToString(data)
  if (len(b) != len(d)) || (b != d) {
  t.Log("Exp:", b)
  t.Log("Rec:", d)
- t.Errorf("Received length of %d, expected %d", len(data), len(bytes))
+ t.Errorf("Received length of %d, expected %d", len(d), len(b))
  }
 }