s2 test fixes

Author: markus-wa

pkg/demoinfocs/common/common_test.go

@@ -12,6 +12,10 @@ import (
 	stfake "github.com/markus-wa/demoinfocs-golang/v4/pkg/demoinfocs/sendtables/fake"
 )
 
+var s1DemoInfoProvider = demoInfoProviderMock{
+	isSource2: false,
+}
+
 func TestBombPosition(t *testing.T) {
 	groundPos := r3.Vector{X: 1, Y: 2, Z: 3}
 	bomb := Bomb{
@@ -91,7 +95,16 @@ func TestTeamState_EquipmentValueCurrent(t *testing.T) {
 		playerWithProperty("m_unCurrentEquipmentValue", st.PropertyValue{IntVal: 100}),
 		playerWithProperty("m_unCurrentEquipmentValue", st.PropertyValue{IntVal: 200}),
 	}
-	state := NewTeamState(TeamTerrorists, func(Team) []*Player { return members }, demoInfoProviderMock{})
+
+	dip := demoInfoProviderMock{
+		isSource2: false,
+	}
+
+	for _, p := range members {
+		p.demoInfoProvider = dip
+	}
+
+	state := NewTeamState(TeamTerrorists, func(Team) []*Player { return members }, dip)
 
 	assert.Equal(t, 300, state.CurrentEquipmentValue())
 }
@@ -101,7 +114,16 @@ func TestTeamState_EquipmentValueRoundStart(t *testing.T) {
 		playerWithProperty("m_unRoundStartEquipmentValue", st.PropertyValue{IntVal: 100}),
 		playerWithProperty("m_unRoundStartEquipmentValue", st.PropertyValue{IntVal: 200}),
 	}
-	state := NewTeamState(TeamTerrorists, func(Team) []*Player { return members }, demoInfoProviderMock{})
+
+	dip := demoInfoProviderMock{
+		isSource2: false,
+	}
+
+	for _, p := range members {
+		p.demoInfoProvider = dip
+	}
+
+	state := NewTeamState(TeamTerrorists, func(Team) []*Player { return members }, dip)
 
 	assert.Equal(t, 300, state.RoundStartEquipmentValue())
 }
@@ -111,7 +133,16 @@ func TestTeamState_EquipmentValueFreezeTimeEnd(t *testing.T) {
 		playerWithProperty("m_unFreezetimeEndEquipmentValue", st.PropertyValue{IntVal: 100}),
 		playerWithProperty("m_unFreezetimeEndEquipmentValue", st.PropertyValue{IntVal: 200}),
 	}
-	state := NewTeamState(TeamTerrorists, func(Team) []*Player { return members }, demoInfoProviderMock{})
+
+	dip := demoInfoProviderMock{
+		isSource2: false,
+	}
+
+	for _, p := range members {
+		p.demoInfoProvider = dip
+	}
+
+	state := NewTeamState(TeamTerrorists, func(Team) []*Player { return members }, dip)
 
 	assert.Equal(t, 300, state.FreezeTimeEndEquipmentValue())
 }
@@ -175,6 +206,7 @@ func TestConvertSteamID64To32(t *testing.T) {
 type fakeProp struct {
 	propName string
 	value    st.PropertyValue
+	isNil    bool
 }
 
 type demoInfoProviderMock struct {
@@ -251,6 +283,12 @@ func entityWithProperties(properties []fakeProp) *stfake.Entity {
 	entity.On("Property", mock.Anything).Return(nil)
 
 	for _, prop := range properties {
+		if prop.isNil {
+			entity.On("Property", prop.propName).Return(nil)
+
+			continue
+		}
+
 		property := new(stfake.Property)
 		property.On("Value").Return(prop.value)
 

pkg/demoinfocs/common/equipment.go

@@ -401,6 +401,10 @@ func (e *Equipment) ZoomLevel() ZoomLevel {
 // Returns CWeaponCSBase.m_iPrimaryReserveAmmoCount for most weapons and 'Owner.AmmoLeft[AmmoType] - 1' for grenades.
 // Use AmmoInMagazine() + AmmoReserve() to quickly get the amount of grenades a player owns.
 func (e *Equipment) AmmoReserve() int {
+	if e.Entity == nil {
+		return 0
+	}
+
 	if e.Class() == EqClassGrenade {
 		s2Prop := e.Entity.Property("m_pReserveAmmo.0001")
 		if s2Prop != nil {
@@ -422,10 +426,6 @@ func (e *Equipment) AmmoReserve() int {
 		return 0
 	}
 
-	if e.Entity == nil {
-		return 0
-	}
-
 	// if the property doesn't exist we return 0 by default
 	val, _ := e.Entity.PropertyValue("m_iPrimaryReserveAmmoCount")
 

pkg/demoinfocs/common/equipment_test.go

@@ -41,7 +41,7 @@ func TestEquipment_UniqueID(t *testing.T) {
 func TestEquipment_AmmoInMagazine(t *testing.T) {
 	wep := &Equipment{
 		Type:   EqAK47,
-		Entity: entityWithProperty("m_iClip1", st.PropertyValue{IntVal: 31}),
+		Entity: entityWithProperty("m_iClip1", st.PropertyValue{IntVal: 31, Any: uint32(30)}),
 	}
 
 	// returned value should be minus 1, m_iClip1 is always 1 more than the actual number of bullets
@@ -78,7 +78,18 @@ func TestEquipment_AmmoInMagazine_EntityNil(t *testing.T) {
 }
 
 func TestEquipment_AmmoReserve(t *testing.T) {
-	entity := entityWithProperty("m_iPrimaryReserveAmmoCount", st.PropertyValue{IntVal: 60})
+	entity := entityWithProperties([]fakeProp{
+		{
+			propName: "m_pReserveAmmo.0000",
+			value:    st.PropertyValue{},
+			isNil:    true,
+		},
+		{
+			propName: "m_iPrimaryReserveAmmoCount",
+			value:    st.PropertyValue{IntVal: 60},
+			isNil:    false,
+		},
+	})
 	wep := &Equipment{
 		Type:   EqAK47,
 		Entity: entity,
@@ -91,7 +102,18 @@ func TestEquipment_AmmoReserve_Grenade(t *testing.T) {
 	owner := new(Player)
 	owner.AmmoLeft[1] = 2
 
-	entity := entityWithProperty("LocalWeaponData.m_iPrimaryAmmoType", st.PropertyValue{IntVal: 1})
+	entity := entityWithProperties([]fakeProp{
+		{
+			propName: "m_pReserveAmmo.0001",
+			value:    st.PropertyValue{},
+			isNil:    true,
+		},
+		{
+			propName: "LocalWeaponData.m_iPrimaryAmmoType",
+			value:    st.PropertyValue{IntVal: 1},
+			isNil:    false,
+		},
+	})
 	wep := &Equipment{
 		Type:   EqFlash,
 		Owner:  owner,

pkg/demoinfocs/common/player_test.go

@@ -140,6 +140,7 @@ func TestPlayer_FlashDurationTimeRemaining_Fallback(t *testing.T) {
 func TestPlayer_IsSpottedBy_HasSpotted_True(t *testing.T) {
 	pl := playerWithProperty("m_bSpottedByMask.000", st.PropertyValue{IntVal: 2})
 	pl.EntityID = 1
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	other := newPlayer(0)
 	other.EntityID = 2
@@ -150,6 +151,7 @@ func TestPlayer_IsSpottedBy_HasSpotted_True(t *testing.T) {
 
 func TestPlayer_IsSpottedBy_HasSpotted_False(t *testing.T) {
 	pl := playerWithProperty("m_bSpottedByMask.000", st.PropertyValue{IntVal: 0})
+	pl.demoInfoProvider = s1DemoInfoProvider
 	pl.EntityID = 1
 
 	other := newPlayer(0)
@@ -161,6 +163,7 @@ func TestPlayer_IsSpottedBy_HasSpotted_False(t *testing.T) {
 
 func TestPlayer_IsSpottedBy_HasSpotted_BitOver32(t *testing.T) {
 	pl := playerWithProperty("m_bSpottedByMask.001", st.PropertyValue{IntVal: 1})
+	pl.demoInfoProvider = s1DemoInfoProvider
 	pl.EntityID = 1
 
 	other := newPlayer(0)
@@ -182,67 +185,78 @@ func TestPlayer_IsSpottedBy_EntityNull(t *testing.T) {
 
 func TestPlayer_IsInBombZone(t *testing.T) {
 	pl := playerWithProperty("m_bInBombZone", st.PropertyValue{IntVal: 1})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.True(t, pl.IsInBombZone())
 }
 
 func TestPlayer_IsInBuyZone(t *testing.T) {
 	pl := playerWithProperty("m_bInBuyZone", st.PropertyValue{IntVal: 1})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.True(t, pl.IsInBuyZone())
 }
 
 func TestPlayer_IsWalking(t *testing.T) {
 	pl := playerWithProperty("m_bIsWalking", st.PropertyValue{IntVal: 1})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.True(t, pl.IsWalking())
 }
 
 func TestPlayer_IsScoped(t *testing.T) {
 	pl := playerWithProperty("m_bIsScoped", st.PropertyValue{IntVal: 1})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.True(t, pl.IsScoped())
 }
 
 func TestPlayer_IsAirborne_NilEntity(t *testing.T) {
 	pl := new(Player)
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.False(t, pl.IsAirborne())
 }
 
 func TestPlayer_IsAirborne(t *testing.T) {
 	pl := playerWithProperty("m_hGroundEntity", st.PropertyValue{IntVal: 0})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.False(t, pl.IsAirborne())
 
 	pl = playerWithProperty("m_hGroundEntity", st.PropertyValue{IntVal: 2097151})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.True(t, pl.IsAirborne())
 }
 
 func TestPlayer_IsDucking(t *testing.T) {
 	pl := playerWithProperty("m_fFlags", st.PropertyValue{IntVal: 0})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.False(t, pl.IsDucking())
 	assert.True(t, pl.IsStanding())
 	assert.False(t, pl.IsDuckingInProgress())
 	assert.False(t, pl.IsUnDuckingInProgress())
 
 	pl = playerWithProperty("m_fFlags", st.PropertyValue{IntVal: 1 << 1})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.False(t, pl.IsDucking())
 	assert.False(t, pl.IsStanding())
 	assert.False(t, pl.IsDuckingInProgress())
 	assert.True(t, pl.IsUnDuckingInProgress())
 
 	pl = playerWithProperty("m_fFlags", st.PropertyValue{IntVal: 1 << 2})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.False(t, pl.IsDucking())
 	assert.False(t, pl.IsStanding())
 	assert.True(t, pl.IsDuckingInProgress())
 	assert.False(t, pl.IsUnDuckingInProgress())
 
 	pl = playerWithProperty("m_fFlags", st.PropertyValue{IntVal: 1<<1 | 1<<2})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.True(t, pl.IsDucking())
 	assert.False(t, pl.IsStanding())
@@ -252,46 +266,55 @@ func TestPlayer_IsDucking(t *testing.T) {
 
 func TestPlayerFlags_OnGround(t *testing.T) {
 	pl := playerWithProperty("m_fFlags", st.PropertyValue{IntVal: 0})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.False(t, pl.Flags().OnGround())
 
 	pl = playerWithProperty("m_fFlags", st.PropertyValue{IntVal: 1})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.True(t, pl.Flags().OnGround())
 }
 
 func TestPlayer_HasDefuseKit(t *testing.T) {
 	pl := playerWithProperty("m_bHasDefuser", st.PropertyValue{IntVal: 0})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.False(t, pl.HasDefuseKit())
 
 	pl = playerWithProperty("m_bHasDefuser", st.PropertyValue{IntVal: 1})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.True(t, pl.HasDefuseKit())
 }
 
 func TestPlayer_HasHelmet(t *testing.T) {
 	pl := playerWithProperty("m_bHasHelmet", st.PropertyValue{IntVal: 0})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.False(t, pl.HasHelmet())
 
 	pl = playerWithProperty("m_bHasHelmet", st.PropertyValue{IntVal: 1})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.True(t, pl.HasHelmet())
 }
 
 func TestPlayer_IsControllingBot_NilEntity(t *testing.T) {
 	pl := new(Player)
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.False(t, pl.IsControllingBot())
 }
 
 func TestPlayer_IsControllingBot(t *testing.T) {
 	pl := playerWithProperty("m_bIsControllingBot", st.PropertyValue{IntVal: 0})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.False(t, pl.IsControllingBot())
 
 	pl = playerWithProperty("m_bIsControllingBot", st.PropertyValue{IntVal: 1})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.True(t, pl.IsControllingBot())
 }
@@ -335,18 +358,21 @@ func TestPlayer_Armor(t *testing.T) {
 
 func TestPlayer_Money(t *testing.T) {
 	pl := playerWithProperty("m_iAccount", st.PropertyValue{IntVal: 800})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.Equal(t, 800, pl.Money())
 }
 
 func TestPlayer_ViewDirectionX(t *testing.T) {
 	pl := playerWithProperty("m_angEyeAngles[1]", st.PropertyValue{FloatVal: 180})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.Equal(t, float32(180), pl.ViewDirectionX())
 }
 
 func TestPlayer_ViewDirectionY(t *testing.T) {
 	pl := playerWithProperty("m_angEyeAngles[0]", st.PropertyValue{FloatVal: 15})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.Equal(t, float32(15), pl.ViewDirectionY())
 }
@@ -358,12 +384,14 @@ func TestPlayer_Position(t *testing.T) {
 	entity.On("Position").Return(pos)
 
 	pl := &Player{Entity: entity}
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.Equal(t, pos, pl.Position())
 }
 
 func TestPlayer_Position_EntityNil(t *testing.T) {
 	pl := new(Player)
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.Empty(t, pl.Position())
 }
@@ -375,6 +403,7 @@ func TestPlayer_PositionEyes(t *testing.T) {
 	entity.On("Position").Return(pos)
 
 	pl := &Player{Entity: entity}
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.Equal(t, r3.Vector{X: 1, Y: 2, Z: 5}, pl.PositionEyes())
 }
@@ -392,19 +421,25 @@ func TestPlayer_Velocity(t *testing.T) {
 	entity.On("PropertyValueMust", "localdata.m_vecVelocity[2]").Return(st.PropertyValue{FloatVal: 3})
 
 	pl := &Player{Entity: entity}
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	expected := r3.Vector{X: 1, Y: 2, Z: 3}
 	assert.Equal(t, expected, pl.Velocity())
 }
 
 func TestPlayer_Velocity_EntityNil(t *testing.T) {
 	pl := new(Player)
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.Empty(t, pl.Velocity())
 }
 
 func TestPlayer_ClanTag(t *testing.T) {
-	pl := playerWithResourceProperty("m_szClan", st.PropertyValue{StringVal: "SuperClan"})
+	pl := playerWithResourceProperty("m_szClan", st.PropertyValue{Any: "SuperClan"})
+	pl.demoInfoProvider = demoInfoProviderMock{
+		playerResourceEntity: (pl.demoInfoProvider.(demoInfoProviderMock)).playerResourceEntity,
+		isSource2:            false,
+	}
 
 	assert.Equal(t, "SuperClan", pl.ClanTag())
 }
@@ -520,7 +555,8 @@ func TestPlayer_SteamID32(t *testing.T) {
 }
 
 func TestPlayer_LastPlaceName(t *testing.T) {
-	pl := playerWithProperty("m_szLastPlaceName", st.PropertyValue{StringVal: "TopofMid"})
+	pl := playerWithProperty("m_szLastPlaceName", st.PropertyValue{Any: "TopofMid"})
+	pl.demoInfoProvider = s1DemoInfoProvider
 
 	assert.Equal(t, "TopofMid", pl.LastPlaceName())
 }