Merge branch 'master' of https://github.com/256dpi/gomqtt

256dpi · Feb 11, 2020 · 518a5db · 518a5db
2 parents a48dde8 + fc6876a
commit 518a5db
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/broker/example_test.go b/broker/example_test.go
@@ -102,12 +102,12 @@ func Example() {
 	// B [packet sent] <Connack SessionPresent=false ReturnCode=0>
 	// B [packet received] <Subscribe ID=1 Subscriptions=["test"=>0]>
 	// B [packet sent] <Suback ID=1 ReturnCodes=[0]>
-	// B [packet received] <Publish ID=0 Message=<Message Topic="test" QOS=0 Retain=false Payload=[116 101 115 116]> Dup=false>
-	// B [message published] <Message Topic="test" QOS=0 Retain=false Payload=[116 101 115 116]>
-	// B [message dequeued] <Message Topic="test" QOS=0 Retain=false Payload=[116 101 115 116]>
-	// B [packet sent] <Publish ID=0 Message=<Message Topic="test" QOS=0 Retain=false Payload=[116 101 115 116]> Dup=false>
-	// B [message forwarded] <Message Topic="test" QOS=0 Retain=false Payload=[116 101 115 116]>
-	// C [message] <Message Topic="test" QOS=0 Retain=false Payload=[116 101 115 116]>
+	// B [packet received] <Publish ID=0 Message=<Message Topic="test" QOS=0 Retain=false Payload=74657374> Dup=false>
+	// B [message published] <Message Topic="test" QOS=0 Retain=false Payload=74657374>
+	// B [message dequeued] <Message Topic="test" QOS=0 Retain=false Payload=74657374>
+	// B [packet sent] <Publish ID=0 Message=<Message Topic="test" QOS=0 Retain=false Payload=74657374> Dup=false>
+	// B [message forwarded] <Message Topic="test" QOS=0 Retain=false Payload=74657374>
+	// C [message] <Message Topic="test" QOS=0 Retain=false Payload=74657374>
 	// B [packet received] <Disconnect>
 	// B [client disconnected]
 	// B [lost connection]

diff --git a/packet/connect_test.go b/packet/connect_test.go
@@ -15,7 +15,7 @@ func TestConnectInterface(t *testing.T) {
 	}
 
 	assert.Equal(t, pkt.Type(), CONNECT)
-	assert.Equal(t, "<Connect ClientID=\"\" KeepAlive=0 Username=\"\" Password=\"\" CleanSession=true Will=<Message Topic=\"w\" QOS=1 Retain=false Payload=[109]> Version=4>", pkt.String())
+	assert.Equal(t, "<Connect ClientID=\"\" KeepAlive=0 Username=\"\" Password=\"\" CleanSession=true Will=<Message Topic=\"w\" QOS=1 Retain=false Payload=6d> Version=4>", pkt.String())
 }
 
 func TestConnectDecode1(t *testing.T) {

diff --git a/packet/message.go b/packet/message.go
@@ -21,7 +21,7 @@ type Message struct {
 
 // String returns a string representation of the message.
 func (m *Message) String() string {
-	return fmt.Sprintf("<Message Topic=%q QOS=%d Retain=%t Payload=%v>",
+	return fmt.Sprintf("<Message Topic=%q QOS=%d Retain=%t Payload=%x>",
 		m.Topic, m.QOS, m.Retain, m.Payload)
 }
 

diff --git a/packet/messages_test.go b/packet/messages_test.go
@@ -13,7 +13,7 @@ func TestMessageString(t *testing.T) {
 		QOS:     QOSAtLeastOnce,
 	}
 
-	assert.Equal(t, "<Message Topic=\"w\" QOS=1 Retain=false Payload=[109]>", msg.String())
+	assert.Equal(t, "<Message Topic=\"w\" QOS=1 Retain=false Payload=6d>", msg.String())
 }
 
 func TestMessageCopy(t *testing.T) {

diff --git a/packet/publish_test.go b/packet/publish_test.go
@@ -10,7 +10,7 @@ func TestPublishInterface(t *testing.T) {
 	pkt := NewPublish()
 
 	assert.Equal(t, pkt.Type(), PUBLISH)
-	assert.Equal(t, "<Publish ID=0 Message=<Message Topic=\"\" QOS=0 Retain=false Payload=[]> Dup=false>", pkt.String())
+	assert.Equal(t, "<Publish ID=0 Message=<Message Topic=\"\" QOS=0 Retain=false Payload=> Dup=false>", pkt.String())
 }
 
 func TestPublishDecode1(t *testing.T) {