Increase coverage of the code 02

geektimus · geektimus · commit cfdb0d565a70 · 2019-08-30T18:07:17.000-05:00
diff --git a/src/main/scala/com/codingmaniacs/qualified/StringChallenges.scala b/src/main/scala/com/codingmaniacs/qualified/StringChallenges.scala
@@ -4,6 +4,8 @@ object StringChallenges {
 
   sealed trait ExprToken
 
+  final case object EmptyToken extends ExprToken
+
   final case class Number(n: Double) extends ExprToken
 
   final case class BinOperator(symbol: String, op: (Double, Double) => Double) extends ExprToken
@@ -54,14 +56,15 @@ object StringChallenges {
     val result = solution(expr.split(" ").toList).lastOption
     result match {
       case Some(Number(n)) => n
-      case None => 0.0
+      case Some(EmptyToken) => 0.0
     }
   }
 
   def parseTokensToExpr(strTokens: List[String]): List[ExprToken] = {
     strTokens.map {
       case tk if tk.matches("^[0-9]+(.[0-9]+)?") => Number(tk.toDouble)
       case tk if tk.equals("sqrt") => MonoOperator("sqrt", n => Math.sqrt(n))
+      case tk if tk.equals("") => EmptyToken
       case tk => BinOperator(tk)
     }
   }
diff --git a/src/test/scala/com/codingmaniacs/qualified/StringChallengesSpec.scala b/src/test/scala/com/codingmaniacs/qualified/StringChallengesSpec.scala
@@ -52,6 +52,10 @@ class StringChallengesSpec extends Specification {
     }
   }
   "The expression evaluator" should {
+    "evaluate a empty expresion" in {
+      val res = StringChallenges.evaluate("")
+      res mustEqual 0.0
+    }
     "evaluate a simple number" in {
       val res = StringChallenges.evaluate("3")
       res mustEqual 3

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ object StringChallenges {`
`4`	`4`
`5`	`5`	`sealed trait ExprToken`
`6`	`6`
	`7`	`+ final case object EmptyToken extends ExprToken`
	`8`	`+`
`7`	`9`	`final case class Number(n: Double) extends ExprToken`
`8`	`10`
`9`	`11`	`final case class BinOperator(symbol: String, op: (Double, Double) => Double) extends ExprToken`
`@@ -54,14 +56,15 @@ object StringChallenges {`
`54`	`56`	`val result = solution(expr.split(" ").toList).lastOption`
`55`	`57`	`result match {`
`56`	`58`	`case Some(Number(n)) => n`
`57`		`- case None => 0.0`
	`59`	`+ case Some(EmptyToken) => 0.0`
`58`	`60`	`}`
`59`	`61`	`}`
`60`	`62`
`61`	`63`	`def parseTokensToExpr(strTokens: List[String]): List[ExprToken] = {`
`62`	`64`	`strTokens.map {`
`63`	`65`	`case tk if tk.matches("^[0-9]+(.[0-9]+)?") => Number(tk.toDouble)`
`64`	`66`	`case tk if tk.equals("sqrt") => MonoOperator("sqrt", n => Math.sqrt(n))`
	`67`	`+ case tk if tk.equals("") => EmptyToken`
`65`	`68`	`case tk => BinOperator(tk)`
`66`	`69`	`}`
`67`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,10 @@ class StringChallengesSpec extends Specification {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`	`"The expression evaluator" should {`
	`55`	`+ "evaluate a empty expresion" in {`
	`56`	`+ val res = StringChallenges.evaluate("")`
	`57`	`+ res mustEqual 0.0`
	`58`	`+ }`
`55`	`59`	`"evaluate a simple number" in {`
`56`	`60`	`val res = StringChallenges.evaluate("3")`
`57`	`61`	`res mustEqual 3`