Refactor stringer (#61)

mqtt.go

@@ -84,17 +84,16 @@ const (
 	StateDisconnected                  // connection is expectedly closed
 )
 
+var connStateString = map[ConnState]string{
+	StateNew:          "New",
+	StateActive:       "Active",
+	StateClosed:       "Closed",
+	StateDisconnected: "Disconnected",
+}
+
 func (s ConnState) String() string {
-	switch s {
-	case StateNew:
-		return "New"
-	case StateActive:
-		return "Active"
-	case StateClosed:
-		return "Closed"
-	case StateDisconnected:
-		return "Disconnected"
-	default:
-		return "Unknown"
+	if str, ok := connStateString[s]; ok {
+		return str
 	}
+	return "Unknown"
 }

packet.go

@@ -52,36 +52,26 @@ func (t packetType) b() byte {
 	return byte(t)
 }
 
+var packetTypeString = map[packetType]string{
+	packetConnect:     "CONNECT",
+	packetConnAck:     "CONNACK",
+	packetPublish:     "PUBLISH",
+	packetPubAck:      "PUBACK",
+	packetPubRec:      "PUBREC",
+	packetPubRel:      "PUBREL",
+	packetPubComp:     "PUBCOMP",
+	packetSubscribe:   "SUBSCRIBE",
+	packetSubAck:      "SUBACK",
+	packetUnsubscribe: "UNSUBSCRIBE",
+	packetUnsubAck:    "UNSUBACK",
+	packetPingReq:     "PINGREQ",
+	packetPingResp:    "PINGRESP",
+	packetDisconnect:  "DISCONNECT",
+}
+
 func (t packetType) String() string {
-	switch t {
-	case packetConnect:
-		return "CONNECT"
-	case packetConnAck:
-		return "CONNACK"
-	case packetPublish:
-		return "PUBLISH"
-	case packetPubAck:
-		return "PUBACK"
-	case packetPubRec:
-		return "PUBREC"
-	case packetPubRel:
-		return "PUBREL"
-	case packetPubComp:
-		return "PUBCOMP"
-	case packetSubscribe:
-		return "SUBSCRIBE"
-	case packetSubAck:
-		return "SUBACK"
-	case packetUnsubscribe:
-		return "UNSUBSCRIBE"
-	case packetUnsubAck:
-		return "UNSUBACK"
-	case packetPingReq:
-		return "PINGREQ"
-	case packetPingResp:
-		return "PINGRESP"
-	case packetDisconnect:
-		return "DISCONNECT"
+	if s, ok := packetTypeString[t]; ok {
+		return s
 	}
 	return fmt.Sprintf("Unknown packet type %x", int(t))
 }

packet_test.go

@@ -16,6 +16,7 @@ package mqtt
 
 import (
 	"bytes"
+	"strings"
 	"testing"
 )
 
@@ -37,3 +38,14 @@ func TestRemainingLength(t *testing.T) {
 		}
 	}
 }
+
+func TestPacketType(t *testing.T) {
+	if packetConnect.String() != "CONNECT" {
+		t.Errorf("Expected packetConnect.String(): CONNECT, got: %s", packetConnect.String())
+	}
+	if !strings.HasPrefix(packetType(0xFF).String(), "Unknown") {
+		t.Errorf("Expected invlidPacketType.String(): Unknown..., got: %s",
+			packetType(0xFF).String(),
+		)
+	}
+}