From 20c65bc334091d8d05fb680551155aa182d98f7d Mon Sep 17 00:00:00 2001 From: Prashant Sharma Date: Sat, 14 Sep 2013 22:54:10 +0530 Subject: Fixed repl suite --- .../main/scala/org/apache/spark/repl/SparkILoopInit.scala | 2 +- repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'repl') diff --git a/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala b/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala index 0405a9dd80..31596cc02f 100644 --- a/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala +++ b/repl/src/main/scala/org/apache/spark/repl/SparkILoopInit.scala @@ -119,7 +119,7 @@ trait SparkILoopInit { command(""" @transient val sc = org.apache.spark.repl.Main.interp.createSparkContext(); """) - command("import spark.SparkContext._") + command("import org.apache.spark.SparkContext._") } echo("Spark context available as sc.") } diff --git a/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala b/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala index b06999a42c..fccb6e652c 100644 --- a/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala +++ b/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala @@ -51,7 +51,7 @@ class ReplSuite extends FunSuite { |val accum = sc.accumulator(0) |sc.parallelize(1 to 10).foreach(x => accum += x) |accum.value - """) + """.stripMargin) assertDoesNotContain("error:", output) assertDoesNotContain("Exception", output) assertContains("res1: Int = 55", output) @@ -63,7 +63,7 @@ class ReplSuite extends FunSuite { |sc.parallelize(1 to 10).map(x => v).collect.reduceLeft(_+_) |v = 10 |sc.parallelize(1 to 10).map(x => v).collect.reduceLeft(_+_) - """) + """.stripMargin) assertDoesNotContain("error:", output) assertDoesNotContain("Exception", output) assertContains("res0: Int = 70", output) @@ -76,7 +76,7 @@ class ReplSuite extends FunSuite { |def foo = 5 |} |sc.parallelize(1 to 10).map(x => (new C).foo).collect.reduceLeft(_+_) - """) + """.stripMargin) assertDoesNotContain("error:", output) assertDoesNotContain("Exception", output) assertContains("res0: Int = 50", output) @@ -86,7 +86,7 @@ class ReplSuite extends FunSuite { val output = runInterpreter("local", """ |def double(x: Int) = x + x |sc.parallelize(1 to 10).map(x => double(x)).collect.reduceLeft(_+_) - """) + """.stripMargin) assertDoesNotContain("error:", output) assertDoesNotContain("Exception", output) assertContains("res0: Int = 110", output) @@ -99,7 +99,7 @@ class ReplSuite extends FunSuite { |sc.parallelize(1 to 10).map(x => getV()).collect.reduceLeft(_+_) |v = 10 |sc.parallelize(1 to 10).map(x => getV()).collect.reduceLeft(_+_) - """) + """.stripMargin) assertDoesNotContain("error:", output) assertDoesNotContain("Exception", output) assertContains("res0: Int = 70", output) @@ -177,7 +177,7 @@ class ReplSuite extends FunSuite { |sc.parallelize(0 to 4).map(x => broadcastArray.value(x)).collect |array(0) = 5 |sc.parallelize(0 to 4).map(x => broadcastArray.value(x)).collect - """) + """.stripMargin) assertDoesNotContain("error:", output) assertDoesNotContain("Exception", output) assertContains("res0: Int = 70", output) -- cgit v1.2.3