Run 'go fmt'.

This commit is contained in:
Patrick Fairbank
2020-04-25 14:26:08 -07:00
parent f91e3460d3
commit 9b17f0ab1b
5 changed files with 31 additions and 31 deletions

View File

@@ -8,15 +8,15 @@ package game
import "math/rand" import "math/rand"
type RankingFields struct { type RankingFields struct {
RankingPoints int RankingPoints int
AutoPoints int AutoPoints int
EndgamePoints int EndgamePoints int
TeleopPoints int TeleopPoints int
Random float64 Random float64
Wins int Wins int
Losses int Losses int
Ties int Ties int
Played int Played int
} }
type Ranking struct { type Ranking struct {

View File

@@ -32,12 +32,12 @@ type TbaClient struct {
} }
type TbaMatch struct { type TbaMatch struct {
CompLevel string `json:"comp_level"` CompLevel string `json:"comp_level"`
SetNumber int `json:"set_number"` SetNumber int `json:"set_number"`
MatchNumber int `json:"match_number"` MatchNumber int `json:"match_number"`
Alliances map[string]*TbaAlliance `json:"alliances"` Alliances map[string]*TbaAlliance `json:"alliances"`
TimeString string `json:"time_string"` TimeString string `json:"time_string"`
TimeUtc string `json:"time_utc"` TimeUtc string `json:"time_utc"`
} }
type TbaAlliance struct { type TbaAlliance struct {

View File

@@ -259,12 +259,12 @@ func TestMatchPlayWebsocketCommands(t *testing.T) {
readWebsocketType(t, ws, "allianceStationDisplayMode") readWebsocketType(t, ws, "allianceStationDisplayMode")
assert.Equal(t, field.PostMatch, web.arena.MatchState) assert.Equal(t, field.PostMatch, web.arena.MatchState)
ws.Write("updateRealtimeScore", map[string]interface{}{ ws.Write("updateRealtimeScore", map[string]interface{}{
"blueAuto": 10, "blueAuto": 10,
"redAuto": 20, "redAuto": 20,
"blueTeleop": 30, "blueTeleop": 30,
"redTeleop": 40, "redTeleop": 40,
"blueEndgame": 50, "blueEndgame": 50,
"redEndgame": 60, "redEndgame": 60,
}) })
readWebsocketType(t, ws, "arenaStatus") readWebsocketType(t, ws, "arenaStatus")
readWebsocketType(t, ws, "realtimeScore") readWebsocketType(t, ws, "realtimeScore")

View File

@@ -50,7 +50,7 @@ func TestMatchReviewEditExistingResult(t *testing.T) {
assert.Equal(t, 200, recorder.Code) assert.Equal(t, 200, recorder.Code)
assert.Contains(t, recorder.Body.String(), ">QF4-3<") assert.Contains(t, recorder.Body.String(), ">QF4-3<")
assert.Contains(t, recorder.Body.String(), ">155<") // The red score 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. // Check response for non-existent match.
recorder = web.getHttpResponse(fmt.Sprintf("/match_review/%d/edit", 12345)) recorder = web.getHttpResponse(fmt.Sprintf("/match_review/%d/edit", 12345))
@@ -103,6 +103,6 @@ func TestMatchReviewCreateNewResult(t *testing.T) {
recorder = web.getHttpResponse("/match_review") recorder = web.getHttpResponse("/match_review")
assert.Equal(t, 200, recorder.Code) assert.Equal(t, 200, recorder.Code)
assert.Contains(t, recorder.Body.String(), ">QF4-3<") 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 assert.Contains(t, recorder.Body.String(), ">150<") // The blue score
} }

View File

@@ -60,9 +60,9 @@ func TestPatchScores(t *testing.T) {
"{\"red\":{\"auto\":5,\"teleop\":10,\"endgame\":15}}") "{\"red\":{\"auto\":5,\"teleop\":10,\"endgame\":15}}")
assert.Equal(t, 200, recorder.Code) assert.Equal(t, 200, recorder.Code)
assert.Equal(t, score1.AutoPoints + 5, web.arena.RedScore.AutoPoints) assert.Equal(t, score1.AutoPoints+5, web.arena.RedScore.AutoPoints)
assert.Equal(t, score1.TeleopPoints + 10, web.arena.RedScore.TeleopPoints) assert.Equal(t, score1.TeleopPoints+10, web.arena.RedScore.TeleopPoints)
assert.Equal(t, score1.EndgamePoints + 15, web.arena.RedScore.EndgamePoints) assert.Equal(t, score1.EndgamePoints+15, web.arena.RedScore.EndgamePoints)
assert.Equal(t, score2.AutoPoints, web.arena.BlueScore.AutoPoints) assert.Equal(t, score2.AutoPoints, web.arena.BlueScore.AutoPoints)
assert.Equal(t, score2.TeleopPoints, web.arena.BlueScore.TeleopPoints) assert.Equal(t, score2.TeleopPoints, web.arena.BlueScore.TeleopPoints)
assert.Equal(t, score2.EndgamePoints, web.arena.BlueScore.EndgamePoints) 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}}") "{\"blue\":{\"auto\":-5,\"teleop\":-10,\"endgame\":-15}}")
assert.Equal(t, 200, recorder.Code) assert.Equal(t, 200, recorder.Code)
assert.Equal(t, score1.AutoPoints + 5, web.arena.RedScore.AutoPoints) assert.Equal(t, score1.AutoPoints+5, web.arena.RedScore.AutoPoints)
assert.Equal(t, score1.TeleopPoints + 10, web.arena.RedScore.TeleopPoints) assert.Equal(t, score1.TeleopPoints+10, web.arena.RedScore.TeleopPoints)
assert.Equal(t, score1.EndgamePoints + 15, web.arena.RedScore.EndgamePoints) assert.Equal(t, score1.EndgamePoints+15, web.arena.RedScore.EndgamePoints)
assert.Equal(t, score2.AutoPoints - 5, web.arena.BlueScore.AutoPoints) assert.Equal(t, score2.AutoPoints-5, web.arena.BlueScore.AutoPoints)
assert.Equal(t, score2.TeleopPoints - 10, web.arena.BlueScore.TeleopPoints) assert.Equal(t, score2.TeleopPoints-10, web.arena.BlueScore.TeleopPoints)
assert.Equal(t, score2.EndgamePoints - 15, web.arena.BlueScore.EndgamePoints) assert.Equal(t, score2.EndgamePoints-15, web.arena.BlueScore.EndgamePoints)
} }
func TestPutScores(t *testing.T) { func TestPutScores(t *testing.T) {