use go-unassert for assertions in CI tests

Author: markus-wa

bin/coverage.sh

@@ -10,4 +10,4 @@ coverpkg=$(go list ./... | grep -v -E ${coverpkg_ignore} | awk -vORS=, '{ print
 
 # -timeout 30m because the CI is slow
 # output file must be called 'coverage.txt' for Codecov
-go test -v -timeout 30m -coverprofile=coverage.txt -coverpkg=$coverpkg ./...
+go test -v -timeout 30m -coverprofile=coverage.txt -coverpkg=$coverpkg -tags unassert_panic ./...

bin/regression-tests.sh

@@ -4,4 +4,4 @@ set -e
 
 bin/download-test-data.sh default.7z unexpected_end_of_demo.7z regression-set.7z
 
-go test ./...
+go test -tags unassert_panic ./...

bin/unit-tests.sh

@@ -2,4 +2,4 @@
 
 set -e
 
-go test -short ./...
+go test -tags unassert_panic -short ./...

game_events.go

@@ -5,6 +5,7 @@ import (
 	"strconv"
 
 	"github.com/golang/geo/r3"
+	"github.com/markus-wa/go-unassert"
 
 	"github.com/markus-wa/demoinfocs-golang/common"
 	"github.com/markus-wa/demoinfocs-golang/events"
@@ -20,7 +21,8 @@ func (p *Parser) handleGameEventList(gel *msg.CSVCMsg_GameEventList) {
 
 func (p *Parser) handleGameEvent(ge *msg.CSVCMsg_GameEvent) {
 	if p.gameEventDescs == nil {
-		p.eventDispatcher.Dispatch(events.ParserWarn{Message: "Received GameEvent but event descriptors are missing"})
+		p.eventDispatcher.Dispatch(events.ParserWarn{Message: "received GameEvent but event descriptors are missing"})
+		unassert.Error("received GameEvent but event descriptors are missing")
 		return
 	}
 
@@ -37,7 +39,8 @@ func (p *Parser) handleGameEvent(ge *msg.CSVCMsg_GameEvent) {
 			handler(data)
 		}
 	} else {
-		p.eventDispatcher.Dispatch(events.ParserWarn{Message: fmt.Sprintf("Unknown event %q", desc.Name)})
+		p.eventDispatcher.Dispatch(events.ParserWarn{Message: fmt.Sprintf("unknown event %q", desc.Name)})
+		unassert.Error("unknown event %q", desc.Name)
 	}
 
 	p.eventDispatcher.Dispatch(events.GenericGameEvent{
@@ -126,6 +129,7 @@ func newGameEventHandler(parser *Parser) gameEventHandler {
 		"hegrenade_detonate":              geh.heGrenadeDetonate,                // HE exploded
 		"hltv_chase":                      nil,                                  // Don't care
 		"hltv_fixed":                      nil,                                  // Dunno
+		"hltv_message":                    nil,                                  // No clue
 		"hltv_status":                     nil,                                  // Don't know
 		"inferno_expire":                  geh.infernoExpire,                    // Incendiary expired
 		"inferno_startburn":               delay(geh.infernoStartBurn),          // Incendiary exploded/started. Delayed because inferno entity is not yet created
@@ -325,10 +329,18 @@ func (geh gameEventHandler) playerHurt(data map[string]*msg.CSVCMsg_GameEventKey
 
 func (geh gameEventHandler) playerBlind(data map[string]*msg.CSVCMsg_GameEventKeyT) {
 	attacker := geh.gameState().lastFlash.player
+	projectile := geh.gameState().lastFlash.projectileByPlayer[attacker]
+	unassert.NotNilf(projectile, "PlayerFlashed.Projectile should never be nil")
+
+	if projectile != nil {
+		unassert.Samef(attacker, projectile.Thrower, "PlayerFlashed.Attacker != PlayerFlashed.Projectile.Thrower")
+		unassert.Samef(projectile.Weapon, common.EqFlash, "PlayerFlashed.Projectile.Weapon != EqFlash")
+	}
+
 	geh.dispatch(events.PlayerFlashed{
 		Player:     geh.playerByUserID32(data["userid"].GetValShort()),
 		Attacker:   attacker,
-		Projectile: geh.gameState().lastFlash.projectileByPlayer[attacker],
+		Projectile: projectile,
 	})
 }
 
@@ -435,6 +447,7 @@ func (geh gameEventHandler) playerTeam(data map[string]*msg.CSVCMsg_GameEventKey
 			OldTeamState: geh.gameState().Team(oldTeam),
 		})
 	} else {
+		// TODO: figure out why this happens and whether it's a bug or not
 		geh.dispatch(events.ParserWarn{
 			Message: "Player team swap game-event occurred but player is nil",
 		})

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/golang/geo v0.0.0-20190916061304-5b978397cfec
 	github.com/llgcode/draw2d v0.0.0-20180124133339-274031cf2abe
 	github.com/llgcode/ps v0.0.0-20150911083025-f1443b32eedb // indirect
+	github.com/markus-wa/go-unassert v0.1.1
 	github.com/markus-wa/gobitread v0.2.2
 	github.com/markus-wa/godispatch v1.1.0
 	github.com/markus-wa/quickhull-go/v2 v2.1.0

go.sum

@@ -17,6 +17,10 @@ github.com/llgcode/ps v0.0.0-20150911083025-f1443b32eedb h1:61ndUreYSlWFeCY44JxD
 github.com/llgcode/ps v0.0.0-20150911083025-f1443b32eedb/go.mod h1:1l8ky+Ew27CMX29uG+a2hNOKpeNYEQjjtiALiBlFQbY=
 github.com/markus-wa/go-heatmap v1.0.0 h1:UT3+9Re6Fr6h4Qs7y0QmVjlvbu+92E9tnuqKEhJta08=
 github.com/markus-wa/go-heatmap v1.0.0/go.mod h1:mUE6YBiMclq9MYXCb8fLbiWvyZtGglLrfMJ+LSHrlPA=
+github.com/markus-wa/go-unassert v0.1.0 h1:SQlhZEu0GmO4kD2zz5wgqLxX5MKl2LZwYRz9thg7keo=
+github.com/markus-wa/go-unassert v0.1.0/go.mod h1:XEvrxR+trvZeMDfXcZPvzqGo6eumEtdk5VjNRuvvzxQ=
+github.com/markus-wa/go-unassert v0.1.1 h1:Bn7NfuD85DFdUoGQREI3PWNT1m0THYbYazHmOVIPNYQ=
+github.com/markus-wa/go-unassert v0.1.1/go.mod h1:XEvrxR+trvZeMDfXcZPvzqGo6eumEtdk5VjNRuvvzxQ=
 github.com/markus-wa/gobitread v0.2.2 h1:4Z4oJ8Bf1XnOy6JZ2/9AdFKVAoxdq7awRjrb+j2BeSQ=
 github.com/markus-wa/gobitread v0.2.2/go.mod h1:PcWXMH4gx7o2CKslbkFkLyJB/aHW7JVRG3MRZe3PINg=
 github.com/markus-wa/godispatch v1.1.0 h1:J8O+hRkOCexDUQevaSKWDtKeZ3+HcmbEUKY1uYraAjY=

parsing.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/gogo/protobuf/proto"
+	"github.com/markus-wa/go-unassert"
 
 	"github.com/markus-wa/demoinfocs-golang/common"
 	"github.com/markus-wa/demoinfocs-golang/events"
@@ -292,7 +293,8 @@ func (p *Parser) parsePacket() {
 			if msgName == "" {
 				// Send a warning if the command is unknown
 				// This might mean our proto files are out of date
-				p.eventDispatcher.Dispatch(events.ParserWarn{Message: fmt.Sprintf("Unknown message command %q", cmd)})
+				p.eventDispatcher.Dispatch(events.ParserWarn{Message: fmt.Sprintf("unknown message command %q", cmd)})
+				unassert.Error("unknown message command %q", cmd)
 			}
 
 			// Handle additional net-messages as defined by the user

user_messages.go

@@ -3,8 +3,10 @@ package demoinfocs
 import (
 	"fmt"
 
-	events "github.com/markus-wa/demoinfocs-golang/events"
-	msg "github.com/markus-wa/demoinfocs-golang/msg"
+	"github.com/markus-wa/go-unassert"
+
+	"github.com/markus-wa/demoinfocs-golang/events"
+	"github.com/markus-wa/demoinfocs-golang/msg"
 )
 
 func (p *Parser) handleUserMessage(um *msg.CSVCMsg_UserMessage) {
@@ -51,7 +53,8 @@ func (umh userMessageHandler) sayText(um *msg.CSVCMsg_UserMessage) {
 	st := new(msg.CCSUsrMsg_SayText)
 	err := st.Unmarshal(um.MsgData)
 	if err != nil {
-		umh.dispatch(events.ParserWarn{Message: fmt.Sprintf("Failed to decode SayText message: %s", err.Error())})
+		umh.dispatch(events.ParserWarn{Message: fmt.Sprintf("failed to decode SayText message: %s", err.Error())})
+		unassert.Error("failed to decode SayText message: %s", err.Error())
 	}
 
 	umh.dispatch(events.SayText{
@@ -66,7 +69,8 @@ func (umh userMessageHandler) sayText2(um *msg.CSVCMsg_UserMessage) {
 	st := new(msg.CCSUsrMsg_SayText2)
 	err := st.Unmarshal(um.MsgData)
 	if err != nil {
-		umh.dispatch(events.ParserWarn{Message: fmt.Sprintf("Failed to decode SayText2 message: %s", err.Error())})
+		umh.dispatch(events.ParserWarn{Message: fmt.Sprintf("failed to decode SayText2 message: %s", err.Error())})
+		unassert.Error("failed to decode SayText2 message: %s", err.Error())
 	}
 
 	umh.dispatch(events.SayText2{
@@ -91,17 +95,24 @@ func (umh userMessageHandler) sayText2(um *msg.CSVCMsg_UserMessage) {
 
 	case "#CSGO_Coach_Join_T": // Ignore these
 	case "#CSGO_Coach_Join_CT":
+	case "#Cstrike_Name_Change":
+	case "Cstrike_Chat_T_Loc":
+	case "Cstrike_Chat_CT_Loc":
+	case "Cstrike_Chat_T_Dead":
+	case "Cstrike_Chat_CT_Dead":
 
 	default:
-		umh.dispatch(events.ParserWarn{Message: fmt.Sprintf("Skipped sending ChatMessageEvent for SayText2 with unknown MsgName %q", st.MsgName)})
+		umh.dispatch(events.ParserWarn{Message: fmt.Sprintf("skipped sending ChatMessageEvent for SayText2 with unknown MsgName %q", st.MsgName)})
+		unassert.Error("skipped sending ChatMessageEvent for SayText2 with unknown MsgName %q", st.MsgName)
 	}
 }
 
 func (umh userMessageHandler) rankUpdate(um *msg.CSVCMsg_UserMessage) {
 	st := new(msg.CCSUsrMsg_ServerRankUpdate)
 	err := st.Unmarshal(um.MsgData)
 	if err != nil {
-		umh.dispatch(events.ParserWarn{Message: fmt.Sprintf("Failed to decode ServerRankUpdate message: %s", err.Error())})
+		umh.dispatch(events.ParserWarn{Message: fmt.Sprintf("failed to decode ServerRankUpdate message: %s", err.Error())})
+		unassert.Error("failed to decode ServerRankUpdate message: %s", err.Error())
 	}
 
 	for _, v := range st.RankUpdate {