Skip to content

Commit 2fa1a63

Browse files
committed
[SPARK-18296][SQL] Use consistent naming for expression test suites
## What changes were proposed in this pull request? We have an undocumented naming convention to call expression unit tests ExpressionsSuite, and the end-to-end tests FunctionsSuite. It'd be great to make all test suites consistent with this naming convention. ## How was this patch tested? This is a test-only naming change. Author: Reynold Xin <rxin@databricks.com> Closes #15793 from rxin/SPARK-18296. (cherry picked from commit 9db06c4) Signed-off-by: Reynold Xin <rxin@databricks.com>
1 parent 9ebd5e5 commit 2fa1a63

File tree

6 files changed

+8
-9
lines changed

6 files changed

+8
-9
lines changed

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/BitwiseFunctionsSuite.scala renamed to sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/BitwiseExpressionsSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import org.apache.spark.SparkFunSuite
2121
import org.apache.spark.sql.types._
2222

2323

24-
class BitwiseFunctionsSuite extends SparkFunSuite with ExpressionEvalHelper {
24+
class BitwiseExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
2525

2626
import IntegralLiteralTestUtils._
2727

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CollectionFunctionsSuite.scala renamed to sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CollectionExpressionsSuite.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ package org.apache.spark.sql.catalyst.expressions
2020
import org.apache.spark.SparkFunSuite
2121
import org.apache.spark.sql.types._
2222

23-
24-
class CollectionFunctionsSuite extends SparkFunSuite with ExpressionEvalHelper {
23+
class CollectionExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
2524

2625
test("Array and Map Size") {
2726
val a0 = Literal.create(Seq(1, 2, 3), ArrayType(IntegerType))

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/MathFunctionsSuite.scala renamed to sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/MathExpressionsSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import org.apache.spark.sql.catalyst.optimizer.SimpleTestOptimizer
2929
import org.apache.spark.sql.catalyst.plans.logical.{OneRowRelation, Project}
3030
import org.apache.spark.sql.types._
3131

32-
class MathFunctionsSuite extends SparkFunSuite with ExpressionEvalHelper {
32+
class MathExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
3333

3434
import IntegralLiteralTestUtils._
3535

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/MiscFunctionsSuite.scala renamed to sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/MiscExpressionsSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package org.apache.spark.sql.catalyst.expressions
2020
import org.apache.spark.SparkFunSuite
2121
import org.apache.spark.sql.types._
2222

23-
class MiscFunctionsSuite extends SparkFunSuite with ExpressionEvalHelper {
23+
class MiscExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
2424

2525
test("assert_true") {
2626
intercept[RuntimeException] {

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/NullFunctionsSuite.scala renamed to sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/NullExpressionsSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import org.apache.spark.sql.catalyst.expressions.objects.AssertNotNull
2323
import org.apache.spark.sql.catalyst.plans.logical.{LocalRelation, Project}
2424
import org.apache.spark.sql.types._
2525

26-
class NullFunctionsSuite extends SparkFunSuite with ExpressionEvalHelper {
26+
class NullExpressionsSuite extends SparkFunSuite with ExpressionEvalHelper {
2727

2828
def testAllTypes(testFunc: (Any, DataType) => Unit): Unit = {
2929
testFunc(false, BooleanType)

sql/core/src/test/scala/org/apache/spark/sql/MathExpressionsSuite.scala renamed to sql/core/src/test/scala/org/apache/spark/sql/MathFunctionsSuite.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ import org.apache.spark.sql.functions._
2323
import org.apache.spark.sql.functions.{log => logarithm}
2424
import org.apache.spark.sql.test.SharedSQLContext
2525

26-
private object MathExpressionsTestData {
26+
private object MathFunctionsTestData {
2727
case class DoubleData(a: java.lang.Double, b: java.lang.Double)
2828
case class NullDoubles(a: java.lang.Double)
2929
}
3030

31-
class MathExpressionsSuite extends QueryTest with SharedSQLContext {
32-
import MathExpressionsTestData._
31+
class MathFunctionsSuite extends QueryTest with SharedSQLContext {
32+
import MathFunctionsTestData._
3333
import testImplicits._
3434

3535
private lazy val doubleData = (1 to 10).map(i => DoubleData(i * 0.2 - 1, i * -0.2 + 1)).toDF()

0 commit comments

Comments
 (0)