This is an automated email from the ASF dual-hosted git repository.
zhengruifeng pushed a commit to branch branch-4.x
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-4.x by this push:
new 006620c56a26 [SPARK-56841][SQL][TESTS] Drop redundant
BeforeAndAfterEach and SharedSparkSession mixins
006620c56a26 is described below
commit 006620c56a2622ac0413728cb4ee8d033a231c4a
Author: Ruifeng Zheng <[email protected]>
AuthorDate: Thu May 14 08:49:50 2026 +0800
[SPARK-56841][SQL][TESTS] Drop redundant BeforeAndAfterEach and
SharedSparkSession mixins
### What changes were proposed in this pull request?
Two related cleanups in `sql/core` test suites:
1. **Drop redundant `with BeforeAndAfterEach`** (5 files).
`SharedSparkSession` transitively mixes in `BeforeAndAfterEach` via
`SharedSparkSessionBase`, so listing it again is redundant:
- `StreamingSourceEvolutionSuite` (the explicit mixin sat after
`StreamTest`, which already chains to `SharedSparkSession`)
- `RocksDBTimestampEncoderOperationsSuite`
- `ResolveChangelogTableNetChangesTestsBase` (trait)
- `ResolveChangelogTablePostProcessingSuite`
- `ResolveChangelogTableStreamingPostProcessingSuite`
2. **Drop redundant `with SharedSparkSession` after `StreamTest`** (5
files). `StreamTest extends SharedSparkSession with TimeLimits`, so listing
`SharedSparkSession` again adds nothing:
- `ForeachWriterSuite`
- `FileStreamSourceTest` (the abstract base used by
`FileStreamSourceSuite` / `FileStreamSourceStressTestSuite`)
- `TextSocketStreamSuite`
- `OperatorStateMetadataSuite`
- `RocksDBCheckpointFailureInjectionSuite`
Unused imports of `org.scalatest.BeforeAndAfterEach` and
`org.apache.spark.sql.test.SharedSparkSession` are removed alongside.
Suites that mix in the older `org.scalatest.BeforeAndAfter` (singular, e.g.
`ForeachWriterSuite`, `SaveLoadSuite`) keep it - that is a distinct trait with
its own `after { ... }` block syntax, not a redundant alias for
`BeforeAndAfterEach`. `SaveLoadSuite` is intentionally untouched: its base
`DataSourceTest` extends `QueryTest` (not `SharedSparkSession`), so the
explicit `with SharedSparkSession` there is load-bearing.
### Why are the changes needed?
`SharedSparkSession` already extends `QueryTest with
SharedSparkSessionBase`, and `SharedSparkSessionBase` already mixes in
`BeforeAndAfterEach`. `StreamTest` already extends `SharedSparkSession`.
Repeating these in extends clauses adds noise and gives the false impression
they are independently required, which makes it easy for the pattern to spread
to new suites.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Existing tests; `build/sbt sql/Test/compile` passes cleanly on the affected
sources.
### Was this patch authored or co-authored using generative AI tooling?
Generated-by: Claude Code
Closes #55819 from zhengruifeng/cleanup-beforeandaftereach-mixin.
Authored-by: Ruifeng Zheng <[email protected]>
Signed-off-by: Ruifeng Zheng <[email protected]>
(cherry picked from commit 029cdd4fe4f56eb54fd65e27a96e2a341c6795b2)
Signed-off-by: Ruifeng Zheng <[email protected]>
---
.../spark/sql/connector/ResolveChangelogTableNetChangesSuite.scala | 6 +-----
.../sql/connector/ResolveChangelogTablePostProcessingSuite.scala | 6 +-----
.../ResolveChangelogTableStreamingPostProcessingSuite.scala | 6 +-----
.../spark/sql/execution/streaming/sources/ForeachWriterSuite.scala | 3 +--
.../sql/execution/streaming/sources/TextSocketStreamSuite.scala | 3 +--
.../sql/execution/streaming/state/OperatorStateMetadataSuite.scala | 3 +--
.../streaming/state/RocksDBCheckpointFailureInjectionSuite.scala | 4 +---
.../streaming/state/RocksDBTimestampEncoderOperationsSuite.scala | 4 +---
.../org/apache/spark/sql/streaming/FileStreamSourceSuite.scala | 4 +---
.../spark/sql/streaming/test/StreamingSourceEvolutionSuite.scala | 4 ++--
10 files changed, 11 insertions(+), 32 deletions(-)
diff --git
a/sql/core/src/test/scala/org/apache/spark/sql/connector/ResolveChangelogTableNetChangesSuite.scala
b/sql/core/src/test/scala/org/apache/spark/sql/connector/ResolveChangelogTableNetChangesSuite.scala
index 33e97de95758..bd56fe80b5f8 100644
---
a/sql/core/src/test/scala/org/apache/spark/sql/connector/ResolveChangelogTableNetChangesSuite.scala
+++
b/sql/core/src/test/scala/org/apache/spark/sql/connector/ResolveChangelogTableNetChangesSuite.scala
@@ -19,8 +19,6 @@ package org.apache.spark.sql.connector
import java.util.Collections
-import org.scalatest.BeforeAndAfterEach
-
import org.apache.spark.sql.{DataFrame, Row}
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.connector.catalog.{
@@ -54,9 +52,7 @@ import org.apache.spark.unsafe.types.UTF8String
* netChanges sees them. Output assertions stay identical because both paths
produce
* the same `_change_type` labels at the netChanges input.
*/
-trait ResolveChangelogTableNetChangesTestsBase
- extends SharedSparkSession
- with BeforeAndAfterEach {
+trait ResolveChangelogTableNetChangesTestsBase extends SharedSparkSession {
/**
* Value of the user-facing CDC option `computeUpdates` that this test run
diff --git
a/sql/core/src/test/scala/org/apache/spark/sql/connector/ResolveChangelogTablePostProcessingSuite.scala
b/sql/core/src/test/scala/org/apache/spark/sql/connector/ResolveChangelogTablePostProcessingSuite.scala
index e0f426abe5d2..36bd86eeab47 100644
---
a/sql/core/src/test/scala/org/apache/spark/sql/connector/ResolveChangelogTablePostProcessingSuite.scala
+++
b/sql/core/src/test/scala/org/apache/spark/sql/connector/ResolveChangelogTablePostProcessingSuite.scala
@@ -19,8 +19,6 @@ package org.apache.spark.sql.connector
import java.util.Collections
-import org.scalatest.BeforeAndAfterEach
-
import org.apache.spark.SparkRuntimeException
import org.apache.spark.sql.{AnalysisException, Row}
import org.apache.spark.sql.catalyst.InternalRow
@@ -47,9 +45,7 @@ import org.apache.spark.unsafe.types.UTF8String
* paths (carry-over removal, update detection) and then verifies that Spark's
analyzer rule
* correctly transforms the plan and produces the expected output.
*/
-class ResolveChangelogTablePostProcessingSuite
- extends SharedSparkSession
- with BeforeAndAfterEach {
+class ResolveChangelogTablePostProcessingSuite extends SharedSparkSession {
private val catalogName = "cdc_test_catalog"
private val testTableName = "events"
diff --git
a/sql/core/src/test/scala/org/apache/spark/sql/connector/ResolveChangelogTableStreamingPostProcessingSuite.scala
b/sql/core/src/test/scala/org/apache/spark/sql/connector/ResolveChangelogTableStreamingPostProcessingSuite.scala
index 7b72568c460a..51b17eee69db 100644
---
a/sql/core/src/test/scala/org/apache/spark/sql/connector/ResolveChangelogTableStreamingPostProcessingSuite.scala
+++
b/sql/core/src/test/scala/org/apache/spark/sql/connector/ResolveChangelogTableStreamingPostProcessingSuite.scala
@@ -19,8 +19,6 @@ package org.apache.spark.sql.connector
import java.util.Collections
-import org.scalatest.BeforeAndAfterEach
-
import org.apache.spark.sql.DataFrame
import org.apache.spark.sql.catalyst.expressions.Inline
import org.apache.spark.sql.catalyst.plans.logical.{
@@ -46,9 +44,7 @@ import org.apache.spark.sql.types.LongType
* -> [Project (update relabel)]
* -> Project (drop helper columns)
*/
-class ResolveChangelogTableStreamingPostProcessingSuite
- extends SharedSparkSession
- with BeforeAndAfterEach {
+class ResolveChangelogTableStreamingPostProcessingSuite extends
SharedSparkSession {
private val catalogName = "cdc_streaming_pp"
private val testTableName = "events"
diff --git
a/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/sources/ForeachWriterSuite.scala
b/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/sources/ForeachWriterSuite.scala
index 8c657c2e0716..a33be8fc9415 100644
---
a/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/sources/ForeachWriterSuite.scala
+++
b/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/sources/ForeachWriterSuite.scala
@@ -28,10 +28,9 @@ import org.apache.spark.sql.ForeachWriter
import org.apache.spark.sql.execution.streaming.runtime.MemoryStream
import org.apache.spark.sql.functions.{count, timestamp_seconds, window}
import org.apache.spark.sql.streaming.{OutputMode, StreamingQueryException,
StreamTest}
-import org.apache.spark.sql.test.SharedSparkSession
import org.apache.spark.util.ArrayImplicits._
-class ForeachWriterSuite extends StreamTest with SharedSparkSession with
BeforeAndAfter {
+class ForeachWriterSuite extends StreamTest with BeforeAndAfter {
import testImplicits._
diff --git
a/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/sources/TextSocketStreamSuite.scala
b/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/sources/TextSocketStreamSuite.scala
index 8b8ae57c82c4..31b904c2e481 100644
---
a/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/sources/TextSocketStreamSuite.scala
+++
b/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/sources/TextSocketStreamSuite.scala
@@ -36,11 +36,10 @@ import
org.apache.spark.sql.execution.datasources.v2.StreamingDataSourceV2ScanRe
import org.apache.spark.sql.execution.streaming.continuous._
import
org.apache.spark.sql.execution.streaming.runtime.{ContinuousRecordPartitionOffset,
LongOffset, StreamExecution}
import org.apache.spark.sql.streaming.{StreamingQueryException, StreamTest}
-import org.apache.spark.sql.test.SharedSparkSession
import org.apache.spark.sql.types._
import org.apache.spark.sql.util.CaseInsensitiveStringMap
-class TextSocketStreamSuite extends StreamTest with SharedSparkSession {
+class TextSocketStreamSuite extends StreamTest {
override def afterEach(): Unit = {
sqlContext.streams.active.foreach(_.stop())
diff --git
a/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/state/OperatorStateMetadataSuite.scala
b/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/state/OperatorStateMetadataSuite.scala
index 01b9ae4dc82d..5fa8d86c21af 100644
---
a/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/state/OperatorStateMetadataSuite.scala
+++
b/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/state/OperatorStateMetadataSuite.scala
@@ -29,9 +29,8 @@ import org.apache.spark.sql.functions._
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.streaming.{OutputMode,
RunningCountStatefulProcessor, StreamTest, TimeMode}
import org.apache.spark.sql.streaming.OutputMode.{Complete, Update}
-import org.apache.spark.sql.test.SharedSparkSession
-class OperatorStateMetadataSuite extends StreamTest with SharedSparkSession {
+class OperatorStateMetadataSuite extends StreamTest {
import testImplicits._
private lazy val hadoopConf = spark.sessionState.newHadoopConf()
diff --git
a/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/state/RocksDBCheckpointFailureInjectionSuite.scala
b/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/state/RocksDBCheckpointFailureInjectionSuite.scala
index b0220c339626..a469ab36e0ab 100644
---
a/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/state/RocksDBCheckpointFailureInjectionSuite.scala
+++
b/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/state/RocksDBCheckpointFailureInjectionSuite.scala
@@ -30,15 +30,13 @@ import org.apache.spark.sql.internal.SQLConf
import
org.apache.spark.sql.internal.SQLConf.STREAMING_CHECKPOINT_FILE_MANAGER_CLASS
import org.apache.spark.sql.streaming._
import org.apache.spark.sql.streaming.OutputMode.Update
-import org.apache.spark.sql.test.SharedSparkSession
import org.apache.spark.tags.SlowSQLTest
import org.apache.spark.util.Utils
@SlowSQLTest
/** Test suite to inject some failures in RocksDB checkpoint */
-class RocksDBCheckpointFailureInjectionSuite extends StreamTest
- with SharedSparkSession {
+class RocksDBCheckpointFailureInjectionSuite extends StreamTest {
private val fileManagerClassName =
classOf[FailureInjectionCheckpointFileManager].getName
diff --git
a/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/state/RocksDBTimestampEncoderOperationsSuite.scala
b/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/state/RocksDBTimestampEncoderOperationsSuite.scala
index 6823cf7db406..4179b0fafee5 100644
---
a/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/state/RocksDBTimestampEncoderOperationsSuite.scala
+++
b/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/state/RocksDBTimestampEncoderOperationsSuite.scala
@@ -22,7 +22,6 @@ import java.util.UUID
import scala.util.Random
import org.apache.hadoop.conf.Configuration
-import org.scalatest.BeforeAndAfterEach
import org.scalatest.matchers.should.Matchers
import org.apache.spark.sql.catalyst.InternalRow
@@ -40,8 +39,7 @@ import org.apache.spark.util.Utils
* [[TimestampAsPrefixKeyStateEncoder]] and
[[TimestampAsPostfixKeyStateEncoder]].
*/
@ExtendedSQLTest
-class RocksDBTimestampEncoderOperationsSuite extends SharedSparkSession
- with BeforeAndAfterEach with Matchers {
+class RocksDBTimestampEncoderOperationsSuite extends SharedSparkSession with
Matchers {
// Test schemas
private val keySchema = StructType(Seq(
diff --git
a/sql/core/src/test/scala/org/apache/spark/sql/streaming/FileStreamSourceSuite.scala
b/sql/core/src/test/scala/org/apache/spark/sql/streaming/FileStreamSourceSuite.scala
index 83e6772d69dc..4955a32c49b1 100644
---
a/sql/core/src/test/scala/org/apache/spark/sql/streaming/FileStreamSourceSuite.scala
+++
b/sql/core/src/test/scala/org/apache/spark/sql/streaming/FileStreamSourceSuite.scala
@@ -45,14 +45,12 @@ import
org.apache.spark.sql.execution.streaming.sinks.{FileStreamSink, FileStrea
import org.apache.spark.sql.execution.streaming.sources.MemorySink
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.streaming.util.StreamManualClock
-import org.apache.spark.sql.test.SharedSparkSession
import org.apache.spark.sql.types._
import org.apache.spark.tags.SlowSQLTest
import org.apache.spark.util.ArrayImplicits._
import org.apache.spark.util.Utils
-abstract class FileStreamSourceTest
- extends StreamTest with SharedSparkSession with PrivateMethodTester {
+abstract class FileStreamSourceTest extends StreamTest with
PrivateMethodTester {
import testImplicits._
diff --git
a/sql/core/src/test/scala/org/apache/spark/sql/streaming/test/StreamingSourceEvolutionSuite.scala
b/sql/core/src/test/scala/org/apache/spark/sql/streaming/test/StreamingSourceEvolutionSuite.scala
index ec919f1f1242..0ee219171a45 100644
---
a/sql/core/src/test/scala/org/apache/spark/sql/streaming/test/StreamingSourceEvolutionSuite.scala
+++
b/sql/core/src/test/scala/org/apache/spark/sql/streaming/test/StreamingSourceEvolutionSuite.scala
@@ -22,7 +22,7 @@ import scala.concurrent.duration._
import org.apache.hadoop.fs.Path
import org.mockito.ArgumentMatchers.{any, eq => meq}
import org.mockito.Mockito._
-import org.scalatest.{BeforeAndAfterEach, Tag}
+import org.scalatest.Tag
import org.apache.spark.sql._
import org.apache.spark.sql.internal.SQLConf
@@ -34,7 +34,7 @@ import org.apache.spark.util.Utils
* Test suite for streaming source naming and validation.
* Tests cover the naming API, validation rules, and resolution pipeline.
*/
-class StreamingSourceEvolutionSuite extends StreamTest with BeforeAndAfterEach
{
+class StreamingSourceEvolutionSuite extends StreamTest {
private def newMetadataDir =
Utils.createTempDir(namePrefix = "streaming.metadata").getCanonicalPath
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
