Make QueryTestBase extend SQLTestData; simplify SQLTestUtils to pure alias

QueryTestBase now extends SQLTestData directly, so setupTestData/
loadTestData logic moves into QueryTest. SQLTestUtils and SQLTestUtilsBase
become truly empty aliases with no additional members.

Co-authored-by: Isaac

Author: zhengruifeng

sql/core/src/test/scala/org/apache/spark/sql/QueryTest.scala

@@ -69,7 +69,8 @@ import org.apache.spark.util.ArrayImplicits._
 trait QueryTestBase extends PlanTestBase
     with SparkSessionProvider
     with Eventually
-    with BeforeAndAfterAll { self: Suite =>
+    with BeforeAndAfterAll
+    with test.SQLTestData { self: Suite =>
 
   protected def sparkContext = spark.sparkContext
 
@@ -588,6 +589,23 @@ trait QueryTestBase extends PlanTestBase
 }
 
 abstract class QueryTest extends SparkFunSuite with QueryTestBase with PlanTest {
+  // Whether to materialize all test data before the first test is run
+  private var loadTestDataBeforeTests = false
+
+  protected override def beforeAll(): Unit = {
+    super.beforeAll()
+    if (loadTestDataBeforeTests) {
+      loadTestData()
+    }
+  }
+
+  /**
+   * Materialize the test data immediately after the `SQLContext` is set up.
+   * This is necessary if the data is accessed by name but not through direct reference.
+   */
+  protected def setupTestData(): Unit = {
+    loadTestDataBeforeTests = true
+  }
 
   /**
    * Creates a temporary directory, which is then passed to `f` and will be deleted after `f`

sql/core/src/test/scala/org/apache/spark/sql/test/SQLTestData.scala

@@ -30,7 +30,7 @@ import org.apache.spark.unsafe.types.CalendarInterval
 /**
  * A collection of sample data used in SQL tests.
  */
-private[sql] trait SQLTestData extends SparkSessionProvider { self =>
+trait SQLTestData extends SparkSessionProvider { self =>
   import SQLTestData._
 
   // Note: all test data should be lazy because the SparkSession is not set up yet.

sql/core/src/test/scala/org/apache/spark/sql/test/SQLTestUtils.scala

@@ -24,38 +24,17 @@ import org.apache.spark.sql.{QueryTest, QueryTestBase, Row}
 /**
  * Helper trait that can be extended by all external SQL test suites.
  *
- * This is now a thin wrapper around [[QueryTestBase]] that also provides [[SQLTestData]].
+ * This is now an alias for [[QueryTestBase]].
  */
-private[sql] trait SQLTestUtilsBase
-  extends QueryTestBase
-  with SQLTestData { self: Suite =>
-}
+private[sql] trait SQLTestUtilsBase extends QueryTestBase { self: Suite => }
 
 /**
  * Helper trait that should be extended by all SQL test suites within the Spark
  * code base.
  *
- * This is now a thin wrapper around [[QueryTest]] that also provides [[SQLTestData]].
+ * This is now an alias for [[QueryTest]].
  */
-private[sql] trait SQLTestUtils extends QueryTest with SQLTestUtilsBase {
-  // Whether to materialize all test data before the first test is run
-  private var loadTestDataBeforeTests = false
-
-  protected override def beforeAll(): Unit = {
-    super.beforeAll()
-    if (loadTestDataBeforeTests) {
-      loadTestData()
-    }
-  }
-
-  /**
-   * Materialize the test data immediately after the `SQLContext` is set up.
-   * This is necessary if the data is accessed by name but not through direct reference.
-   */
-  protected def setupTestData(): Unit = {
-    loadTestDataBeforeTests = true
-  }
-}
+private[sql] trait SQLTestUtils extends QueryTest
 
 private[sql] object SQLTestUtils {