ManualTicTacToe: Moved text IO declarations to separate file.

Author: Daniel Barclay

src/main/scala/com/us/dsb/explore/algs/ttt/manual/ManualTicTacToe.scala

@@ -1,10 +1,10 @@
 package com.us.dsb.explore.algs.ttt.manual
 
-import com.us.dsb.explore.algs.ttt.manual.ui.GameUI
+import com.us.dsb.explore.algs.ttt.manual.ui.{ColoredConsoleTextIO, GameUI}
 
 object ManualTicTacToe extends App {
 
-  val gameResult = GameUI.runGame(GameUI.ColoredConsoleTextIO)  // ?? specify starting user?
+  val gameResult = GameUI.runGame(ColoredConsoleTextIO)  // ?? specify starting user?
   println("Game result: " + gameResult.text)
 
 }

src/main/scala/com/us/dsb/explore/algs/ttt/manual/ui/GameUI.scala

@@ -17,36 +17,6 @@ object GameUI {
   // ??? enhance; maybe just put clean strings in; maybe build on GameResult (plus quit case)
   case class GameUIResult(text: String)
 
-  // ?? revisit name
-  trait SegregatedTextIO {
-    private[ui] def printStateText(lineOrLines: String): Unit
-    private[ui] def readPromptedLine(prompt: String): String
-    private[ui] def printError(fullLine: String): Unit
-    // ?? first, second, or both?:
-    private[ui] def printResult(lineOrLines: String): Unit
-    private[ui] def printResult(result: GameUIResult): Unit = printResult(result.text)
-  }
-
-  class BaseConsoleTextIO extends SegregatedTextIO {
-    import scala.io.StdIn.readLine
-
-    private[ui] override def printStateText(lineOrLines: String): Unit = println(lineOrLines)
-    private[ui] override def readPromptedLine(prompt: String): String  = readLine(prompt)
-    private[ui] override def printError(fullLine: String): Unit = println(fullLine)
-    private[ui] override def printResult(lineOrLines: String): Unit = println(lineOrLines)
-  }
-
-  object PlainConsoleTextIO extends BaseConsoleTextIO
-
-  object ColoredConsoleTextIO extends BaseConsoleTextIO {
-    import scala.io.AnsiColor._
-    private[ui] override def readPromptedLine(prompt: String): String =
-      super.readPromptedLine(BLUE + prompt + RESET)
-    private[ui] override def printError(fullLine: String): Unit =
-      super.printError(RED + fullLine + RESET)
-    private[ui] override def printResult(lineOrLines: String): Unit =
-      super.printResult(BOLD + lineOrLines + RESET)
-  }
 
   // ("extends EnumEntry" gets .entryName, enables Enum; "extends Enum[...]"
   // enables (and requires) .values.

src/main/scala/com/us/dsb/explore/algs/ttt/manual/ui/TextIO.scala

@@ -0,0 +1,35 @@
+package com.us.dsb.explore.algs.ttt.manual.ui
+
+import com.us.dsb.explore.algs.ttt.manual.ui.GameUI.GameUIResult
+
+// ?? revisit namea
+
+private[ui] trait SegregatedTextIO {
+  private[ui] def printStateText(lineOrLines: String): Unit
+  private[ui] def readPromptedLine(prompt: String): String
+  private[ui] def printError(fullLine: String): Unit
+  // ?? first, second, or both?:
+  private[ui] def printResult(lineOrLines: String): Unit
+  private[ui] def printResult(result: GameUIResult): Unit = printResult(result.text)
+}
+
+private[ui] class BaseConsoleTextIO extends SegregatedTextIO {
+  import scala.io.StdIn.readLine
+
+  private[ui] override def printStateText(lineOrLines: String): Unit = println(lineOrLines)
+  private[ui] override def readPromptedLine(prompt: String): String  = readLine(prompt)
+  private[ui] override def printError(fullLine: String): Unit = println(fullLine)
+  private[ui] override def printResult(lineOrLines: String): Unit = println(lineOrLines)
+}
+
+object PlainConsoleTextIO extends BaseConsoleTextIO
+
+object ColoredConsoleTextIO extends BaseConsoleTextIO {
+  import scala.io.AnsiColor._
+  private[ui] override def readPromptedLine(prompt: String): String =
+    super.readPromptedLine(BLUE + prompt + RESET)
+  private[ui] override def printError(fullLine: String): Unit =
+    super.printError(RED + fullLine + RESET)
+  private[ui] override def printResult(lineOrLines: String): Unit =
+    super.printResult(BOLD + lineOrLines + RESET)
+}

src/test/scala/com/us/dsb/explore/algs/ttt/manual/game/GameStateTest.scala

@@ -8,8 +8,8 @@ class GameStateTest extends AnyFunSpec {
   describe("GameState$?. tryMoveAt") {
     import Player._
     import scala.language.implicitConversions
-    implicit def intToRow(int: Int): RowIndex = RowIndex(Index.unsafeFrom(int))
-    implicit def intToCol(int: Int) = ColumnIndex(Index.unsafeFrom(int))
+    implicit def intToRow(int: Int): RowIndex    = RowIndex(Index.unsafeFrom(int))
+    implicit def intToCol(int: Int): ColumnIndex = ColumnIndex(Index.unsafeFrom(int))
 
 
     ignore("marks cells") {
@@ -18,8 +18,23 @@ class GameStateTest extends AnyFunSpec {
     ignore("accepts marking an unmarked cell") {
 
     }
-    ignore("rejects marking an already marked cell") {
+    describe("rejects marking an already marked cell:") {
+      it("other player") {
+        val reMarkResult =
+          GameState.initial(Player.X)
+              .tryMoveAt(1, 1).toOption.get
+              .tryMoveAt(1, 1)
+        assert(reMarkResult.isLeft, s" (reMarkResult = $reMarkResult)")
+      }
+      it("same player") {
 
+        val reMarkResult =
+          GameState.initial(Player.X)
+              .tryMoveAt(1, 1).toOption.get
+              .tryMoveAt(3, 1).toOption.get
+              .tryMoveAt(1, 1)
+        assert(reMarkResult.isLeft, s" (reMarkResult = $reMarkResult)")
+      }
     }
     describe("detects wins:") {
       it("one case") {

src/test/scala/com/us/dsb/explore/algs/ttt/manual/ui/GameUITest.scala

@@ -1,6 +1,5 @@
 package com.us.dsb.explore.algs.ttt.manual.ui
 
-import com.us.dsb.explore.algs.ttt.manual.ui.GameUI.{GameUIResult, SegregatedTextIO}
 import org.scalatest.funspec.AnyFunSpec
 import org.scalatest.matchers.should.Matchers._
 
@@ -100,4 +99,6 @@ class GameUITest extends AnyFunSpec {
       }
     }
   }
+  ignore("no coverage: markAtSelection's error case") {
+  }
 }