sendtables: fix Entity.PropertyValueMust() + add tests

Author: markus-wa

pkg/demoinfocs/sendtables/entity.go

@@ -42,7 +42,12 @@ func (e *entity) Properties() (out []Property) {
 }
 
 func (e *entity) property(name string) *property {
-	return &e.props[e.serverClass.propNameToIndex[name]]
+	i, ok := e.serverClass.propNameToIndex[name]
+	if !ok {
+		return nil
+	}
+
+	return &e.props[i]
 }
 
 // Property finds a property on the entity by name.

pkg/demoinfocs/sendtables/entity_test.go

@@ -0,0 +1,70 @@
+package sendtables
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+var testData = struct {
+	entity entity
+}{
+	entity: entity{
+		props: []property{
+			{value: PropertyValue{IntVal: 10}},
+			{value: PropertyValue{IntVal: 20}},
+			{value: PropertyValue{IntVal: 30}},
+		},
+		serverClass: &ServerClass{propNameToIndex: map[string]int{
+			"myProp":     0,
+			"test":       1,
+			"anotherOne": 2,
+		}},
+	},
+}
+
+func TestEntity_Properties(t *testing.T) {
+	ent := entity{props: []property{{value: PropertyValue{IntVal: 1}}}}
+
+	assert.Equal(t, &ent.props[0], ent.Properties()[0])
+}
+
+func TestEntity_ServerClass(t *testing.T) {
+	assert.Equal(t, testData.entity.serverClass, testData.entity.ServerClass())
+}
+
+func TestEntity_Property(t *testing.T) {
+	assert.Equal(t, &testData.entity.props[1], testData.entity.Property("test"))
+}
+
+func TestEntity_Property_Nil(t *testing.T) {
+	assert.Nil(t, testData.entity.Property("not_found"))
+}
+
+func TestEntity_Property_Value(t *testing.T) {
+	val, ok := testData.entity.PropertyValue("test")
+
+	assert.True(t, ok)
+	assert.Equal(t, PropertyValue{IntVal: 20}, val)
+}
+
+func TestEntity_PropertyValue_NotFound(t *testing.T) {
+	val, ok := testData.entity.PropertyValue("not_found")
+
+	assert.False(t, ok)
+	assert.Empty(t, val)
+}
+
+func TestEntity_PropertyValueMust_NotFound_Panics(t *testing.T) {
+	f := func() {
+		testData.entity.PropertyValueMust("not_found")
+	}
+
+	assert.Panics(t, f)
+}
+
+func TestProperty_Name(t *testing.T) {
+	prop := property{entry: &flattenedPropEntry{name: "test"}}
+
+	assert.Equal(t, "test", prop.Name())
+}

pkg/demoinfocs/sendtables/propdecoder.go

@@ -80,7 +80,7 @@ type PropertyValue struct {
 	FloatVal  float32
 }
 
-// BoolVal returns true if IntVal == 1.
+// BoolVal returns true if IntVal > 0.
 func (v PropertyValue) BoolVal() bool {
 	return v.IntVal > 0
 }

pkg/demoinfocs/sendtables/propdecoder_test.go

@@ -0,0 +1,22 @@
+package sendtables
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestPropertyValue_BoolVal(t *testing.T) {
+	assert.True(t, PropertyValue{IntVal: 1}.BoolVal())
+	assert.False(t, PropertyValue{IntVal: 0}.BoolVal())
+}
+
+func TestDecodeProp_UnknownType(t *testing.T) {
+	prop := &property{entry: &flattenedPropEntry{prop: &sendTableProperty{rawType: -1}}}
+
+	f := func() {
+		propDecoder.decodeProp(prop, nil)
+	}
+
+	assert.Panics(t, f)
+}