diff --git a/shared/src/main/scala/com/mogproject/mogami/core/move/SpecialMove.scala b/shared/src/main/scala/com/mogproject/mogami/core/move/SpecialMove.scala index fa07c6a..e21690d 100644 --- a/shared/src/main/scala/com/mogproject/mogami/core/move/SpecialMove.scala +++ b/shared/src/main/scala/com/mogproject/mogami/core/move/SpecialMove.scala @@ -40,9 +40,9 @@ case class IllegalMove(move: Move) extends SpecialMove { override def toUsenString: String = IllegalMove.usenKeyword + move.toUsenString - override def toJapaneseNotationString: String = IllegalMove.kifKeyword + override def toJapaneseNotationString: String = move.toJapaneseNotationString - override def toWesternNotationString: String = "Illegal Move" + override def toWesternNotationString: String = move.toWesternNotationString override def toKi2String(currentPlayer: Player, numMoves: Int): String = makeKi2String(numMoves, s"${(!currentPlayer).toJapaneseNotationString()}の${IllegalMove.ki2Keyword}勝ち") diff --git a/shared/src/test/scala/com/mogproject/mogami/core/move/SpecialMoveSpec.scala b/shared/src/test/scala/com/mogproject/mogami/core/move/SpecialMoveSpec.scala new file mode 100644 index 0000000..f7d8cb5 --- /dev/null +++ b/shared/src/test/scala/com/mogproject/mogami/core/move/SpecialMoveSpec.scala @@ -0,0 +1,18 @@ +package com.mogproject.mogami.core.move + +import com.mogproject.mogami.core.state.State +import org.scalatest.prop.GeneratorDrivenPropertyChecks +import org.scalatest.{FlatSpec, MustMatchers} + + +class SpecialMoveSpec extends FlatSpec with MustMatchers with GeneratorDrivenPropertyChecks { + + "IllegalMove#toJapaneseNotationString" must "return move expression" in { + IllegalMove(MoveBuilderCsa.parseCsaString("+7776FU").toMove(State.HIRATE).get).toJapaneseNotationString mustBe "7六歩" + } + + "IllegalMove#toWestern" must "return move expression" in { + IllegalMove(MoveBuilderCsa.parseCsaString("+7776FU").toMove(State.HIRATE).get).toWesternNotationString mustBe "P-7f" + } + +}