fix: proto.Value's Valid method when handling slice of uint_z (#377)

muktihari · Aug 29, 2024 · 45dc8f0 · 45dc8f0
1 parent ee7c952
commit 45dc8f0
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 12 deletions.
diff --git a/proto/value.go b/proto/value.go
@@ -497,9 +497,17 @@ func (v Value) Valid(t basetype.BaseType) bool {
 		return invalidCount != len(vals)
 	case TypeSliceUint8:
 		vals := v.SliceUint8()
-		for i := range vals {
-			if vals[i] == basetype.Uint8Invalid {
-				invalidCount++
+		if t == basetype.Uint8z {
+			for i := range vals {
+				if vals[i] == basetype.Uint8zInvalid {
+					invalidCount++
+				}
+			}
+		} else {
+			for i := range vals {
+				if vals[i] == basetype.Uint8Invalid {
+					invalidCount++
+				}
 			}
 		}
 		return invalidCount != len(vals)
@@ -513,9 +521,17 @@ func (v Value) Valid(t basetype.BaseType) bool {
 		return invalidCount != len(vals)
 	case TypeSliceUint16:
 		vals := v.SliceUint16()
-		for i := range vals {
-			if vals[i] == basetype.Uint16Invalid {
-				invalidCount++
+		if t == basetype.Uint16z {
+			for i := range vals {
+				if vals[i] == basetype.Uint16zInvalid {
+					invalidCount++
+				}
+			}
+		} else {
+			for i := range vals {
+				if vals[i] == basetype.Uint16Invalid {
+					invalidCount++
+				}
 			}
 		}
 		return invalidCount != len(vals)
@@ -529,9 +545,17 @@ func (v Value) Valid(t basetype.BaseType) bool {
 		return invalidCount != len(vals)
 	case TypeSliceUint32:
 		vals := v.SliceUint32()
-		for i := range vals {
-			if vals[i] == basetype.Uint32Invalid {
-				invalidCount++
+		if t == basetype.Uint32z {
+			for i := range vals {
+				if vals[i] == basetype.Uint32zInvalid {
+					invalidCount++
+				}
+			}
+		} else {
+			for i := range vals {
+				if vals[i] == basetype.Uint32Invalid {
+					invalidCount++
+				}
 			}
 		}
 		return invalidCount != len(vals)
@@ -561,9 +585,17 @@ func (v Value) Valid(t basetype.BaseType) bool {
 		return invalidCount != len(vals)
 	case TypeSliceUint64:
 		vals := v.SliceUint64()
-		for i := range vals {
-			if vals[i] == basetype.Uint64Invalid {
-				invalidCount++
+		if t == basetype.Uint64z {
+			for i := range vals {
+				if vals[i] == basetype.Uint64zInvalid {
+					invalidCount++
+				}
+			}
+		} else {
+			for i := range vals {
+				if vals[i] == basetype.Uint64Invalid {
+					invalidCount++
+				}
 			}
 		}
 		return invalidCount != len(vals)

diff --git a/proto/value_test.go b/proto/value_test.go
@@ -939,17 +939,21 @@ func TestValueValid(t *testing.T) {
 		{value: SliceBool([]bool{false, false}), baseType: basetype.Enum, expected: true}, // true even it all false.
 		{value: SliceInt8([]int8{0, basetype.Sint8Invalid}), baseType: basetype.Sint8, expected: true},
 		{value: SliceUint8([]uint8{0, basetype.Uint8Invalid}), baseType: basetype.Uint8, expected: true},
+		{value: SliceUint8([]uint8{1, basetype.Uint8zInvalid}), baseType: basetype.Uint8z, expected: true},
 		{value: SliceInt16([]int16{0, basetype.Sint16Invalid}), baseType: basetype.Sint16, expected: true},
 		{value: SliceUint16([]uint16{0, basetype.Uint16Invalid}), baseType: basetype.Uint16, expected: true},
+		{value: SliceUint16([]uint16{1, basetype.Uint16zInvalid}), baseType: basetype.Uint16z, expected: true},
 		{value: SliceInt32([]int32{0, basetype.Sint32Invalid}), baseType: basetype.Sint32, expected: true},
 		{value: SliceString([]string{"FIT SDK Go"}), baseType: basetype.String, expected: true},
 		{value: SliceString([]string{""}), baseType: basetype.String, expected: false},
 		{value: SliceString([]string{"\x00"}), baseType: basetype.String, expected: false},
 		{value: SliceUint32([]uint32{0, basetype.Uint32Invalid}), baseType: basetype.Uint32, expected: true},
+		{value: SliceUint32([]uint32{1, basetype.Uint32zInvalid}), baseType: basetype.Uint32z, expected: true},
 		{value: SliceFloat32([]float32{0.2, math.Float32frombits(basetype.Float32Invalid)}), baseType: basetype.Float32, expected: true},
 		{value: SliceFloat64([]float64{0.5, math.Float64frombits(basetype.Float64Invalid)}), baseType: basetype.Float64, expected: true},
 		{value: SliceInt64([]int64{0, basetype.Sint64Invalid}), baseType: basetype.Sint64, expected: true},
 		{value: SliceUint64([]uint64{0, basetype.Uint64Invalid}), baseType: basetype.Uint64, expected: true},
+		{value: SliceUint64([]uint64{1, basetype.Uint64zInvalid}), baseType: basetype.Uint64z, expected: true},
 	}
 	for i, tc := range tt {
 		t.Run(fmt.Sprintf("[%d] %v (%T)", i, tc.value.Any(), tc.value.Any()), func(t *testing.T) {