moar tests

Signed-off-by: Thomas Fossati <[email protected]>

Author: thomas-fossati

cmw.go

@@ -90,7 +90,7 @@ func NewMonad(mediaType any, value []byte, indicators ...Indicator) *CMW {
 
 func (o CMW) GetMonadType() string         { return o.monad.getType() }
 func (o CMW) GetMonadValue() []byte        { return o.monad.getValue() }
-func (o CMW) GetMonadIndicator() Indicator { return o.ind }
+func (o CMW) GetMonadIndicator() Indicator { return o.monad.getIndicator() }
 func (o *CMW) UseCBORTagFormat()           { o.monad.format = FormatCBORTag }
 
 // NewCollection instantiate a new Collection CMW with the supplied __cmwc_t

collection_test.go

@@ -24,6 +24,8 @@ func Test_Collection_JSON_Deserialize_ok(t *testing.T) {
 	err := actual.UnmarshalJSON(tv)
 	assert.NoError(t, err)
 
+	assert.Equal(t, actual.GetFormat().String(), "JSON collection")
+
 	a, err := actual.GetCollectionItem("a")
 	assert.NoError(t, err)
 	assert.Equal(t, FormatJSONRecord, a.GetFormat())
@@ -79,6 +81,8 @@ func Test_Collection_CBOR_Deserialize_ok(t *testing.T) {
 	err := actual.UnmarshalCBOR(tv)
 	assert.NoError(t, err)
 
+	assert.Equal(t, actual.GetFormat().String(), "CBOR collection")
+
 	one, err := actual.GetCollectionItem(uint64(1))
 	assert.NoError(t, err)
 	assert.Equal(t, KindMonad, one.GetKind())

monad.go

@@ -55,7 +55,8 @@ func (o *monad) UnmarshalCBOR(b []byte) error {
 		}
 		o.format = FormatCBORTag
 	} else {
-		return fmt.Errorf("want CBOR Tag or CBOR array, got 0x%02x", b[0])
+		// unreachable
+		panic(fmt.Sprintf("want CBOR Tag or CBOR array, got 0x%02x", b[0]))
 	}
 
 	return nil

monad_test.go

@@ -411,3 +411,35 @@ func Test_UnmarshalCBOR_tag_ko(t *testing.T) {
 		})
 	}
 }
+
+func Test_UnmarshalCBOR_ko(t *testing.T) {
+	tests := []struct {
+		name        string
+		tv          []byte
+		expectedErr string
+	}{
+		{
+			"weird",
+			[]byte{0x00},
+			"want CBOR map, CBOR array or CBOR Tag start symbols, got: 0x00",
+		},
+		{
+			"empty",
+			[]byte{},
+			"empty buffer",
+		},
+		{
+			"abruptly truncated collection",
+			[]byte{0xa1, 0x00},
+			"unmarshaling CBOR collection: unexpected EOF",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var cmw CMW
+			err := cmw.UnmarshalCBOR(tt.tv)
+			assert.EqualError(t, err, tt.expectedErr)
+		})
+	}
+}

utils.go

@@ -38,5 +38,5 @@ func mustHexDecode(s string) []byte {
 func startJSONCollection(c byte) bool { return c == 0x7b }
 func startJSONRecord(c byte) bool     { return c == 0x5b }
 func startCBORCollection(c byte) bool { return c >= 0xa0 && c <= 0xbb || c == 0xbf }
-func startCBORRecord(c byte) bool     { return c == 0x82 || c == 0x83 }
+func startCBORRecord(c byte) bool     { return c == 0x82 || c == 0x83 || c == 0x9f }
 func startCBORTag(c byte) bool        { return c >= 0xda }