diff --git a/game/ranking_fields.go b/game/ranking_fields.go index 307db2d..d1822a8 100755 --- a/game/ranking_fields.go +++ b/game/ranking_fields.go @@ -8,15 +8,15 @@ package game import "math/rand" type RankingFields struct { - RankingPoints int - AutoPoints int - EndgamePoints int - TeleopPoints int - Random float64 - Wins int - Losses int - Ties int - Played int + RankingPoints int + AutoPoints int + EndgamePoints int + TeleopPoints int + Random float64 + Wins int + Losses int + Ties int + Played int } type Ranking struct { diff --git a/partner/tba.go b/partner/tba.go index b6fddde..1c22773 100755 --- a/partner/tba.go +++ b/partner/tba.go @@ -32,12 +32,12 @@ type TbaClient struct { } type TbaMatch struct { - CompLevel string `json:"comp_level"` - SetNumber int `json:"set_number"` - MatchNumber int `json:"match_number"` - Alliances map[string]*TbaAlliance `json:"alliances"` - TimeString string `json:"time_string"` - TimeUtc string `json:"time_utc"` + CompLevel string `json:"comp_level"` + SetNumber int `json:"set_number"` + MatchNumber int `json:"match_number"` + Alliances map[string]*TbaAlliance `json:"alliances"` + TimeString string `json:"time_string"` + TimeUtc string `json:"time_utc"` } type TbaAlliance struct { diff --git a/web/match_play_test.go b/web/match_play_test.go index cd1e160..9051179 100644 --- a/web/match_play_test.go +++ b/web/match_play_test.go @@ -259,12 +259,12 @@ func TestMatchPlayWebsocketCommands(t *testing.T) { readWebsocketType(t, ws, "allianceStationDisplayMode") assert.Equal(t, field.PostMatch, web.arena.MatchState) ws.Write("updateRealtimeScore", map[string]interface{}{ - "blueAuto": 10, - "redAuto": 20, - "blueTeleop": 30, - "redTeleop": 40, + "blueAuto": 10, + "redAuto": 20, + "blueTeleop": 30, + "redTeleop": 40, "blueEndgame": 50, - "redEndgame": 60, + "redEndgame": 60, }) readWebsocketType(t, ws, "arenaStatus") readWebsocketType(t, ws, "realtimeScore") diff --git a/web/match_review_test.go b/web/match_review_test.go index cf9b6f7..837945b 100644 --- a/web/match_review_test.go +++ b/web/match_review_test.go @@ -50,7 +50,7 @@ func TestMatchReviewEditExistingResult(t *testing.T) { assert.Equal(t, 200, recorder.Code) assert.Contains(t, recorder.Body.String(), ">QF4-3<") assert.Contains(t, recorder.Body.String(), ">155<") // The red score - assert.Contains(t, recorder.Body.String(), ">80<") // The blue score + assert.Contains(t, recorder.Body.String(), ">80<") // The blue score // Check response for non-existent match. recorder = web.getHttpResponse(fmt.Sprintf("/match_review/%d/edit", 12345)) @@ -103,6 +103,6 @@ func TestMatchReviewCreateNewResult(t *testing.T) { recorder = web.getHttpResponse("/match_review") assert.Equal(t, 200, recorder.Code) assert.Contains(t, recorder.Body.String(), ">QF4-3<") - assert.Contains(t, recorder.Body.String(), ">60<") // The red score + assert.Contains(t, recorder.Body.String(), ">60<") // The red score assert.Contains(t, recorder.Body.String(), ">150<") // The blue score } diff --git a/web/scores_test.go b/web/scores_test.go index 676eb72..252b90e 100644 --- a/web/scores_test.go +++ b/web/scores_test.go @@ -60,9 +60,9 @@ func TestPatchScores(t *testing.T) { "{\"red\":{\"auto\":5,\"teleop\":10,\"endgame\":15}}") assert.Equal(t, 200, recorder.Code) - assert.Equal(t, score1.AutoPoints + 5, web.arena.RedScore.AutoPoints) - assert.Equal(t, score1.TeleopPoints + 10, web.arena.RedScore.TeleopPoints) - assert.Equal(t, score1.EndgamePoints + 15, web.arena.RedScore.EndgamePoints) + assert.Equal(t, score1.AutoPoints+5, web.arena.RedScore.AutoPoints) + assert.Equal(t, score1.TeleopPoints+10, web.arena.RedScore.TeleopPoints) + assert.Equal(t, score1.EndgamePoints+15, web.arena.RedScore.EndgamePoints) assert.Equal(t, score2.AutoPoints, web.arena.BlueScore.AutoPoints) assert.Equal(t, score2.TeleopPoints, web.arena.BlueScore.TeleopPoints) assert.Equal(t, score2.EndgamePoints, web.arena.BlueScore.EndgamePoints) @@ -71,12 +71,12 @@ func TestPatchScores(t *testing.T) { "{\"blue\":{\"auto\":-5,\"teleop\":-10,\"endgame\":-15}}") assert.Equal(t, 200, recorder.Code) - assert.Equal(t, score1.AutoPoints + 5, web.arena.RedScore.AutoPoints) - assert.Equal(t, score1.TeleopPoints + 10, web.arena.RedScore.TeleopPoints) - assert.Equal(t, score1.EndgamePoints + 15, web.arena.RedScore.EndgamePoints) - assert.Equal(t, score2.AutoPoints - 5, web.arena.BlueScore.AutoPoints) - assert.Equal(t, score2.TeleopPoints - 10, web.arena.BlueScore.TeleopPoints) - assert.Equal(t, score2.EndgamePoints - 15, web.arena.BlueScore.EndgamePoints) + assert.Equal(t, score1.AutoPoints+5, web.arena.RedScore.AutoPoints) + assert.Equal(t, score1.TeleopPoints+10, web.arena.RedScore.TeleopPoints) + assert.Equal(t, score1.EndgamePoints+15, web.arena.RedScore.EndgamePoints) + assert.Equal(t, score2.AutoPoints-5, web.arena.BlueScore.AutoPoints) + assert.Equal(t, score2.TeleopPoints-10, web.arena.BlueScore.TeleopPoints) + assert.Equal(t, score2.EndgamePoints-15, web.arena.BlueScore.EndgamePoints) } func TestPutScores(t *testing.T) {