1 files changed, 18 insertions, 5 deletions
diff --git a/go/game/state_test.go b/go/game/state_test.go
index f770e7fa..c6b0004e 100644
--- a/go/game/state_test.go
+++ b/go/game/state_test.go
@@ -1,21 +1,34 @@
 package game
 
 import (
+	"strings"
 	"testing"
 )
 
+func (s *LocalState) addMockPlayers() (p *Player, o *Player) {
+	p = s.AddNewPlayer("p", NewDeck())
+	p.Ctrl = newMockPlayerControl(p)
+
+	o = s.AddNewPlayer("o", NewDeck())
+	o.Ctrl = newMockPlayerControl(o)
+	return
+}
+
 // newMockState creates a new LocalState with an empty 2x2 map and two players.
 // The players "p" and "o" are initialized with mock player controls.
 func newMockState() (*LocalState, *Map, *Player, *Player) {
 	s := NewLocalState()
 	m := newEmpty2x2Map()
 	s.SetMap(m)
+	p, o := s.addMockPlayers()
+	return s, m, p, o
+}
 
-	p := s.AddNewPlayer("p", NewDeck())
-	p.Ctrl = newMockPlayerControl(p)
-
-	o := s.AddNewPlayer("o", NewDeck())
-	o.Ctrl = newMockPlayerControl(o)
+func newMockStateFromDef(mapDef string) (*LocalState, *Map, *Player, *Player) {
+	s := NewLocalState()
+	m, _ := readMap(strings.NewReader(mapDef))
+	s.SetMap(m)
+	p, o := s.addMockPlayers()
 	return s, m, p, o
 }