diff options
author | Michael Armbrust <michael@databricks.com> | 2015-02-06 15:11:02 -0800 |
---|---|---|
committer | Michael Armbrust <michael@databricks.com> | 2015-02-06 15:12:29 -0800 |
commit | c950058e93f08e7544b9361b53eaed7c4ebeb2dc (patch) | |
tree | bb8c6d1d56e40b4ef50c370bc2f6e129e67e0c59 /sql | |
parent | af6ddf8b61c34259984386aa3415157e17bfd49a (diff) | |
download | spark-c950058e93f08e7544b9361b53eaed7c4ebeb2dc.tar.gz spark-c950058e93f08e7544b9361b53eaed7c4ebeb2dc.tar.bz2 spark-c950058e93f08e7544b9361b53eaed7c4ebeb2dc.zip |
[SQL] Use TestSQLContext in Java tests
Sometimes tests were failing due to the creation of multiple `SparkContext`s in a single JVM.
Author: Michael Armbrust <michael@databricks.com>
Closes #4441 from marmbrus/javaTests and squashes the following commits:
657b1e0 [Michael Armbrust] [SQL] Use TestSQLContext in Java tests
(cherry picked from commit 76c4bf59f6544b9c02d99fd18436427cbce632e6)
Signed-off-by: Michael Armbrust <michael@databricks.com>
Diffstat (limited to 'sql')
-rw-r--r-- | sql/core/src/test/java/org/apache/spark/sql/api/java/JavaAPISuite.java | 7 | ||||
-rw-r--r-- | sql/core/src/test/java/org/apache/spark/sql/api/java/JavaApplySchemaSuite.java | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sql/core/src/test/java/org/apache/spark/sql/api/java/JavaAPISuite.java b/sql/core/src/test/java/org/apache/spark/sql/api/java/JavaAPISuite.java index e5588938ea..a21a154090 100644 --- a/sql/core/src/test/java/org/apache/spark/sql/api/java/JavaAPISuite.java +++ b/sql/core/src/test/java/org/apache/spark/sql/api/java/JavaAPISuite.java @@ -19,6 +19,7 @@ package org.apache.spark.sql.api.java; import java.io.Serializable; +import org.apache.spark.sql.test.TestSQLContext$; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -37,14 +38,12 @@ public class JavaAPISuite implements Serializable { @Before public void setUp() { - sc = new JavaSparkContext("local", "JavaAPISuite"); - sqlContext = new SQLContext(sc); + sqlContext = TestSQLContext$.MODULE$; + sc = new JavaSparkContext(sqlContext.sparkContext()); } @After public void tearDown() { - sc.stop(); - sc = null; } @SuppressWarnings("unchecked") diff --git a/sql/core/src/test/java/org/apache/spark/sql/api/java/JavaApplySchemaSuite.java b/sql/core/src/test/java/org/apache/spark/sql/api/java/JavaApplySchemaSuite.java index 8510bac499..2e6e977fdc 100644 --- a/sql/core/src/test/java/org/apache/spark/sql/api/java/JavaApplySchemaSuite.java +++ b/sql/core/src/test/java/org/apache/spark/sql/api/java/JavaApplySchemaSuite.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.apache.spark.sql.test.TestSQLContext$; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -42,13 +43,12 @@ public class JavaApplySchemaSuite implements Serializable { @Before public void setUp() { - javaCtx = new JavaSparkContext("local", "JavaApplySchemaSuite"); - javaSqlCtx = new SQLContext(javaCtx); + javaSqlCtx = TestSQLContext$.MODULE$; + javaCtx = new JavaSparkContext(javaSqlCtx.sparkContext()); } @After public void tearDown() { - javaCtx.stop(); javaCtx = null; javaSqlCtx = null; } |