[GLUTEN-11550][UT] Replace GlutenTestsCommonTrait with correct Gluten test traits for Spark 4.0/4.1

gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala

@@ -215,32 +215,32 @@ class VeloxTestSettings extends BackendTestSettings {
   enableSuite[GlutenBitmapExpressionUtilsSuite]
   enableSuite[GlutenCallMethodViaReflectionSuite]
   enableSuite[GlutenCanonicalizeSuite]
-  enableSuite[GlutenCastWithAnsiOnSuite]
+  // TODO: 4.x enableSuite[GlutenCastWithAnsiOnSuite]  // 4 failures
   enableSuite[GlutenCodeGenerationSuite]
   enableSuite[GlutenCodeGeneratorWithInterpretedFallbackSuite]
   enableSuite[GlutenCollationExpressionSuite]
   enableSuite[GlutenCollationRegexpExpressionsSuite]
   enableSuite[GlutenCsvExpressionsSuite]
   enableSuite[GlutenDynamicPruningSubquerySuite]
   enableSuite[GlutenExprIdSuite]
-  enableSuite[GlutenExpressionEvalHelperSuite]
+  // TODO: 4.x enableSuite[GlutenExpressionEvalHelperSuite]  // 2 failures
   enableSuite[GlutenExpressionImplUtilsSuite]
   enableSuite[GlutenExpressionSQLBuilderSuite]
   enableSuite[GlutenExpressionSetSuite]
   enableSuite[GlutenExtractPredicatesWithinOutputSetSuite]
   enableSuite[GlutenHexSuite]
   enableSuite[GlutenMutableProjectionSuite]
   enableSuite[GlutenNamedExpressionSuite]
-  enableSuite[GlutenObjectExpressionsSuite]
+  // TODO: 4.x enableSuite[GlutenObjectExpressionsSuite]  // 7 failures
   enableSuite[GlutenOrderingSuite]
-  enableSuite[GlutenScalaUDFSuite]
+  // TODO: 4.x enableSuite[GlutenScalaUDFSuite]  // 1 failure
   enableSuite[GlutenSchemaPruningSuite]
   enableSuite[GlutenSelectedFieldSuite]
   // GlutenSubExprEvaluationRuntimeSuite is removed because SubExprEvaluationRuntimeSuite
   // is in test-jar without shaded Guava, while SubExprEvaluationRuntime is shaded.
   enableSuite[GlutenSubexpressionEliminationSuite]
   enableSuite[GlutenTimeWindowSuite]
-  enableSuite[GlutenToPrettyStringSuite]
+  // TODO: 4.x enableSuite[GlutenToPrettyStringSuite]  // 1 failure
   enableSuite[GlutenUnsafeRowConverterSuite]
   enableSuite[GlutenUnwrapUDTExpressionSuite]
   enableSuite[GlutenV2ExpressionUtilsSuite]
@@ -251,8 +251,8 @@ class VeloxTestSettings extends BackendTestSettings {
   enableSuite[GlutenDataSourceV2MetricsSuite]
   enableSuite[GlutenDataSourceV2OptionSuite]
   enableSuite[GlutenDataSourceV2UtilsSuite]
-  // TODO: 4.x enableSuite[GlutenGroupBasedUpdateTableSuite]  // 1 failure
-  // TODO: 4.x enableSuite[GlutenMergeIntoDataFrameSuite]  // 1 failure
+  enableSuite[GlutenGroupBasedUpdateTableSuite]
+  enableSuite[GlutenMergeIntoDataFrameSuite]
   enableSuite[GlutenProcedureSuite]
   enableSuite[GlutenPushablePredicateSuite]
   enableSuite[GlutenV1ReadFallbackWithCatalogSuite]
@@ -322,7 +322,7 @@ class VeloxTestSettings extends BackendTestSettings {
   enableSuite[GlutenJsonParsingOptionsSuite]
   // Generated suites for org.apache.spark.sql.execution.datasources.parquet
   enableSuite[GlutenParquetAvroCompatibilitySuite]
-  enableSuite[GlutenParquetCommitterSuite]
+  // TODO: 4.x enableSuite[GlutenParquetCommitterSuite]  // spark.test.home not set
   enableSuite[GlutenParquetFieldIdSchemaSuite]
   enableSuite[GlutenParquetTypeWideningSuite]
     .exclude("parquet decimal precision change Decimal(20, 2) -> Decimal(22, 2)")
@@ -390,8 +390,8 @@ class VeloxTestSettings extends BackendTestSettings {
     .exclude("parquet widening conversion ShortType -> DoubleType")
   enableSuite[GlutenParquetVariantShreddingSuite]
   // Generated suites for org.apache.spark.sql.execution.datasources.text
-  // TODO: 4.x enableSuite[GlutenWholeTextFileV1Suite]  // 1 failure
-  // TODO: 4.x enableSuite[GlutenWholeTextFileV2Suite]  // 1 failure
+  enableSuite[GlutenWholeTextFileV1Suite]
+  enableSuite[GlutenWholeTextFileV2Suite]
   // Generated suites for org.apache.spark.sql.execution.datasources.v2
   enableSuite[GlutenFileWriterFactorySuite]
   enableSuite[GlutenV2SessionCatalogNamespaceSuite]
@@ -694,42 +694,42 @@ class VeloxTestSettings extends BackendTestSettings {
   enableSuite[GlutenAggregatingAccumulatorSuite]
   enableSuite[GlutenCoGroupedIteratorSuite]
   enableSuite[GlutenColumnarRulesSuite]
-  enableSuite[GlutenDataSourceScanExecRedactionSuite]
-  enableSuite[GlutenDataSourceV2ScanExecRedactionSuite]
+  // TODO: 4.x enableSuite[GlutenDataSourceScanExecRedactionSuite]  // 2 failures
+  // TODO: 4.x enableSuite[GlutenDataSourceV2ScanExecRedactionSuite]  // 2 failures
   enableSuite[GlutenExecuteImmediateEndToEndSuite]
-  enableSuite[GlutenExternalAppendOnlyUnsafeRowArraySuite]
+  // TODO: 4.x enableSuite[GlutenExternalAppendOnlyUnsafeRowArraySuite]  // 14 failures
   enableSuite[GlutenGlobalTempViewSuite]
   enableSuite[GlutenGlobalTempViewTestSuite]
   enableSuite[GlutenGroupedIteratorSuite]
   enableSuite[GlutenHiveResultSuite]
-  // TODO: 4.x enableSuite[GlutenInsertSortForLimitAndOffsetSuite]  // 6 failures
+  enableSuite[GlutenInsertSortForLimitAndOffsetSuite]
   enableSuite[GlutenLocalTempViewTestSuite]
-  enableSuite[GlutenLogicalPlanTagInSparkPlanSuite]
+  // TODO: 4.x enableSuite[GlutenLogicalPlanTagInSparkPlanSuite]  // RUN ABORTED
   enableSuite[GlutenOptimizeMetadataOnlyQuerySuite]
   enableSuite[GlutenPersistedViewTestSuite]
-  // TODO: 4.x enableSuite[GlutenPlannerSuite]  // 1 failure
-  enableSuite[GlutenProjectedOrderingAndPartitioningSuite]
+  enableSuite[GlutenPlannerSuite]
+  // TODO: 4.x enableSuite[GlutenProjectedOrderingAndPartitioningSuite]  // 6 failures
   enableSuite[GlutenQueryPlanningTrackerEndToEndSuite]
-  enableSuite[GlutenRemoveRedundantProjectsSuite]
-  // TODO: 4.x enableSuite[GlutenRemoveRedundantSortsSuite]  // 1 failure
+  // TODO: 4.x enableSuite[GlutenRemoveRedundantProjectsSuite]  // 14 failures
+  enableSuite[GlutenRemoveRedundantSortsSuite]
   enableSuite[GlutenRowToColumnConverterSuite]
-  enableSuite[GlutenSQLExecutionSuite]
+  // TODO: 4.x enableSuite[GlutenSQLExecutionSuite]  // 1 failure
   enableSuite[GlutenSQLFunctionSuite]
-  enableSuite[GlutenSQLJsonProtocolSuite]
-  enableSuite[GlutenShufflePartitionsUtilSuite]
-  enableSuite[GlutenSimpleSQLViewSuite]
-  // TODO: 4.x enableSuite[GlutenSparkPlanSuite]  // 1 failure
+  // TODO: 4.x enableSuite[GlutenSQLJsonProtocolSuite]  // 1 failure
+  // TODO: 4.x enableSuite[GlutenShufflePartitionsUtilSuite]  // 1 failure
+  // TODO: 4.x enableSuite[GlutenSimpleSQLViewSuite]  // 1 failure
+  enableSuite[GlutenSparkPlanSuite]
   enableSuite[GlutenSparkPlannerSuite]
   enableSuite[GlutenSparkScriptTransformationSuite]
   enableSuite[GlutenSparkSqlParserSuite]
   enableSuite[GlutenUnsafeFixedWidthAggregationMapSuite]
   enableSuite[GlutenUnsafeKVExternalSorterSuite]
-  enableSuite[GlutenUnsafeRowSerializerSuite]
-  // TODO: 4.x enableSuite[GlutenWholeStageCodegenSparkSubmitSuite]  // 1 failure
-  // TODO: 4.x enableSuite[GlutenWholeStageCodegenSuite]  // 24 failures
+  // TODO: 4.x enableSuite[GlutenUnsafeRowSerializerSuite]  // 1 failure
+  enableSuite[GlutenWholeStageCodegenSparkSubmitSuite]
+  enableSuite[GlutenWholeStageCodegenSuite]
   enableSuite[GlutenBroadcastExchangeSuite]
   enableSuite[GlutenLocalBroadcastExchangeSuite]
-  enableSuite[GlutenCoalesceShufflePartitionsSuite]
+    // TODO: 4.x enableSuite[GlutenCoalesceShufflePartitionsSuite]  // LiveListenerBus stopped
     // Rewrite for Gluten. Change details are in the inline comments in individual tests.
     .excludeByPrefix("determining the number of reducers")
   enableSuite[GlutenExchangeSuite]
@@ -807,14 +807,14 @@ class VeloxTestSettings extends BackendTestSettings {
   enableSuite[GlutenSaveLoadSuite]
   enableSuite[GlutenTableScanSuite]
   // Generated suites for org.apache.spark.sql.sources
-  // TODO: 4.x enableSuite[GlutenBucketedReadWithHiveSupportSuite]  // 2 failures
-  // TODO: 4.x enableSuite[GlutenBucketedWriteWithHiveSupportSuite]  // 1 failure
-  // TODO: 4.x enableSuite[GlutenCommitFailureTestRelationSuite]  // 2 failures
+  // TODO: 4.x enableSuite[GlutenBucketedReadWithHiveSupportSuite]  // TestHiveSingleton conflict
+  // TODO: 4.x enableSuite[GlutenBucketedWriteWithHiveSupportSuite]  // TestHiveSingleton conflict
+  // TODO: 4.x enableSuite[GlutenCommitFailureTestRelationSuite]  // TestHiveSingleton conflict
   enableSuite[GlutenDataSourceAnalysisSuite]
-  // TODO: 4.x enableSuite[GlutenDisableUnnecessaryBucketedScanWithHiveSupportSuite]  // 2 failures
-  // TODO: 4.x enableSuite[GlutenJsonHadoopFsRelationSuite]  // 2 failures
-  // TODO: 4.x enableSuite[GlutenParquetHadoopFsRelationSuite]  // 2 failures
-  // TODO: 4.x enableSuite[GlutenSimpleTextHadoopFsRelationSuite]  // 2 failures
+  // TODO: 4.x enableSuite[GlutenDisableUnnecessaryBucketedScanWithHiveSupportSuite]  // TestHiveSingleton conflict
+  // TODO: 4.x enableSuite[GlutenJsonHadoopFsRelationSuite]  // TestHiveSingleton conflict
+  // TODO: 4.x enableSuite[GlutenParquetHadoopFsRelationSuite]  // TestHiveSingleton conflict
+  // TODO: 4.x enableSuite[GlutenSimpleTextHadoopFsRelationSuite]  // TestHiveSingleton conflict
   // Generated suites for org.apache.spark.sql
   enableSuite[GlutenCacheManagerSuite]
   enableSuite[GlutenDataFrameShowSuite]
@@ -823,10 +823,10 @@ class VeloxTestSettings extends BackendTestSettings {
   enableSuite[GlutenDataFrameTransposeSuite]
   enableSuite[GlutenDefaultANSIValueSuite]
   enableSuite[GlutenDeprecatedDatasetAggregatorSuite]
-  // TODO: 4.x enableSuite[GlutenExplainSuite]  // 1 failure
+  enableSuite[GlutenExplainSuite]
   enableSuite[GlutenICUCollationsMapSuite]
   enableSuite[GlutenInlineTableParsingImprovementsSuite]
-  enableSuite[GlutenJoinHintSuite]
+  // TODO: 4.x enableSuite[GlutenJoinHintSuite]  // 1 failure
   enableSuite[GlutenLogQuerySuite]
     // Overridden
     .exclude("Query Spark logs with exception using SQL")
@@ -837,9 +837,9 @@ class VeloxTestSettings extends BackendTestSettings {
   enableSuite[GlutenRuntimeConfigSuite]
   enableSuite[GlutenSSBQuerySuite]
   enableSuite[GlutenSessionStateSuite]
-  // TODO: 4.x enableSuite[GlutenSetCommandSuite]  // 1 failure
-  enableSuite[GlutenSparkSessionBuilderSuite]
-  // TODO: 4.x enableSuite[GlutenSparkSessionJobTaggingAndCancellationSuite]  // 1 failure
+  enableSuite[GlutenSetCommandSuite]
+  // TODO: 4.x enableSuite[GlutenSparkSessionBuilderSuite]  // spark.test.home not set
+  enableSuite[GlutenSparkSessionJobTaggingAndCancellationSuite]
   enableSuite[GlutenTPCDSCollationQueryTestSuite]
   enableSuite[GlutenTPCDSModifiedPlanStabilitySuite]
   enableSuite[GlutenTPCDSModifiedPlanStabilityWithStatsSuite]
@@ -1091,7 +1091,7 @@ class VeloxTestSettings extends BackendTestSettings {
   enableSuite[GlutenFallbackSuite]
   enableSuite[GlutenHiveSQLQuerySuite]
   enableSuite[GlutenCollapseProjectExecTransformerSuite]
-  enableSuite[GlutenSparkSessionExtensionSuite]
+  // TODO: 4.x enableSuite[GlutenSparkSessionExtensionSuite]  // 1 failure
   enableSuite[GlutenGroupBasedDeleteFromTableSuite]
   enableSuite[GlutenDeltaBasedDeleteFromTableSuite]
   enableSuite[GlutenDataFrameToSchemaSuite]
@@ -1147,9 +1147,9 @@ class VeloxTestSettings extends BackendTestSettings {
     .exclude("remove redundant WindowGroupLimits")
   enableSuite[GlutenSQLCollectLimitExecSuite]
   // Generated suites for org.apache.spark.sql.execution.python
-  // TODO: 4.x enableSuite[GlutenPythonDataSourceSuite]  // 1 failure
-  // TODO: 4.x enableSuite[GlutenPythonUDFSuite]  // 1 failure
-  // TODO: 4.x enableSuite[GlutenPythonUDTFSuite]
+  enableSuite[GlutenPythonDataSourceSuite]
+  enableSuite[GlutenPythonUDFSuite]
+  enableSuite[GlutenPythonUDTFSuite]
   enableSuite[GlutenRowQueueSuite]
   enableSuite[GlutenBatchEvalPythonExecSuite]
     // Replaced with other tests that check for native operations
@@ -1184,53 +1184,53 @@ class VeloxTestSettings extends BackendTestSettings {
   enableSuite[GlutenSQLMetricsSuite]
   enableSuite[GlutenAcceptsLatestSeenOffsetSuite]
   enableSuite[GlutenCommitLogSuite]
-  // TODO: 4.x enableSuite[GlutenEventTimeWatermarkSuite]
+  enableSuite[GlutenEventTimeWatermarkSuite]
   enableSuite[GlutenFileStreamSinkV1Suite]
-  enableSuite[GlutenFileStreamSinkV2Suite]
+  // TODO: 4.x enableSuite[GlutenFileStreamSinkV2Suite]  // 1 failure
   enableSuite[GlutenFileStreamSourceStressTestSuite]
-  // TODO: 4.x enableSuite[GlutenFileStreamSourceSuite]
+  enableSuite[GlutenFileStreamSourceSuite]
   enableSuite[GlutenFileStreamStressSuite]
   enableSuite[GlutenFlatMapGroupsInPandasWithStateDistributionSuite]
   enableSuite[GlutenFlatMapGroupsInPandasWithStateSuite]
-  // TODO: 4.x enableSuite[GlutenFlatMapGroupsWithStateDistributionSuite]
-  // TODO: 4.x enableSuite[GlutenFlatMapGroupsWithStateSuite]
+  enableSuite[GlutenFlatMapGroupsWithStateDistributionSuite]
+  enableSuite[GlutenFlatMapGroupsWithStateSuite]
   enableSuite[GlutenFlatMapGroupsWithStateWithInitialStateSuite]
   enableSuite[GlutenGroupStateSuite]
   enableSuite[GlutenLongOffsetSuite]
   enableSuite[GlutenMemorySourceStressSuite]
-  enableSuite[GlutenMultiStatefulOperatorsSuite]
+  // TODO: 4.x enableSuite[GlutenMultiStatefulOperatorsSuite]  // 2 failures
   enableSuite[GlutenReportSinkMetricsSuite]
-  // TODO: 4.x enableSuite[GlutenRocksDBStateStoreFlatMapGroupsWithStateSuite]
-  // TODO: 4.x enableSuite[GlutenRocksDBStateStoreStreamingAggregationSuite]
-  // TODO: 4.x enableSuite[GlutenRocksDBStateStoreStreamingDeduplicationSuite]
-  // TODO: 4.x enableSuite[GlutenStreamSuite]
-  // TODO: 4.x enableSuite[GlutenStreamingAggregationDistributionSuite]
-  // TODO: 4.x enableSuite[GlutenStreamingAggregationSuite]
-  // TODO: 4.x enableSuite[GlutenStreamingDeduplicationDistributionSuite]
-  // TODO: 4.x enableSuite[GlutenStreamingDeduplicationSuite]
+  enableSuite[GlutenRocksDBStateStoreFlatMapGroupsWithStateSuite]
+  enableSuite[GlutenRocksDBStateStoreStreamingAggregationSuite]
+  enableSuite[GlutenRocksDBStateStoreStreamingDeduplicationSuite]
+  enableSuite[GlutenStreamSuite]
+  enableSuite[GlutenStreamingAggregationDistributionSuite]
+  enableSuite[GlutenStreamingAggregationSuite]
+  enableSuite[GlutenStreamingDeduplicationDistributionSuite]
+  enableSuite[GlutenStreamingDeduplicationSuite]
   enableSuite[GlutenStreamingDeduplicationWithinWatermarkSuite]
   enableSuite[GlutenStreamingFullOuterJoinSuite]
-  // TODO: 4.x enableSuite[GlutenStreamingInnerJoinSuite]
+  enableSuite[GlutenStreamingInnerJoinSuite]
   enableSuite[GlutenStreamingLeftSemiJoinSuite]
-  // TODO: 4.x enableSuite[GlutenStreamingOuterJoinSuite]
-  enableSuite[GlutenStreamingQueryHashPartitionVerifySuite]
+  enableSuite[GlutenStreamingOuterJoinSuite]
+  // TODO: 4.x enableSuite[GlutenStreamingQueryHashPartitionVerifySuite]  // RUN ABORTED
   enableSuite[GlutenStreamingQueryListenerSuite]
   enableSuite[GlutenStreamingQueryListenersConfSuite]
   enableSuite[GlutenStreamingQueryManagerSuite]
   enableSuite[GlutenStreamingQueryOptimizationCorrectnessSuite]
   enableSuite[GlutenStreamingQueryStatusAndProgressSuite]
   enableSuite[GlutenStreamingSelfUnionSuite]
-  // TODO: 4.x enableSuite[GlutenStreamingSessionWindowDistributionSuite]
+  enableSuite[GlutenStreamingSessionWindowDistributionSuite]
   enableSuite[GlutenStreamingSessionWindowSuite]
-  // TODO: 4.x enableSuite[GlutenStreamingStateStoreFormatCompatibilitySuite]
+  enableSuite[GlutenStreamingStateStoreFormatCompatibilitySuite]
   enableSuite[GlutenStreamingSymmetricHashJoinHelperSuite]
   enableSuite[GlutenTransformWithListStateSuite]
   enableSuite[GlutenTransformWithListStateTTLSuite]
   enableSuite[GlutenTransformWithMapStateSuite]
   enableSuite[GlutenTransformWithMapStateTTLSuite]
   enableSuite[GlutenTransformWithStateAvroSuite]
   enableSuite[GlutenTransformWithStateChainingSuite]
-  enableSuite[GlutenTransformWithStateClusterSuite]
+  // TODO: 4.x enableSuite[GlutenTransformWithStateClusterSuite]  // spark.test.home not set
   enableSuite[GlutenTransformWithStateInitialStateSuite]
   enableSuite[GlutenTransformWithStateUnsafeRowSuite]
   enableSuite[GlutenTransformWithStateValidationSuite]

gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenCacheManagerSuite.scala

@@ -16,4 +16,4 @@
  */
 package org.apache.spark.sql
 
-class GlutenCacheManagerSuite extends CacheManagerSuite with GlutenTestsCommonTrait {}
+class GlutenCacheManagerSuite extends CacheManagerSuite with GlutenSQLTestsBaseTrait {}

gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenExplainSuite.scala

@@ -16,4 +16,4 @@
  */
 package org.apache.spark.sql
 
-class GlutenExplainSuite extends ExplainSuite with GlutenTestsCommonTrait {}
+class GlutenExplainSuite extends ExplainSuite with GlutenSQLTestsTrait {}

gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenICUCollationsMapSuite.scala

@@ -16,4 +16,4 @@
  */
 package org.apache.spark.sql
 
-class GlutenICUCollationsMapSuite extends ICUCollationsMapSuite with GlutenTestsCommonTrait {}
+class GlutenICUCollationsMapSuite extends ICUCollationsMapSuite with GlutenTestsTrait {}

gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenJoinHintSuite.scala

@@ -16,4 +16,4 @@
  */
 package org.apache.spark.sql
 
-class GlutenJoinHintSuite extends JoinHintSuite with GlutenTestsCommonTrait {}
+class GlutenJoinHintSuite extends JoinHintSuite with GlutenSQLTestsBaseTrait {}

gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenRandomDataGeneratorSuite.scala

@@ -16,4 +16,4 @@
  */
 package org.apache.spark.sql
 
-class GlutenRandomDataGeneratorSuite extends RandomDataGeneratorSuite with GlutenTestsCommonTrait {}
+class GlutenRandomDataGeneratorSuite extends RandomDataGeneratorSuite with GlutenTestsTrait {}

gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenRowJsonSuite.scala

@@ -16,4 +16,4 @@
  */
 package org.apache.spark.sql
 
-class GlutenRowJsonSuite extends RowJsonSuite with GlutenTestsCommonTrait {}
+class GlutenRowJsonSuite extends RowJsonSuite with GlutenTestsTrait {}

gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenRowSuite.scala

@@ -16,4 +16,4 @@
  */
 package org.apache.spark.sql
 
-class GlutenRowSuite extends RowSuite with GlutenTestsCommonTrait {}
+class GlutenRowSuite extends RowSuite with GlutenSQLTestsBaseTrait {}

gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenRuntimeConfigSuite.scala

@@ -16,4 +16,4 @@
  */
 package org.apache.spark.sql
 
-class GlutenRuntimeConfigSuite extends RuntimeConfigSuite with GlutenTestsCommonTrait {}
+class GlutenRuntimeConfigSuite extends RuntimeConfigSuite with GlutenTestsTrait {}

gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSessionStateSuite.scala

@@ -16,4 +16,4 @@
  */
 package org.apache.spark.sql
 
-class GlutenSessionStateSuite extends SessionStateSuite with GlutenTestsCommonTrait {}
+class GlutenSessionStateSuite extends SessionStateSuite with GlutenTestsTrait {}

gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSparkSessionBuilderSuite.scala

@@ -16,4 +16,4 @@
  */
 package org.apache.spark.sql
 
-class GlutenSparkSessionBuilderSuite extends SparkSessionBuilderSuite with GlutenTestsCommonTrait {}
+class GlutenSparkSessionBuilderSuite extends SparkSessionBuilderSuite with GlutenTestsTrait {}

gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSparkSessionExtensionSuite.scala

@@ -18,9 +18,7 @@ package org.apache.spark.sql
 
 import org.apache.gluten.config.GlutenConfig
 
-class GlutenSparkSessionExtensionSuite
-  extends SparkSessionExtensionSuite
-  with GlutenTestsCommonTrait {
+class GlutenSparkSessionExtensionSuite extends SparkSessionExtensionSuite with GlutenTestsTrait {
 
   testGluten("customColumnarOp") {
     val extensions = DummyFilterColmnarHelper.create {

gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenSparkSessionJobTaggingAndCancellationSuite.scala

@@ -18,4 +18,4 @@ package org.apache.spark.sql
 
 class GlutenSparkSessionJobTaggingAndCancellationSuite
   extends SparkSessionJobTaggingAndCancellationSuite
-  with GlutenTestsCommonTrait {}
+  with GlutenTestsTrait {}

gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenUDTRegistrationSuite.scala

@@ -16,4 +16,4 @@
  */
 package org.apache.spark.sql
 
-class GlutenUDTRegistrationSuite extends UDTRegistrationSuite with GlutenTestsCommonTrait {}
+class GlutenUDTRegistrationSuite extends UDTRegistrationSuite with GlutenTestsTrait {}

gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenUnsafeRowSuite.scala

@@ -16,4 +16,4 @@
  */
 package org.apache.spark.sql
 
-class GlutenUnsafeRowSuite extends UnsafeRowSuite with GlutenTestsCommonTrait {}
+class GlutenUnsafeRowSuite extends UnsafeRowSuite with GlutenTestsTrait {}

gluten-ut/spark40/src/test/scala/org/apache/spark/sql/GlutenVariantWriteShreddingSuite.scala

@@ -18,4 +18,4 @@ package org.apache.spark.sql
 
 class GlutenVariantWriteShreddingSuite
   extends VariantWriteShreddingSuite
-  with GlutenTestsCommonTrait {}
+  with GlutenSQLTestsBaseTrait {}

gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenAttributeResolutionSuite.scala

@@ -16,6 +16,6 @@
  */
 package org.apache.spark.sql.catalyst.expressions
 
-import org.apache.spark.sql.GlutenTestsCommonTrait
+import org.apache.spark.sql.GlutenTestsTrait
 
-class GlutenAttributeResolutionSuite extends AttributeResolutionSuite with GlutenTestsCommonTrait {}
+class GlutenAttributeResolutionSuite extends AttributeResolutionSuite with GlutenTestsTrait {}

gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenAttributeSetSuite.scala

@@ -16,6 +16,6 @@
  */
 package org.apache.spark.sql.catalyst.expressions
 
-import org.apache.spark.sql.GlutenTestsCommonTrait
+import org.apache.spark.sql.GlutenTestsTrait
 
-class GlutenAttributeSetSuite extends AttributeSetSuite with GlutenTestsCommonTrait {}
+class GlutenAttributeSetSuite extends AttributeSetSuite with GlutenTestsTrait {}

gluten-ut/spark40/src/test/scala/org/apache/spark/sql/catalyst/expressions/GlutenBitmapExpressionUtilsSuite.scala

@@ -16,8 +16,6 @@
  */
 package org.apache.spark.sql.catalyst.expressions
 
-import org.apache.spark.sql.GlutenTestsCommonTrait
+import org.apache.spark.sql.GlutenTestsTrait
 
-class GlutenBitmapExpressionUtilsSuite
-  extends BitmapExpressionUtilsSuite
-  with GlutenTestsCommonTrait {}
+class GlutenBitmapExpressionUtilsSuite extends BitmapExpressionUtilsSuite with GlutenTestsTrait {}