diff options
author | Andrew Or <andrewor14@gmail.com> | 2014-01-02 20:51:23 -0800 |
---|---|---|
committer | Andrew Or <andrewor14@gmail.com> | 2014-01-02 20:51:23 -0800 |
commit | df413e996fb7a4d7e05698e21d130387cf771811 (patch) | |
tree | dfda1413b1faeff3ba6b929cd0fd3b3d56c907e9 /streaming/src/test/java/org/apache | |
parent | 8831923219faf1599957056dd5f406a22d1f1128 (diff) | |
parent | 498a5f0a1c6e82a33c2ad8c48b68bbdb8da57a95 (diff) | |
download | spark-df413e996fb7a4d7e05698e21d130387cf771811.tar.gz spark-df413e996fb7a4d7e05698e21d130387cf771811.tar.bz2 spark-df413e996fb7a4d7e05698e21d130387cf771811.zip |
Merge remote-tracking branch 'spark/master'
Conflicts:
core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala
Diffstat (limited to 'streaming/src/test/java/org/apache')
-rw-r--r-- | streaming/src/test/java/org/apache/spark/streaming/JavaAPISuite.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/streaming/src/test/java/org/apache/spark/streaming/JavaAPISuite.java b/streaming/src/test/java/org/apache/spark/streaming/JavaAPISuite.java index a0a8129948..354f04f9a5 100644 --- a/streaming/src/test/java/org/apache/spark/streaming/JavaAPISuite.java +++ b/streaming/src/test/java/org/apache/spark/streaming/JavaAPISuite.java @@ -26,6 +26,7 @@ import com.google.common.io.Files; import kafka.serializer.StringDecoder; import org.apache.hadoop.mapreduce.lib.input.SequenceFileInputFormat; +import org.apache.spark.SparkConf; import org.apache.spark.streaming.api.java.JavaDStreamLike; import org.junit.After; import org.junit.Assert; @@ -63,8 +64,11 @@ public class JavaAPISuite implements Serializable { @Before public void setUp() { - System.setProperty("spark.streaming.clock", "org.apache.spark.streaming.util.ManualClock"); - ssc = new JavaStreamingContext("local[2]", "test", new Duration(1000)); + SparkConf conf = new SparkConf() + .setMaster("local[2]") + .setAppName("test") + .set("spark.streaming.clock", "org.apache.spark.streaming.util.ManualClock"); + ssc = new JavaStreamingContext(conf, new Duration(1000)); ssc.checkpoint("checkpoint"); } @@ -102,7 +106,7 @@ public class JavaAPISuite implements Serializable { Arrays.asList("hello", "world"), Arrays.asList("goodnight", "moon")); - List<List<Integer>> expected = Arrays.asList( + List<List<Integer>> expected = Arrays.asList( Arrays.asList(5,5), Arrays.asList(9,4)); |