Move loadTestDataBeforeTests/setupTestData/beforeAll to QueryTestBase

These don't depend on AnyFunSuite — they only use BeforeAndAfterAll
and SQLTestData, both already in QueryTestBase.

Co-authored-by: Isaac

Author: zhengruifeng

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

@@ -582,6 +582,24 @@ trait QueryTestBase extends PlanTestBase
       s"${cs.getClassName}.${cs.getMethodName}(${cs.getFileName}:${cs.getLineNumber + lines})")
   }
 
+  // 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
+  }
+
 }
 
 abstract class QueryTest extends SparkFunSuite with QueryTestBase with PlanTest

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

@@ -45,16 +45,6 @@ private[sql] trait SQLTestUtilsBase extends QueryTestBase { self: Suite => }
  * code base.
  */
 private[sql] trait SQLTestUtils extends SparkFunSuite with SQLTestUtilsBase 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()
-    }
-  }
-
   /**
    * Creates a temporary directory, which is then passed to `f` and will be deleted after `f`
    * returns.
@@ -80,14 +70,6 @@ private[sql] trait SQLTestUtils extends SparkFunSuite with SQLTestUtilsBase with
     }
   }
 
-  /**
-   * 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
-  }
-
   /**
    * Disable stdout and stderr when running the test. To not output the logs to the console,
    * ConsoleAppender's `follow` should be set to `true` so that it will honor reassignments of