Merge pull request #11 from AngeloFilaseta/develop

Fixed two minor bugs when closing game

build.sbt

@@ -8,6 +8,10 @@ lazy val root = (project in file("."))
       libraryDependencies += scalaTest % Test
   )
 
+// System.exit calls are trapped to prevent the JVM from terminating.
+// This is useful for executing user code that may call System.exit.
+trapExit := false
+
 // Tests Configurations
 val numberOfTestProcessors = java.lang.Runtime.getRuntime.availableProcessors + 1
 // Run tests in parallel

src/main/scala/view/StoryView.scala

@@ -20,19 +20,24 @@ object StoryView {
     private var _narrative: String = ""
     private var _pathways: Seq[Pathway] = Seq()
 
+    object NotValidInputStrategy {
+      //used to filter invalid input from user
+      val OnlyChoicesStrategy: String => Boolean = input =>
+            input == "" ||
+            !(input forall Character.isDigit) ||
+            input.toInt > _pathways.size ||
+            input.toInt < 1
+    }
+
     /**
      * Gets the user input and sends it to [[controller.subcontroller.StoryController]]
      */
     private def waitForUserInput(): Unit = {
-      val condition: String => Boolean = input =>
-        (input == "" || !(input forall Character.isDigit) ||
-          input.toInt > _pathways.size ||
-          input.toInt > _pathways.size ||
-          input.toInt < 1) && _pathways.nonEmpty
-      val chosenPath = InputUtility.inputAsInt(inputStrategy, condition)
       if (_pathways.nonEmpty) {
+        val chosenPath = InputUtility.inputAsInt(inputStrategy, NotValidInputStrategy.OnlyChoicesStrategy)
         storyController.choosePathWay(_pathways(chosenPath))
       } else {
+        scala.io.StdIn.readLine()
         storyController.close()
       }
     }
@@ -66,4 +71,3 @@ object StoryView {
   def apply(storyController: StoryController, inputStrategy: () => String): StoryView =
     new StoryViewImpl(storyController, inputStrategy)
 }
-

src/main/scala/view/util/InputUtility.scala

@@ -6,14 +6,14 @@ object InputUtility {
    *
    * @return the chosen pathway
    */
-   def inputAsInt(inputValueStrategy: () => String, notValidStrategy: String => Boolean): Int = {
+   def inputAsInt(inputValueStrategy: () => String, isNotValidStrategy: String => Boolean): Int = {
     var input: String = ""
     do {
       input = inputValueStrategy()
-      if(notValidStrategy(input)){
+      if(isNotValidStrategy(input)){
         println("Please insert a valid value.")
       }
-    } while (notValidStrategy(input))
+    } while (isNotValidStrategy(input))
     input.toInt - 1
   }
 }