Capture non fatal errors in exercise evaluation

Author: Alejandro Gómez

src/main/scala/org/scalaexercises/exercises/Evaluator.scala

@@ -88,20 +88,13 @@ class Evaluator(timeout: Duration = 20.seconds) {
 
     val errors: Map[Severity, List[CompilationInfo]] = eval.errors.toMap
 
-    println(allCode)
-
-    println(result)
-
-    println(errors)
-
     result match {
       case scala.util.Success(r) ⇒ EvalResult.Success[T](errors, r, "")
       case scala.util.Failure(t) ⇒ t match {
         case e: Eval.CompilerException ⇒ EvalResult.CompilationError(errors)
-        case e                         ⇒ EvalResult.EvalRuntimeError(errors, None)
+        case NonFatal(e)               ⇒ EvalResult.EvalRuntimeError(errors, Option(RuntimeError(e, None)))
+        case e                         ⇒ EvalResult.GeneralError(e)
       }
     }
-   
   }
-
 }

src/test/scala/com/fortysevendeg/exercises/ExampleTarget.scala

@@ -1,10 +1,16 @@
 package org.scalaexercises.runtime
 
-object ExampleTarget {
+import org.scalatest._
+
+object ExampleTarget extends FlatSpec with Matchers {
   def intStringMethod(a: Int, b: String): String = {
     s"$a$b"
   }
 
+  def isOne(a: Int) = {
+    a shouldBe 1
+  }
+
   class ExampleException extends Exception("this is an example exception")
 
   def throwsExceptionMethod() {

src/test/scala/com/fortysevendeg/exercises/MethodEvalSpec.scala

@@ -49,6 +49,18 @@ class MethodEvalSpec extends FunSpec with Matchers {
       assert(res.toExecutionXor.isRight)
     }
 
+    it("fails with assertion error when the parameters are incorrect") {
+      val res = methodEval.eval(
+        "org.scalaexercises.runtime",
+        "org.scalaexercises.runtime.ExampleTarget.isOne",
+        "2" :: Nil
+      )
+
+      res should matchPattern {
+        case EvaluationException(_: TestFailedException) ⇒
+      }
+    }
+
     it("captures exceptions thrown by the called method") {
       val res = methodEval.eval(
         "org.scalaexercises.runtime",