remove TestApi ang add in test module

backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHBackend.scala

@@ -46,8 +46,6 @@ class CHBackend extends Backend {
   override def listenerApi(): ListenerApi = new CHListenerApi
   override def broadcastApi(): BroadcastApi = new CHBroadcastApi
   override def settings(): BackendSettingsApi = CHBackendSettings
-
-  override def testApi(): TestApi = new CHTestApi
 }
 
 object CHBackend {

backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/VeloxBackend.scala

@@ -47,8 +47,6 @@ class VeloxBackend extends Backend {
   override def listenerApi(): ListenerApi = new ListenerApiImpl
   override def broadcastApi(): BroadcastApi = new BroadcastApiImpl
   override def settings(): BackendSettingsApi = BackendSettings
-
-  override def testApi(): TestApi = new TestApiImpl
 }
 
 object VeloxBackend {

gluten-core/src/main/scala/io/glutenproject/backendsapi/Backend.scala

@@ -38,6 +38,4 @@ trait Backend {
   def broadcastApi(): BroadcastApi
 
   def settings(): BackendSettingsApi
-
-  def testApi(): TestApi
 }

gluten-core/src/main/scala/io/glutenproject/backendsapi/BackendsApiManager.scala

@@ -92,8 +92,4 @@ object BackendsApiManager {
   def getSettings: BackendSettingsApi = {
     backend.settings
   }
-
-  def getTestApiInstance: TestApi = {
-    backend.testApi()
-  }
 }

gluten-ut/common/src/test/scala/io/glutenproject/utils/BackendTestSettings.scala

@@ -140,6 +140,8 @@ abstract class BackendTestSettings {
       false
     }
   }
+
+  def getSQLQueryTestSettings: SQLQueryTestSettings
 }
 
 object BackendTestSettings {

gluten-ut/common/src/test/scala/io/glutenproject/utils/SQLQueryTestSettings.scala

@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.glutenproject.utils
+
+trait SQLQueryTestSettings {
+  def getSupportedSQLQueryTests: Set[String]
+
+  def getOverwriteSQLQueryTests: Set[String]
+}

backends-clickhouse/src/main/scala/io/glutenproject/backendsapi/clickhouse/CHTestApi.scala → gluten-ut/spark32/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseSQLQueryTestSettings.scala

@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.glutenproject.backendsapi.clickhouse
+package io.glutenproject.utils.clickhouse
 
-import io.glutenproject.backendsapi.TestApi
+import io.glutenproject.utils.SQLQueryTestSettings
 
-class CHTestApi extends TestApi {
-  override def getSupportedSQLQueryTests(sparkVersion: TestApi.SparkVersion): Set[String] =
-    Set[String]()
+object ClickHouseSQLQueryTestSettings extends SQLQueryTestSettings {
+  override def getSupportedSQLQueryTests: Set[String] = Set()
 
-  override def getOverwriteSQLQueryTests(sparkVersion: TestApi.SparkVersion): Set[String] =
-    Set[String]()
+  override def getOverwriteSQLQueryTests: Set[String] = Set()
 }

gluten-ut/spark32/src/test/scala/io/glutenproject/utils/clickhouse/ClickHouseTestSettings.scala

@@ -16,8 +16,7 @@
  */
 package io.glutenproject.utils.clickhouse
 
-import io.glutenproject.utils.BackendTestSettings
-
+import io.glutenproject.utils.{BackendTestSettings, SQLQueryTestSettings}
 import org.apache.spark.sql._
 import org.apache.spark.sql.catalyst.expressions._
 import org.apache.spark.sql.connector._
@@ -2108,6 +2107,8 @@ class ClickHouseTestSettings extends BackendTestSettings {
       "SELECT structFieldSimple.key, arrayFieldSimple[1] FROM tableWithSchema a where int_Field=1")
     .exclude("SELECT structFieldComplex.Value.`value_(2)` FROM tableWithSchema")
   enableSuite[SparkFunctionStatistics]
+
+  override def getSQLQueryTestSettings: SQLQueryTestSettings = ClickHouseSQLQueryTestSettings
 }
 
 // scalastyle:on line.size.limiton

backends-velox/src/main/scala/io/glutenproject/backendsapi/velox/TestApiImpl.scala → gluten-ut/spark32/src/test/scala/io/glutenproject/utils/velox/VeloxSQLQueryTestSettings.scala

@@ -14,36 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.glutenproject.backendsapi.velox
+package io.glutenproject.utils.velox
 
-import io.glutenproject.backendsapi.TestApi
-import io.glutenproject.backendsapi.TestApi.{SparkVersion, SparkVersion32, SparkVersion33}
+import io.glutenproject.utils.SQLQueryTestSettings
 
-class TestApiImpl extends TestApi {
+object VeloxSQLQueryTestSettings extends SQLQueryTestSettings {
+  override def getSupportedSQLQueryTests: Set[String] = SUPPORTED_SQL_QUERY_LIST
 
-  /**
-   * List of supported cases to run with Velox backend, in lower case. Please add to the supported
-   * list after enabling a sql test.
-   */
-  override def getSupportedSQLQueryTests(sparkVersion: SparkVersion): Set[String] = {
-    sparkVersion match {
-      case SparkVersion32() =>
-        SUPPORTED_SQL_QUERY_LIST_SPARK32
-      case SparkVersion33() =>
-        SUPPORTED_SQL_QUERY_LIST_SPARK33
-    }
-  }
+  override def getOverwriteSQLQueryTests: Set[String] = OVERWRITE_SQL_QUERY_LIST
 
-  override def getOverwriteSQLQueryTests(sparkVersion: SparkVersion): Set[String] = {
-    sparkVersion match {
-      case SparkVersion32() =>
-        OVERWRITE_SQL_QUERY_LIST_SPARK32
-      case SparkVersion33() =>
-        OVERWRITE_SQL_QUERY_LIST_SPARK33
-    }
-  }
-
-  private val SUPPORTED_SQL_QUERY_LIST_SPARK32: Set[String] =
+  val SUPPORTED_SQL_QUERY_LIST: Set[String] =
     Set(
       "bitwise.sql",
       "cast.sql",
@@ -221,191 +201,7 @@ class TestApiImpl extends TestApi {
       "udf/udf-window.sql"
     )
 
-  private val OVERWRITE_SQL_QUERY_LIST_SPARK32: Set[String] = Set(
-    // Velox corr has better computation logic but it fails Spark's precision check.
-    // Remove -- SPARK-24369 multiple distinct aggregations having the same argument set
-    "group-by.sql",
-    // Remove -- SPARK-24369 multiple distinct aggregations having the same argument set
-    "udf/udf-group-by.sql"
-  )
-
-  private val SUPPORTED_SQL_QUERY_LIST_SPARK33: Set[String] = Set(
-    "bitwise.sql",
-    "cast.sql",
-    "change-column.sql",
-    "charvarchar.sql",
-    "columnresolution-negative.sql",
-    "columnresolution-views.sql",
-    "columnresolution.sql",
-    "comments.sql",
-    "comparator.sql",
-    "count.sql",
-    "cross-join.sql",
-    "csv-functions.sql",
-    "cte-legacy.sql",
-    "cte-nested.sql",
-    "cte-nonlegacy.sql",
-    "cte.sql",
-    "current_database_catalog.sql",
-    "date.sql",
-    "datetime-formatting-invalid.sql",
-    // Velox had different handling for some illegal cases.
-    //     "datetime-formatting-legacy.sql",
-    //     "datetime-formatting.sql",
-    "datetime-legacy.sql",
-    "datetime-parsing-invalid.sql",
-    "datetime-parsing-legacy.sql",
-    "datetime-parsing.sql",
-    "datetime-special.sql",
-    "decimalArithmeticOperations.sql",
-    "describe-part-after-analyze.sql",
-    "describe-query.sql",
-    "describe-table-after-alter-table.sql",
-    "describe-table-column.sql",
-    "describe.sql",
-    "except-all.sql",
-    "except.sql",
-    "extract.sql",
-    "group-by-filter.sql",
-    "group-by-ordinal.sql",
-    "grouping_set.sql",
-    "having.sql",
-    "ignored.sql",
-    "inline-table.sql",
-    "inner-join.sql",
-    "intersect-all.sql",
-    "interval.sql",
-    "join-empty-relation.sql",
-    "join-lateral.sql",
-    "json-functions.sql",
-    "like-all.sql",
-    "like-any.sql",
-    "limit.sql",
-    "literals.sql",
-    "map.sql",
-    "misc-functions.sql",
-    "natural-join.sql",
-    "null-handling.sql",
-    "null-propagation.sql",
-    "operators.sql",
-    "order-by-nulls-ordering.sql",
-    "order-by-ordinal.sql",
-    "outer-join.sql",
-    "parse-schema-string.sql",
-    "pivot.sql",
-    "pred-pushdown.sql",
-    "predicate-functions.sql",
-    "query_regex_column.sql",
-    "random.sql",
-    "regexp-functions.sql",
-    "show-create-table.sql",
-    "show-tables.sql",
-    "show-tblproperties.sql",
-    "show-views.sql",
-    "show_columns.sql",
-    "sql-compatibility-functions.sql",
-    "string-functions.sql",
-    "struct.sql",
-    "subexp-elimination.sql",
-    "table-aliases.sql",
-    "table-valued-functions.sql",
-    "tablesample-negative.sql",
-    "subquery/exists-subquery/exists-aggregate.sql",
-    "subquery/exists-subquery/exists-basic.sql",
-    "subquery/exists-subquery/exists-cte.sql",
-    "subquery/exists-subquery/exists-having.sql",
-    "subquery/exists-subquery/exists-joins-and-set-ops.sql",
-    "subquery/exists-subquery/exists-orderby-limit.sql",
-    "subquery/exists-subquery/exists-within-and-or.sql",
-    "subquery/in-subquery/in-basic.sql",
-    "subquery/in-subquery/in-group-by.sql",
-    "subquery/in-subquery/in-having.sql",
-    "subquery/in-subquery/in-joins.sql",
-    "subquery/in-subquery/in-limit.sql",
-    "subquery/in-subquery/in-multiple-columns.sql",
-    "subquery/in-subquery/in-order-by.sql",
-    "subquery/in-subquery/in-set-operations.sql",
-    "subquery/in-subquery/in-with-cte.sql",
-    "subquery/in-subquery/nested-not-in.sql",
-    "subquery/in-subquery/not-in-group-by.sql",
-    "subquery/in-subquery/not-in-joins.sql",
-    "subquery/in-subquery/not-in-unit-tests-multi-column.sql",
-    "subquery/in-subquery/not-in-unit-tests-multi-column-literal.sql",
-    "subquery/in-subquery/not-in-unit-tests-single-column.sql",
-    "subquery/in-subquery/not-in-unit-tests-single-column-literal.sql",
-    "subquery/in-subquery/simple-in.sql",
-    "subquery/negative-cases/invalid-correlation.sql",
-    "subquery/negative-cases/subq-input-typecheck.sql",
-    "subquery/scalar-subquery/scalar-subquery-predicate.sql",
-    "subquery/scalar-subquery/scalar-subquery-select.sql",
-    "subquery/subquery-in-from.sql",
-    "postgreSQL/aggregates_part1.sql",
-    "postgreSQL/aggregates_part2.sql",
-    "postgreSQL/aggregates_part3.sql",
-    "postgreSQL/aggregates_part4.sql",
-    "postgreSQL/boolean.sql",
-    "postgreSQL/case.sql",
-    "postgreSQL/comments.sql",
-    "postgreSQL/create_view.sql",
-    "postgreSQL/date.sql",
-    "postgreSQL/float4.sql",
-    "postgreSQL/insert.sql",
-    "postgreSQL/int2.sql",
-    "postgreSQL/int4.sql",
-    "postgreSQL/int8.sql",
-    "postgreSQL/interval.sql",
-    "postgreSQL/join.sql",
-    "postgreSQL/limit.sql",
-    "postgreSQL/numeric.sql",
-    "postgreSQL/select.sql",
-    "postgreSQL/select_distinct.sql",
-    "postgreSQL/select_having.sql",
-    "postgreSQL/select_implicit.sql",
-    "postgreSQL/strings.sql",
-    "postgreSQL/text.sql",
-    "postgreSQL/timestamp.sql",
-    "postgreSQL/union.sql",
-    "postgreSQL/window_part1.sql",
-    "postgreSQL/window_part2.sql",
-    "postgreSQL/window_part3.sql",
-    "postgreSQL/window_part4.sql",
-    "postgreSQL/with.sql",
-    "datetime-special.sql",
-    "timestamp-ansi.sql",
-    "timestamp.sql",
-    "arrayJoin.sql",
-    "binaryComparison.sql",
-    "booleanEquality.sql",
-    "caseWhenCoercion.sql",
-    "concat.sql",
-    "dateTimeOperations.sql",
-    "decimalPrecision.sql",
-    "division.sql",
-    "elt.sql",
-    "ifCoercion.sql",
-    "implicitTypeCasts.sql",
-    "inConversion.sql",
-    "mapZipWith.sql",
-    "mapconcat.sql",
-    "promoteStrings.sql",
-    "stringCastAndExpressions.sql",
-    "widenSetOperationTypes.sql",
-    "windowFrameCoercion.sql",
-    "timestamp-ltz.sql",
-    "timestamp-ntz.sql",
-    "timezone.sql",
-    "transform.sql",
-    "try_arithmetic.sql",
-    "try_cast.sql",
-    "udaf.sql",
-    "union.sql",
-    "using-join.sql",
-    "window.sql",
-    "udf-union.sql",
-    "udf-window.sql"
-  )
-
-  private val OVERWRITE_SQL_QUERY_LIST_SPARK33: Set[String] = Set(
+  val OVERWRITE_SQL_QUERY_LIST: Set[String] = Set(
     // Velox corr has better computation logic but it fails Spark's precision check.
     // Remove -- SPARK-24369 multiple distinct aggregations having the same argument set
     "group-by.sql",

gluten-ut/spark32/src/test/scala/io/glutenproject/utils/velox/VeloxTestSettings.scala

@@ -16,8 +16,7 @@
  */
 package io.glutenproject.utils.velox
 
-import io.glutenproject.utils.BackendTestSettings
-
+import io.glutenproject.utils.{BackendTestSettings, SQLQueryTestSettings}
 import org.apache.spark.sql._
 import org.apache.spark.sql.catalyst.expressions._
 import org.apache.spark.sql.connector.{GlutenDataSourceV2DataFrameSessionCatalogSuite, GlutenDataSourceV2DataFrameSuite, GlutenDataSourceV2FunctionSuite, GlutenDataSourceV2SQLSessionCatalogSuite, GlutenDataSourceV2SQLSuite, GlutenDataSourceV2Suite, GlutenFileDataSourceV2FallBackSuite, GlutenLocalScanSuite, GlutenSupportsCatalogOptionsSuite, GlutenTableCapabilityCheckSuite, GlutenWriteDistributionAndOrderingSuite}
@@ -28,7 +27,7 @@ import org.apache.spark.sql.execution.datasources.binaryfile.GlutenBinaryFileFor
 import org.apache.spark.sql.execution.datasources.csv.{GlutenCSVLegacyTimeParserSuite, GlutenCSVv1Suite, GlutenCSVv2Suite}
 import org.apache.spark.sql.execution.datasources.json.{GlutenJsonLegacyTimeParserSuite, GlutenJsonV1Suite, GlutenJsonV2Suite}
 import org.apache.spark.sql.execution.datasources.orc.{GlutenOrcColumnarBatchReaderSuite, GlutenOrcFilterSuite, GlutenOrcPartitionDiscoverySuite, GlutenOrcSourceSuite, GlutenOrcV1FilterSuite, GlutenOrcV1PartitionDiscoverySuite, GlutenOrcV1QuerySuite, GlutenOrcV1SchemaPruningSuite, GlutenOrcV2QuerySuite, GlutenOrcV2SchemaPruningSuite}
-import org.apache.spark.sql.execution.datasources.parquet.{GlutenParquetColumnIndexSuite, GlutenParquetCompressionCodecPrecedenceSuite, GlutenParquetEncodingSuite, GlutenParquetFileFormatV1Suite, GlutenParquetFileFormatV2Suite, GlutenParquetInteroperabilitySuite, GlutenParquetIOSuite, GlutenParquetProtobufCompatibilitySuite, GlutenParquetRebaseDatetimeV1Suite, GlutenParquetRebaseDatetimeV2Suite, GlutenParquetSchemaInferenceSuite, GlutenParquetSchemaSuite, GlutenParquetThriftCompatibilitySuite, GlutenParquetV1FilterSuite, GlutenParquetV1PartitionDiscoverySuite, GlutenParquetV1QuerySuite, GlutenParquetV1SchemaPruningSuite, GlutenParquetV2FilterSuite, GlutenParquetV2PartitionDiscoverySuite, GlutenParquetV2QuerySuite, GlutenParquetV2SchemaPruningSuite}
+import org.apache.spark.sql.execution.datasources.parquet.{GlutenParquetColumnIndexSuite, GlutenParquetCompressionCodecPrecedenceSuite, GlutenParquetEncodingSuite, GlutenParquetFileFormatV1Suite, GlutenParquetFileFormatV2Suite, GlutenParquetIOSuite, GlutenParquetInteroperabilitySuite, GlutenParquetProtobufCompatibilitySuite, GlutenParquetRebaseDatetimeV1Suite, GlutenParquetRebaseDatetimeV2Suite, GlutenParquetSchemaInferenceSuite, GlutenParquetSchemaSuite, GlutenParquetThriftCompatibilitySuite, GlutenParquetV1FilterSuite, GlutenParquetV1PartitionDiscoverySuite, GlutenParquetV1QuerySuite, GlutenParquetV1SchemaPruningSuite, GlutenParquetV2FilterSuite, GlutenParquetV2PartitionDiscoverySuite, GlutenParquetV2QuerySuite, GlutenParquetV2SchemaPruningSuite}
 import org.apache.spark.sql.execution.datasources.text.{GlutenTextV1Suite, GlutenTextV2Suite}
 import org.apache.spark.sql.execution.datasources.v2.GlutenFileTableSuite
 import org.apache.spark.sql.execution.exchange.GlutenEnsureRequirementsSuite
@@ -1091,5 +1090,7 @@ class VeloxTestSettings extends BackendTestSettings {
   enableSuite[GlutenHiveSQLQuerySuite]
     // ReaderFactory is not registered for format orc.
     .exclude("hive orc scan")
+
+  override def getSQLQueryTestSettings: SQLQueryTestSettings = VeloxSQLQueryTestSettings
 }
 // scalastyle:on line.size.limit

gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenSQLQueryTestSuite.scala

@@ -17,8 +17,7 @@
 package org.apache.spark.sql
 
 import io.glutenproject.GlutenConfig
-import io.glutenproject.backendsapi.{BackendsApiManager, TestApi}
-import io.glutenproject.utils.{BackendTestUtils, SystemParameters}
+import io.glutenproject.utils.{BackendTestSettings, BackendTestUtils, SystemParameters}
 
 import org.apache.spark.SparkConf
 import org.apache.spark.sql.catalyst.expressions.codegen.CodeGenerator
@@ -224,8 +223,8 @@ class GlutenSQLQueryTestSuite
 
   // List of supported cases to run with a certain backend, in lower case.
   private val supportedList: Set[String] =
-    BackendsApiManager.getTestApiInstance.getSupportedSQLQueryTests(TestApi.SparkVersion32()) ++
-      BackendsApiManager.getTestApiInstance.getOverwriteSQLQueryTests(TestApi.SparkVersion32())
+    BackendTestSettings.instance.getSQLQueryTestSettings.getSupportedSQLQueryTests ++
+      BackendTestSettings.instance.getSQLQueryTestSettings.getOverwriteSQLQueryTests
   // Create all the test cases.
   listTestCases.foreach(createScalaTestCase)