diff options
Diffstat (limited to 'sql/hive')
-rw-r--r-- | sql/hive/src/test/scala/org/apache/spark/sql/hive/ErrorPositionSuite.scala | 20 | ||||
-rw-r--r-- | sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveComparisonTest.scala | 6 |
2 files changed, 22 insertions, 4 deletions
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/ErrorPositionSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/ErrorPositionSuite.scala index 14a466cfe9..4b6da7cd33 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/ErrorPositionSuite.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/ErrorPositionSuite.scala @@ -19,20 +19,34 @@ package org.apache.spark.sql.hive import scala.util.Try -import org.scalatest.BeforeAndAfter +import org.scalatest.BeforeAndAfterEach import org.apache.spark.sql.{AnalysisException, QueryTest} import org.apache.spark.sql.catalyst.parser.ParseDriver import org.apache.spark.sql.catalyst.util.quietly import org.apache.spark.sql.hive.test.TestHiveSingleton -class ErrorPositionSuite extends QueryTest with TestHiveSingleton with BeforeAndAfter { +class ErrorPositionSuite extends QueryTest with TestHiveSingleton with BeforeAndAfterEach { import hiveContext.implicits._ - before { + override protected def beforeEach(): Unit = { + super.beforeEach() + if (sqlContext.tableNames().contains("src")) { + sqlContext.dropTempTable("src") + } + Seq((1, "")).toDF("key", "value").registerTempTable("src") Seq((1, 1, 1)).toDF("a", "a", "b").registerTempTable("dupAttributes") } + override protected def afterEach(): Unit = { + try { + sqlContext.dropTempTable("src") + sqlContext.dropTempTable("dupAttributes") + } finally { + super.afterEach() + } + } + positionTest("ambiguous attribute reference 1", "SELECT a from dupAttributes", "a") diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveComparisonTest.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveComparisonTest.scala index 2e0a8698e6..207bb814f0 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveComparisonTest.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveComparisonTest.scala @@ -150,7 +150,11 @@ abstract class HiveComparisonTest """.stripMargin }) - super.afterAll() + try { + TestHive.reset() + } finally { + super.afterAll() + } } protected def prepareAnswer( |