fix

Author: gatorsmile

sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/HadoopFsRelationTest.scala

@@ -32,7 +32,7 @@ import org.apache.spark.sql.test.{SharedSQLContext, SQLTestUtils}
 import org.apache.spark.sql.types._
 
 
-abstract class HadoopFsRelationTest extends QueryTest with SQLTestUtils with SharedSQLContext {
+abstract class HadoopFsRelationTest extends QueryTest with SQLTestUtils {
   import testImplicits._
 
   val dataSourceName: String

sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/json/JsonHadoopFsRelationSuite.scala

@@ -24,9 +24,10 @@ import org.apache.hadoop.fs.Path
 import org.apache.spark.sql.Row
 import org.apache.spark.sql.catalyst.catalog.CatalogUtils
 import org.apache.spark.sql.execution.datasources.HadoopFsRelationTest
+import org.apache.spark.sql.test.SharedSQLContext
 import org.apache.spark.sql.types._
 
-class JsonHadoopFsRelationSuite extends HadoopFsRelationTest {
+class JsonHadoopFsRelationSuite extends HadoopFsRelationTest with SharedSQLContext {
   override val dataSourceName: String = "json"
 
   private val badJson = "\u0000\u0000\u0000A\u0001AAA"

sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/orc/OrcHadoopFsRelationSuite.scala

@@ -23,9 +23,12 @@ import org.apache.spark.sql.Row
 import org.apache.spark.sql.catalyst.catalog.CatalogUtils
 import org.apache.spark.sql.execution.datasources.HadoopFsRelationTest
 import org.apache.spark.sql.internal.SQLConf
+import org.apache.spark.sql.test.SharedSQLContext
 import org.apache.spark.sql.types._
 
-class OrcHadoopFsRelationSuite extends HadoopFsRelationTest {
+class OrcHadoopFsRelationSuite extends SharedSQLContext
+
+abstract class OrcHadoopFsRelationBase extends HadoopFsRelationTest {
   import testImplicits._
 
   override protected val enableAutoThreadAudit = false

sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetHadoopFsRelationSuite.scala

@@ -27,10 +27,11 @@ import org.apache.spark.sql._
 import org.apache.spark.sql.catalyst.catalog.CatalogUtils
 import org.apache.spark.sql.execution.datasources.{HadoopFsRelationTest, SQLHadoopMapReduceCommitProtocol}
 import org.apache.spark.sql.internal.SQLConf
+import org.apache.spark.sql.test.SharedSQLContext
 import org.apache.spark.sql.types._
 
 
-class ParquetHadoopFsRelationSuite extends HadoopFsRelationTest {
+class ParquetHadoopFsRelationSuite extends HadoopFsRelationTest with SharedSQLContext {
   import testImplicits._
 
   override val dataSourceName: String = "parquet"

sql/core/src/test/scala/org/apache/spark/sql/sources/SimpleTextHadoopFsRelationSuite.scala

@@ -22,9 +22,11 @@ import org.apache.hadoop.fs.Path
 import org.apache.spark.sql.catalyst.catalog.CatalogUtils
 import org.apache.spark.sql.catalyst.expressions.PredicateHelper
 import org.apache.spark.sql.execution.datasources.HadoopFsRelationTest
+import org.apache.spark.sql.test.SharedSQLContext
 import org.apache.spark.sql.types._
 
-class SimpleTextHadoopFsRelationSuite extends HadoopFsRelationTest with PredicateHelper {
+class SimpleTextHadoopFsRelationSuite
+  extends HadoopFsRelationTest with PredicateHelper with SharedSQLContext {
   override val dataSourceName: String = classOf[SimpleTextSource].getCanonicalName
 
   // We have a very limited number of supported types at here since it is just for a

sql/hive/src/test/scala/org/apache/spark/sql/hive/orc/HiveOrcHadoopFsRelationSuite.scala

@@ -19,9 +19,10 @@ package org.apache.spark.sql.hive.orc
 
 import java.io.File
 
-import org.apache.spark.sql.execution.datasources.orc.OrcHadoopFsRelationSuite
+import org.apache.spark.sql.execution.datasources.orc.OrcHadoopFsRelationBase
+import org.apache.spark.sql.hive.test.TestHiveSingleton
 
-class HiveOrcHadoopFsRelationSuite extends OrcHadoopFsRelationSuite {
+class HiveOrcHadoopFsRelationSuite extends OrcHadoopFsRelationBase with TestHiveSingleton {
   import testImplicits._
 
   override val dataSourceName: String =