Fix Hyper tests with start player interactions

Matt Tucker · Matt Tucker · commit ef98f15a2889 · 2024-11-22T14:49:46.000Z
diff --git a/src/test/scala/backgammon/BackgammonVariantTest.scala b/src/test/scala/backgammon/BackgammonVariantTest.scala
@@ -4993,14 +4993,13 @@ class BackgammonVariantTest extends BackgammonTest with ValidatedMatchers {
         "4/2",
         "l1h1"
       )
-      playActionStrs(actionStrs, Some(Game.apply(variant.Hyper))) must beValid.like { g =>
+      playActionStrs(actionStrs, None, Some(variant.Hyper), Player.P2) must beValid.like { g =>
         g.situation.moves.values.flatten.map(_.toUci.uci).toSet must_== Set("h1f1", "j1h1", "k1i1")
       }
     }
 
     "end in single win even if in backgammon position" in {
       val actionStrs = List(
-        "endturn",
         "6/2",
         "l1j1",
         "k1e1",
@@ -5042,7 +5041,7 @@ class BackgammonVariantTest extends BackgammonTest with ValidatedMatchers {
         "1/2",
         "^l2"
       )
-      playActionStrs(actionStrs, Some(Game.apply(variant.Hyper))) must beValid.like { g =>
+      playActionStrs(actionStrs, None, Some(variant.Hyper), Player.P2) must beValid.like { g =>
         g.situation.board.history.score must_== Score(0, 3)
         g.situation.end must_== true
         g.situation.board.pieceInOpponentsHome(Player.P1) must_== true

Original file line number	Diff line number	Diff line change
`@@ -4993,14 +4993,13 @@ class BackgammonVariantTest extends BackgammonTest with ValidatedMatchers {`
`4993`	`4993`	`"4/2",`
`4994`	`4994`	`"l1h1"`
`4995`	`4995`	`)`
`4996`		`- playActionStrs(actionStrs, Some(Game.apply(variant.Hyper))) must beValid.like { g =>`
	`4996`	`+ playActionStrs(actionStrs, None, Some(variant.Hyper), Player.P2) must beValid.like { g =>`
`4997`	`4997`	`g.situation.moves.values.flatten.map(_.toUci.uci).toSet must_== Set("h1f1", "j1h1", "k1i1")`
`4998`	`4998`	`}`
`4999`	`4999`	`}`
`5000`	`5000`
`5001`	`5001`	`"end in single win even if in backgammon position" in {`
`5002`	`5002`	`val actionStrs = List(`
`5003`		`- "endturn",`
`5004`	`5003`	`"6/2",`
`5005`	`5004`	`"l1j1",`
`5006`	`5005`	`"k1e1",`
`@@ -5042,7 +5041,7 @@ class BackgammonVariantTest extends BackgammonTest with ValidatedMatchers {`
`5042`	`5041`	`"1/2",`
`5043`	`5042`	`"^l2"`
`5044`	`5043`	`)`
`5045`		`- playActionStrs(actionStrs, Some(Game.apply(variant.Hyper))) must beValid.like { g =>`
	`5044`	`+ playActionStrs(actionStrs, None, Some(variant.Hyper), Player.P2) must beValid.like { g =>`
`5046`	`5045`	`g.situation.board.history.score must_== Score(0, 3)`
`5047`	`5046`	`g.situation.end must_== true`
`5048`	`5047`	`g.situation.board.pieceInOpponentsHome(Player.P1) must_== true`