Board renders meaningful stuff

api.go

@@ -49,7 +49,7 @@ func (a *API) NewGame(res http.ResponseWriter, req *http.Request) {
 		}
 	}
 	log.Printf("creating new game %v", a.nextInt)
-	a.games[a.nextInt] = NewSession(8)
+	a.games[a.nextInt] = NewSession()
 	a.games[a.nextInt].redPlayer.Ready = true
 	respondWithJSON(res, http.StatusOK, newGameResp{a.nextInt, "red"})
 	a.nextInt = a.nextInt + 1
@@ -81,16 +81,7 @@ func (a *API) GetGame(res http.ResponseWriter, req *http.Request) {
 	}
 
 	log.Println("sending game state")
-	board := s.getBoard(p)
-	rotate := req.Header.Get("Rotate")
-	if rotate == "true" {
-		log.Println("rotating output")
-		//rotateBoard(board)
-		//rotateBoard(board)
-		//rotateBoard(board)
-
-	}
-	respondWithJSON(res, http.StatusOK, gameResp{board})
+	respondWithJSON(res, http.StatusOK, gameResp{s.getBoard(p)})
 	return
 }
 

api_test.go

@@ -1,122 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"strconv"
-	"testing"
-
-	"github.com/gorilla/mux"
-)
-
-func TestNewAPI(t *testing.T) {
-	a := NewAPI()
-	if len(a.games) != 0 {
-		t.Fatalf("games list not empty")
-	}
-	if a.nextInt != 1 {
-		t.Fatalf("nextInt somehow already implemented")
-	}
-}
-
-func dummyGame(a *API) int {
-	i := a.nextInt
-	a.games[i] = NewSession(8)
-	a.games[i].redPlayer.Ready = true
-	a.games[i].bluePlayer.Ready = true
-	a.games[i].simulator.Setup()
-	initDummy(a.games[i].simulator)
-	return i
-}
-
-func TestNewGame(t *testing.T) {
-	t.Parallel()
-	a := NewAPI()
-	var tests = []struct {
-		gid int
-		pid string
-	}{
-		{1, "red"},
-		{1, "blue"},
-		{2, "red"},
-	}
-	for i, tt := range tests {
-		tname := fmt.Sprintf("/game %v", i)
-		t.Run(tname, func(t *testing.T) {
-			r, _ := http.NewRequest("POST", "/game", nil)
-			w := httptest.NewRecorder()
-			a.NewGame(w, r)
-			resp := w.Result()
-			if resp.StatusCode != http.StatusOK {
-				t.Fatal("failed to create new game")
-			}
-			_, ok := a.games[tt.gid]
-			if !ok {
-				t.Fatalf("API thinks it created a game but it didn't")
-			}
-			var respStruct newGameResp
-			err := json.NewDecoder(resp.Body).Decode(&respStruct)
-			if err != nil {
-				t.Errorf("/game returned bad response body: %v", err)
-			}
-			if respStruct.GameID != tt.gid {
-				t.Errorf("Expected game %v, got %v", tt.gid, respStruct.GameID)
-			}
-			if respStruct.PlayerID != tt.pid {
-				t.Errorf("wrong playerID returned")
-			}
-		})
-	}
-}
-
-func TestGetGame(t *testing.T) {
-	t.Parallel()
-	a := NewAPI()
-	gid := dummyGame(a)
-	var tests = []struct {
-		pid  string
-		code int
-	}{
-		{"red", http.StatusOK},
-		{"blue", http.StatusOK},
-		{"green", http.StatusBadRequest},
-	}
-	for _, tt := range tests {
-		tname := fmt.Sprintf("/game from player %v", tt.pid)
-		t.Run(tname, func(t *testing.T) {
-			r, _ := http.NewRequest("GET", "/game", nil)
-			w := httptest.NewRecorder()
-			r = mux.SetURLVars(r, map[string]string{"id": strconv.Itoa(gid)})
-			r.Header.Add("Player-id", tt.pid)
-			r.Header.Add("Rotate", "false")
-			a.GetGame(w, r)
-			resp := w.Result()
-			if resp.StatusCode != tt.code {
-				t.Fatalf("failed to get game: %v", resp.Status)
-			}
-			if resp.StatusCode == http.StatusOK {
-				var respStruct gameResp
-				err := json.NewDecoder(resp.Body).Decode(&respStruct)
-				if err != nil {
-					t.Fatalf("/game returned bad response body: %v", err)
-				}
-				if len(respStruct.GameBoard) == 0 {
-					t.Errorf("bad game board returned")
-				}
-				for j := range respStruct.GameBoard {
-					for i, vt := range respStruct.GameBoard[j] {
-						curr, err := a.games[gid].simulator.Board.GetPiece(i, j)
-						if err != nil {
-							t.Fatalf("Strange board position: %v", err)
-						}
-						if curr != nil && !vt.Hidden && curr.Owner.String() != tt.pid && curr.Hidden {
-							t.Errorf("/game returned a piece that should be hidden but isn't")
-						}
-					}
-				}
-			}
-		})
-	}
-}

api_types.go

@@ -10,7 +10,7 @@ type newGameResp struct {
 }
 
 type gameResp struct {
-	GameBoard [][]*ViewTile `json:"board"`
+	GameBoard [8][8]*ViewTile `json:"board"`
 }
 
 type gameStatusResp struct {

session.go

@@ -15,7 +15,6 @@ type Session struct {
 	bluePlayer *Player
 	moveNum    int
 	moveList   []freego.ParsedCommand
-	boardSize  int
 }
 
 //Player is a player in a match
@@ -35,7 +34,7 @@ func (p *Player) Colour() freego.Colour {
 }
 
 //NewSession creates a new game session
-func NewSession(size int) *Session {
+func NewSession() *Session {
 	sim := freego.NewGame()
 	return &Session{
 		simulator:  sim,
@@ -43,7 +42,6 @@ func NewSession(size int) *Session {
 		bluePlayer: &Player{false, freego.Blue},
 		moveNum:    1,
 		moveList:   make([]freego.ParsedCommand, 20),
-		boardSize:  size,
 	}
 }
 
@@ -80,13 +78,10 @@ func (s *Session) getMove(p *Player, num int) (string, error) {
 	return fmt.Sprintf("%v %v", num, s.moveList[num].String()), nil
 }
 
-func (s *Session) getBoard(p *Player) [][]*ViewTile {
-	res := make([][]*ViewTile, s.boardSize)
-	for i := range res {
-		res[i] = make([]*ViewTile, s.boardSize)
-	}
-	for i := 0; i < s.boardSize; i++ {
-		for j := 0; j < s.boardSize; j++ {
+func (s *Session) getBoard(p *Player) [8][8]*ViewTile {
+	var res [8][8]*ViewTile
+	for i := 0; i < 8; i++ {
+		for j := 0; j < 8; j++ {
 			cur := NewViewTile()
 			terrain, err := s.simulator.Board.IsTerrain(i, j)
 			if err != nil {
@@ -114,7 +109,7 @@ func (s *Session) getBoard(p *Player) [][]*ViewTile {
 					cur.Empty = true
 				}
 			}
-			res[j][i] = cur
+			res[i][j] = cur
 		}
 	}
 	return res

util.go

@@ -21,16 +21,6 @@ func respondWithJSON(res http.ResponseWriter, code int, payload interface{}) {
 	res.Write(response)
 }
 
-func rotateBoard(board [][]*ViewTile) {
-	i := 0
-	temp := board[0]
-	for ; i < len(board)-1; i++ {
-		board[i] = board[i+1]
-	}
-
-	board[i] = temp
-}
-
 //TODO remove this when you can actually setup a game
 func initDummy(g *freego.Game) {
 	//Setup terrain

view_tile.go

@@ -12,16 +12,3 @@ type ViewTile struct {
 func NewViewTile() *ViewTile {
 	return &ViewTile{}
 }
-
-func (vt *ViewTile) String() string {
-	if vt.Piece != "" {
-		return vt.Piece
-	}
-	if vt.Hidden {
-		return "?"
-	}
-	if vt.Terrain {
-		return "X"
-	}
-	return " "
-}