Simplify unmarshalling.

packages/ipp/keyword_test.go

@@ -3,6 +3,8 @@
 package ipp
 
 import (
+	"bufio"
+	"bytes"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -22,6 +24,28 @@ import (
 // 	assert.Equal(T, k.values[0], "printer-make-and-model")
 // }
 
+func TestUnmarshalKeywordWithMultipleStrings(t *testing.T) {
+	// test data from rfc8010 example A8 Get-Jobs request
+	testdata := []byte{0x00, 0x14,
+		'r', 'e', 'q', 'u', 'e', 's', 't', 'e', 'd', '-', 'a', 't', 't', 'r', 'i', 'b', 'u', 't', 'e', 's',
+		0x00, 0x06,
+		'j', 'o', 'b', '-', 'i', 'd',
+		0x44, 0x00, 0x00, 0x00, 0x08,
+		'j', 'o', 'b', '-', 'n', 'a', 'm', 'e',
+		0x44, 0x00, 0x00, 0x00, 0x0f,
+		'd', 'o', 'c', 'u', 'm', 'e', 'n', 't', '-', 'f', 'o', 'r', 'm', 'a', 't',
+	}
+	buf := bytes.NewBuffer(testdata)
+	r := bufio.NewReader(buf)
+	k := NewKeyWord("")
+	k.unmarshal(r)
+	assert.Equal(t, k.Name(), "requested-attributes")
+	assert.Len(t, k.sos.values, 3)
+	assert.Equal(t, k.sos.values[0], "job-id")
+	assert.Equal(t, k.sos.values[1], "job-name")
+	assert.Equal(t, k.sos.values[2], "document-format")
+}
+
 func TestMarshalSimpleKeyword(T *testing.T) {
 	testdata := []byte{
 		0x44, 0x00, 0x14,
@@ -36,3 +60,28 @@ func TestMarshalSimpleKeyword(T *testing.T) {
 	assert.Equal(T, testdata, m, "Should be equal")
 
 }
+
+func TestUnMarshalKeywordWithAdditionalValues(T *testing.T) {
+	testdata := []byte{
+		0x00, 0x04,
+		0x72, 0x65, 0x71, 0x75,
+		0x00, 0x06,
+		0x70, 0x72, 0x69, 0x6e, 0x74, 0x65,
+		0x44, 0x00, 0x00,
+		0x00, 0x04,
+		0x6e, 0x69, 0x72, 0x70,
+		0x44, 0x00, 0x00,
+		0x00, 0x05,
+		0x70, 0x72, 0x69, 0x6e, 0x74, 0x00,
+	}
+
+	b := bytes.NewBuffer(testdata)
+	buf := bufio.NewReader(b)
+	k := NewKeyWord("")
+	k.unmarshal(buf)
+
+	assert.Equal(T, "requ", k.sos.name, "Wrong name")
+	assert.Equal(T, "printe", k.sos.values[0], "Wrong value 0")
+	assert.Equal(T, "nirp", k.sos.values[1], "Wrong value 1")
+	assert.Equal(T, "print", k.sos.values[2], "Wrong value 2")
+}