You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by hv...@apache.org on 2023/02/25 18:03:16 UTC
[spark] branch branch-3.4 updated: [SPARK-42575][CONNECT][SCALA] Make all client tests to extend from ConnectFunSuite
This is an automated email from the ASF dual-hosted git repository.
hvanhovell pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.4 by this push:
new 4a6f0bf23f6 [SPARK-42575][CONNECT][SCALA] Make all client tests to extend from ConnectFunSuite
4a6f0bf23f6 is described below
commit 4a6f0bf23f6a56fe95aab24e4140b04eabe377b2
Author: Zhen Li <zh...@users.noreply.github.com>
AuthorDate: Sat Feb 25 14:02:49 2023 -0400
[SPARK-42575][CONNECT][SCALA] Make all client tests to extend from ConnectFunSuite
### What changes were proposed in this pull request?
Make all client tests to extend from ConnectFunSuite to avoid `// scalastyle:ignore funsuite` when extending directly from `AnyFunSuite`
### Why are the changes needed?
Simple dev work.
### Does this PR introduce _any_ user-facing change?
No. test only.
### How was this patch tested?
n/a
Closes #40169 from zhenlineo/life-savor.
Authored-by: Zhen Li <zh...@users.noreply.github.com>
Signed-off-by: Herman van Hovell <he...@databricks.com>
(cherry picked from commit c2633904bde9c89501a3ad3be284860a08f33fe7)
Signed-off-by: Herman van Hovell <he...@databricks.com>
---
.../org/apache/spark/sql/ColumnTestSuite.scala | 3 +--
.../scala/org/apache/spark/sql/DatasetSuite.scala | 6 ++----
.../org/apache/spark/sql/FunctionTestSuite.scala | 3 +--
.../apache/spark/sql/PlanGenerationTestSuite.scala | 2 +-
.../spark/sql/UserDefinedFunctionSuite.scala | 6 ++----
.../sql/connect/client/CompatibilitySuite.scala | 5 +++--
.../connect/client/SparkConnectClientSuite.scala | 6 ++----
.../sql/connect/client/util/ConnectFunSuite.scala | 24 ++++++++++++++++++++++
.../connect/client/util/RemoteSparkSession.scala | 4 +---
9 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/ColumnTestSuite.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/ColumnTestSuite.scala
index d12f0747b86..1b4926ac3d0 100644
--- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/ColumnTestSuite.scala
+++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/ColumnTestSuite.scala
@@ -20,9 +20,8 @@ import java.io.ByteArrayOutputStream
import scala.collection.JavaConverters._
-import org.scalatest.funsuite.{AnyFunSuite => ConnectFunSuite} // scalastyle:ignore funsuite
-
import org.apache.spark.sql.{functions => fn}
+import org.apache.spark.sql.connect.client.util.ConnectFunSuite
import org.apache.spark.sql.types.StringType
/**
diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/DatasetSuite.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/DatasetSuite.scala
index be69959beac..9c07c5abe3c 100644
--- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/DatasetSuite.scala
+++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/DatasetSuite.scala
@@ -22,19 +22,17 @@ import java.util.concurrent.atomic.AtomicLong
import io.grpc.Server
import io.grpc.inprocess.{InProcessChannelBuilder, InProcessServerBuilder}
import org.scalatest.BeforeAndAfterEach
-import org.scalatest.funsuite.AnyFunSuite // scalastyle:ignore funsuite
import org.apache.spark.connect.proto
import org.apache.spark.sql.connect.client.{DummySparkConnectService, SparkConnectClient}
+import org.apache.spark.sql.connect.client.util.ConnectFunSuite
import org.apache.spark.sql.functions._
// Add sample tests.
// - sample fraction: simple.sample(0.1)
// - sample withReplacement_fraction: simple.sample(withReplacement = true, 0.11)
// Add tests for exceptions thrown
-class DatasetSuite
- extends AnyFunSuite // scalastyle:ignore funsuite
- with BeforeAndAfterEach {
+class DatasetSuite extends ConnectFunSuite with BeforeAndAfterEach {
private var server: Server = _
private var service: DummySparkConnectService = _
diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/FunctionTestSuite.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/FunctionTestSuite.scala
index b9fba1eaa8c..9e02eb13078 100644
--- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/FunctionTestSuite.scala
+++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/FunctionTestSuite.scala
@@ -18,8 +18,7 @@ package org.apache.spark.sql
import java.util.Collections
-import org.scalatest.funsuite.{AnyFunSuite => ConnectFunSuite} // scalastyle:ignore funsuite
-
+import org.apache.spark.sql.connect.client.util.ConnectFunSuite
import org.apache.spark.sql.functions._
import org.apache.spark.sql.types.{DataType, StructType}
diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/PlanGenerationTestSuite.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/PlanGenerationTestSuite.scala
index 465d2091ca2..dc8097f44e5 100644
--- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/PlanGenerationTestSuite.scala
+++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/PlanGenerationTestSuite.scala
@@ -26,12 +26,12 @@ import scala.util.{Failure, Success, Try}
import com.google.protobuf.util.JsonFormat
import io.grpc.inprocess.InProcessChannelBuilder
import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach}
-import org.scalatest.funsuite.{AnyFunSuite => ConnectFunSuite} // scalastyle:ignore funsuite
import org.apache.spark.connect.proto
import org.apache.spark.internal.Logging
import org.apache.spark.sql.{functions => fn}
import org.apache.spark.sql.connect.client.SparkConnectClient
+import org.apache.spark.sql.connect.client.util.ConnectFunSuite
import org.apache.spark.sql.expressions.Window
import org.apache.spark.sql.functions.lit
import org.apache.spark.sql.types._
diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/UserDefinedFunctionSuite.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/UserDefinedFunctionSuite.scala
index b0d92a223c6..1c4ee217737 100644
--- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/UserDefinedFunctionSuite.scala
+++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/UserDefinedFunctionSuite.scala
@@ -19,16 +19,14 @@ package org.apache.spark.sql
import scala.reflect.runtime.universe.typeTag
import org.scalatest.BeforeAndAfterEach
-import org.scalatest.funsuite.AnyFunSuite // scalastyle:ignore funsuite
import org.apache.spark.sql.catalyst.ScalaReflection
+import org.apache.spark.sql.connect.client.util.ConnectFunSuite
import org.apache.spark.sql.connect.common.UdfPacket
import org.apache.spark.sql.functions.udf
import org.apache.spark.util.Utils
-class UserDefinedFunctionSuite
- extends AnyFunSuite // scalastyle:ignore funsuite
- with BeforeAndAfterEach {
+class UserDefinedFunctionSuite extends ConnectFunSuite with BeforeAndAfterEach {
test("udf and encoder serialization") {
def func(x: Int): Int = x + 1
diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/CompatibilitySuite.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/CompatibilitySuite.scala
index d6d21773732..ad91accd5da 100644
--- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/CompatibilitySuite.scala
+++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/CompatibilitySuite.scala
@@ -22,7 +22,8 @@ import java.util.regex.Pattern
import com.typesafe.tools.mima.core._
import com.typesafe.tools.mima.lib.MiMaLib
-import org.scalatest.funsuite.AnyFunSuite // scalastyle:ignore funsuite
+
+import org.apache.spark.sql.connect.client.util.ConnectFunSuite
import org.apache.spark.sql.connect.client.util.IntegrationTestUtils._
/**
@@ -48,7 +49,7 @@ import org.apache.spark.sql.connect.client.util.IntegrationTestUtils._
* 1. Run the test again: `sbt "testOnly
* org.apache.spark.sql.connect.client.CompatibilitySuite"`
*/
-class CompatibilitySuite extends AnyFunSuite { // scalastyle:ignore funsuite
+class CompatibilitySuite extends ConnectFunSuite {
private lazy val clientJar: File =
findJar(
diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/SparkConnectClientSuite.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/SparkConnectClientSuite.scala
index 8e827007950..40afae83009 100644
--- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/SparkConnectClientSuite.scala
+++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/SparkConnectClientSuite.scala
@@ -22,16 +22,14 @@ import io.grpc.{Server, StatusRuntimeException}
import io.grpc.netty.NettyServerBuilder
import io.grpc.stub.StreamObserver
import org.scalatest.BeforeAndAfterEach
-import org.scalatest.funsuite.AnyFunSuite // scalastyle:ignore funsuite
import org.apache.spark.connect.proto
import org.apache.spark.connect.proto.{AnalyzePlanRequest, AnalyzePlanResponse, ExecutePlanRequest, ExecutePlanResponse, SparkConnectServiceGrpc}
import org.apache.spark.sql.SparkSession
+import org.apache.spark.sql.connect.client.util.ConnectFunSuite
import org.apache.spark.sql.connect.common.config.ConnectCommon
-class SparkConnectClientSuite
- extends AnyFunSuite // scalastyle:ignore funsuite
- with BeforeAndAfterEach {
+class SparkConnectClientSuite extends ConnectFunSuite with BeforeAndAfterEach {
private var client: SparkConnectClient = _
private var service: DummySparkConnectService = _
diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/util/ConnectFunSuite.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/util/ConnectFunSuite.scala
new file mode 100644
index 00000000000..5100fa7d229
--- /dev/null
+++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/util/ConnectFunSuite.scala
@@ -0,0 +1,24 @@
+/*
+ * 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 org.apache.spark.sql.connect.client.util
+
+import org.scalatest.funsuite.AnyFunSuite // scalastyle:ignore funsuite
+
+/**
+ * The basic testsuite the client tests should extend from.
+ */
+trait ConnectFunSuite extends AnyFunSuite {} // scalastyle:ignore funsuite
diff --git a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/util/RemoteSparkSession.scala b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/util/RemoteSparkSession.scala
index 50e3a51f759..2d8d9b02d4f 100644
--- a/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/util/RemoteSparkSession.scala
+++ b/connector/connect/client/jvm/src/test/scala/org/apache/spark/sql/connect/client/util/RemoteSparkSession.scala
@@ -109,9 +109,7 @@ object SparkConnectServerUtils {
}
}
-trait RemoteSparkSession
- extends org.scalatest.funsuite.AnyFunSuite // scalastyle:ignore funsuite
- with BeforeAndAfterAll {
+trait RemoteSparkSession extends ConnectFunSuite with BeforeAndAfterAll {
import SparkConnectServerUtils._
var spark: SparkSession = _
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org