Merge branch 'master' of https://github.com/yomorun/y3-codec-golang

Author: chenjunbiao

node_decoder.go

@@ -3,9 +3,8 @@ package y3
 import (
 	"errors"
 
-	"github.com/yomorun/y3-codec-golang/pkg/encoding"
-
 	"github.com/yomorun/y3-codec-golang/internal/mark"
+	"github.com/yomorun/y3-codec-golang/pkg/encoding"
 )
 
 func parsePayload(b []byte) (endPos int, ifNodePacket bool, np *NodePacket, pp *PrimitivePacket, err error) {
@@ -64,9 +63,7 @@ func DecodeNodePacket(buf []byte) (pct *NodePacket, endPos int, err error) {
 
 	// Parse value to Packet
 	for {
-		// fmt.Println("------>pos:", pos, ", endPos:", endPos, ", len(buf)", len(buf))
 		if pos >= endPos || pos >= len(buf) {
-			// fmt.Println("===GAME OVER===")
 			break
 		}
 		_p, isNode, np, pp, err := parsePayload(buf[pos:endPos])

primitive_test.go

@@ -2,6 +2,8 @@ package y3
 
 import (
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 // 每个Packet最小长度是2个bytes
@@ -18,6 +20,8 @@ func TestPacketWrongLength(t *testing.T) {
 	buf := []byte{0x04, 0x00, 0x02, 0x01}
 	expected := "malformed, Length can not smaller than 1"
 	_, _, _, err := DecodePrimitivePacket(buf)
+	assert.NoError(t, err)
+
 	if err != nil && err.Error() != expected {
 		t.Errorf("err should %v, actual = %v", expected, err)
 	}
@@ -27,51 +31,33 @@ func TestPacketWrongLength(t *testing.T) {
 func TestPacketRead(t *testing.T) {
 	buf := []byte{0x04, 0x01, 0x7F}
 	expectedTag := byte(0x04)
-	var expectedLength int32 = 1
+	var expectedLength uint32 = 1
 	expectedValue := []byte{0x7F}
 
 	res, endPos, _, err := DecodePrimitivePacket(buf)
-	if err != nil {
-		t.Errorf("err should nil, actual = %v", err)
-	}
-
-	if res.SeqID() != expectedTag {
-		t.Errorf("res.Tag actual = %v, and Expected = %v", res.SeqID(), expectedTag)
-	}
+	assert.NoError(t, err)
 
-	if res.length != uint32(expectedLength) {
-		t.Errorf("res.Length actual = %v, and Expected = %v", res.length, expectedLength)
-	}
+	assert.Equal(t, expectedTag, res.SeqID())
+	assert.Equal(t, expectedLength, res.length)
 
 	if !_compareByteSlice(res.valBuf, expectedValue) {
 		t.Errorf("res.raw actual = %v, and Expected = %v", res.valBuf, expectedValue)
 	}
 
-	if endPos != 3 {
-		t.Errorf("endPos actual = %v, and Expected = %v", endPos, 3)
-	}
+	assert.Equal(t, endPos, 3)
 }
 
 // 测试读取 0x0A:2
 func TestParseInt32(t *testing.T) {
-	// 原例子数据存在问题，修改如下：
-	//buf := []byte{0x0A, 0x02, 0x01, 0x02}
 	buf := []byte{0x0A, 0x02, 0x81, 0x7F}
-	expected := int32(255)
+	expectedValue := int32(255)
 
 	res, _, _, err := DecodePrimitivePacket(buf)
-	if err != nil {
-		t.Errorf("err should nil, actual = %v", err)
-	}
-
-	val, err := res.ToInt32()
-	if err != nil {
-		t.Errorf("err should nil, actual = %v", err)
-	}
+	assert.NoError(t, err)
 
-	if val != expected {
-		t.Errorf("value actual = %v, and Expected = %v", val, expected)
-	}
+	target, err := res.ToInt32()
+	assert.NoError(t, err)
+	assert.Equal(t, expectedValue, target)
 }
 
 // 测试 0x0B:"C"
@@ -80,18 +66,24 @@ func TestParseString(t *testing.T) {
 	expectedValue := "C"
 
 	res, _, _, err := DecodePrimitivePacket(buf)
-	if err != nil {
-		t.Errorf("err should nil, actual = %v", err)
-	}
+	assert.NoError(t, err)
 
 	target, err := res.ToUTF8String()
-	if err != nil {
-		t.Errorf("err should be nil, actual = %v", err)
-	}
+	assert.NoError(t, err)
+	assert.Equal(t, expectedValue, target)
+}
 
-	if expectedValue != target {
-		t.Errorf("Result actual = %v, and Expected = %v", t, expectedValue)
-	}
+// 测试 0x0B:"C"
+func TestParseEmptyString(t *testing.T) {
+	buf := []byte{0x0B, 0x00}
+	expectedValue := ""
+
+	res, _, _, err := DecodePrimitivePacket(buf)
+	assert.NoError(t, err)
+
+	target, err := res.ToUTF8String()
+	assert.NoError(t, err)
+	assert.Equal(t, expectedValue, target)
 }
 
 // compares two slice, every element is equal