Jelajahi Sumber

Fix two SparkR test issue regarding to different versions of R (#322)

Change-Id: Id301749a5e678666df771aa8f02cce149b56ff93
Saisai Shao 8 tahun lalu
induk
melakukan
f5ef489816

+ 4 - 4
repl/src/test/scala/com/cloudera/livy/repl/SparkRInterpreterSpec.scala

@@ -84,10 +84,10 @@ class SparkRInterpreterSpec extends BaseInterpreterSpec {
 
   it should "report an error if accessing an unknown variable" in withInterpreter { interpreter =>
     val response = interpreter.execute("x")
-    response should equal(Interpreter.ExecuteError(
-      "Error",
-      """[1] "Error in eval(expr, envir, enclos): object 'x' not found""""
-    ))
+    assert(response.isInstanceOf[Interpreter.ExecuteError])
+    val errorResponse = response.asInstanceOf[Interpreter.ExecuteError]
+    errorResponse.ename should be ("Error")
+    assert(errorResponse.evalue.contains("object 'x' not found"))
   }
 
 

+ 5 - 9
repl/src/test/scala/com/cloudera/livy/repl/SparkRSessionSpec.scala

@@ -132,15 +132,11 @@ class SparkRSessionSpec extends BaseSessionSpec {
     statement.id should equal (0)
 
     val result = parse(statement.output)
-    val expectedResult = Extraction.decompose(Map(
-      "status" -> "error",
-      "execution_count" -> 0,
-      "ename" -> "Error",
-      "evalue" -> "[1] \"Error in eval(expr, envir, enclos): object 'x' not found\"",
-      "traceback" -> List()
-    ))
-
-    result should equal (expectedResult)
+    (result \ "status").extract[String] should be ("error")
+    (result \ "execution_count").extract[Int] should be (0)
+    (result \ "ename").extract[String] should be ("Error")
+    assert((result \ "evalue").extract[String].contains("object 'x' not found"))
+    (result \ "traceback").extract[List[String]] should be (List())
   }
 
 }