remove global test state and boiler plate

1 files changed, 7 insertions, 33 deletions

diff --git a/go/game/cardImplementations_test.go b/go/game/cardImplementations_test.go
index 96164203..eb3ec567 100644
--- a/go/game/cardImplementations_test.go
+++ b/go/game/cardImplementations_test.go
@@ -71,14 +71,11 @@ symbols:
   S: street
   H: house
 `
-	s := NewLocalState()
+	s, _, player, opo := newMockState()
 
 	m, _ := readMap(strings.NewReader(mapDef))
 	s.SetMap(m)
 
-	player := s.AddNewPlayer("p", NewDeck())
-	opo := s.AddNewPlayer("o", NewDeck())
-
 	p := s.addNewUnit(NewCard("base/pikeman"), Position{0, 0}, player)
 	c := s.addNewUnit(NewCard("base/cavalry"), Position{0, 2}, opo)
 	prot := s.addNewUnit(NewCard("base/cavalry_archer"), Position{1, 2}, opo)
@@ -139,14 +136,11 @@ symbols:
   S: street
   H: house
 `
-	s := NewLocalState()
+	s, _, player, opo := newMockState()
 
 	m, _ := readMap(strings.NewReader(mapDef))
 	s.SetMap(m)
 
-	player := s.AddNewPlayer("p", NewDeck())
-	opo := s.AddNewPlayer("o", NewDeck())
-
 	mis := s.addNewUnit(NewCard("base/missionary"), Position{0, 0}, player)
 	king := s.addNewUnit(NewCard("misc/king"), Position{0, 2}, opo)
 	k := s.addNewUnit(NewCard("base/knight"), Position{2, 0}, opo)
@@ -190,19 +184,9 @@ symbols:
 }
 
 func TestMace(t *testing.T) {
-	s := NewLocalState()
-	m := newEmpty2x2Map()
-	s.SetMap(m)
-
-	player := s.AddNewPlayer("p", NewDeck())
-	ctrl := newMockPlayerControl(player)
-	ctrl.actionToSend = NewPassPriority(player)
-	player.Ctrl = ctrl
-
-	opo := s.AddNewPlayer("o", NewDeck())
-	ctrl = newMockPlayerControl(opo)
-	ctrl.actionToSend = NewPassPriority(opo)
-	opo.Ctrl = ctrl
+	s, _, player, opo := newMockState()
+	player.Ctrl.(*MockPlayerControl).actionToSend = NewPassPriority(player)
+	opo.Ctrl.(*MockPlayerControl).actionToSend = NewPassPriority(opo)
 
 	k := s.addNewUnit(NewCard("base/knight"), Position{0, 0}, player)
 	p := s.addNewUnit(NewCard("base/pioneer"), Position{0, 1}, opo)
@@ -232,12 +216,7 @@ func TestMace(t *testing.T) {
 }
 
 func TestArmor(t *testing.T) {
-	s := NewLocalState()
-	m := newEmpty2x2Map()
-	s.SetMap(m)
-
-	player := s.AddNewPlayer("p", NewDeck())
-	opo := s.AddNewPlayer("o", NewDeck())
+	s, _, player, opo := newMockState()
 
 	a := s.addNewUnit(NewCard("base/archer"), Position{0, 0}, player)
 	p := s.addNewUnit(NewCard("base/pioneer"), Position{0, 1}, opo)
@@ -255,12 +234,7 @@ func TestArmor(t *testing.T) {
 }
 
 func TestBanner(t *testing.T) {
-	s := NewLocalState()
-	m := newEmpty2x2Map()
-	s.SetMap(m)
-
-	player := s.AddNewPlayer("p", NewDeck())
-	opo := s.AddNewPlayer("o", NewDeck())
+	s, _, player, opo := newMockState()
 
 	s.addNewArtifact(NewCard("equipments/banner"), Position{0, 0}, player)
 	w := s.addNewUnit(NewCard("base/wormtongue"), Position{1, 0}, player)