add tests, make ptrs

pnxenopoulos · Sep 2, 2023 · 04c8b22 · 04c8b22
1 parent 121d689
commit 04c8b22
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/awpy/parser/parse_demo.go b/awpy/parser/parse_demo.go
@@ -138,9 +138,9 @@ type GameRound struct {
 	WinningTeam          *string            `json:"winningTeam"`
 	LosingTeam           *string            `json:"losingTeam"`
 	Reason               string             `json:"roundEndReason"`
-	MVPName              string             `json:"mvpName"`
-	MVPSteamID           int64              `json:"mvpSteamID"`
-	MVPReason            string             `json:"mvpReason"`
+	MVPName              *string            `json:"mvpName"`
+	MVPSteamID           *int64             `json:"mvpSteamID"`
+	MVPReason            *string            `json:"mvpReason"`
 	CTFreezeTimeEndEqVal int64              `json:"ctFreezeTimeEndEqVal"`
 	CTRoundStartEqVal    int64              `json:"ctRoundStartEqVal"`
 	CTRoundMoneySpend    int64              `json:"ctRoundSpendMoney"`
@@ -568,7 +568,7 @@ func convertRoundMVPReason(r events.RoundMVPReason) string {
 	case events.MVPReasonBombPlanted:
 		return "MVPReasonBombPlanted"
 	default:
-		return unknown
+		return "Unknown"
 	}
 }
 
@@ -1486,9 +1486,9 @@ func registerRoundEndHandler(demoParser *dem.Parser, currentGame *Game, currentR
 func registerRoundMVPHandler(demoParser *dem.Parser, currentRound *GameRound) {
 	(*demoParser).RegisterEventHandler(func(e events.RoundMVPAnnouncement) {
 		if e.Player != nil {
-			currentRound.MVPName = e.Player.Name
-			currentRound.MVPSteamID = int64(e.Player.SteamID64)
-			currentRound.MVPReason = convertRoundMVPReason(e.Reason)
+			currentRound.MVPName = *e.Player.Name
+			currentRound.MVPSteamID = *int64(e.Player.SteamID64)
+			currentRound.MVPReason = *convertRoundMVPReason(e.Reason)
 		}
 	})
 }

diff --git a/awpy/parser/parse_demo_test.go b/awpy/parser/parse_demo_test.go
@@ -4,8 +4,22 @@ import (
 	"testing"
 
 	common "github.com/markus-wa/demoinfocs-golang/v3/pkg/demoinfocs/common"
+	events "github.com/markus-wa/demoinfocs-golang/v3/pkg/demoinfocs/events"
 )
 
+func TestConvertRoundMVPReason(t *testing.T) {
+	t.Parallel()
+	enumReasons := [events.MVPReasonMostEliminations, events.MVPReasonBombDefused, events.MVPReasonBombPlanted]
+	textReasons := []string{"MVPReasonMostEliminations", "MVPReasonBombDefused", "MVPReasonBombPlanted"}
+	for index, reason := enumReasons {
+		is := convertRoundMVPReason(reason)
+		want := textReasons[index]
+		if is != want {
+			t.Errorf("Round MVP reason value of %v should convert to %v, got %v", reason, want, is)
+		}
+	}
+}
+
 func TestConvertRank(t *testing.T) {
 	t.Parallel()
 	var rankInt int