You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2022/11/28 11:55:41 UTC
[spark] branch master updated: [SPARK-41293][SQL][TESTS] Code cleanup for `assertXXX` methods in `ExpressionTypeCheckingSuite`
This is an automated email from the ASF dual-hosted git repository.
maxgekk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new c3de4ca1477 [SPARK-41293][SQL][TESTS] Code cleanup for `assertXXX` methods in `ExpressionTypeCheckingSuite`
c3de4ca1477 is described below
commit c3de4ca14772fa6dff703b662a561a9e65e23d9e
Author: yangjie01 <ya...@baidu.com>
AuthorDate: Mon Nov 28 14:55:28 2022 +0300
[SPARK-41293][SQL][TESTS] Code cleanup for `assertXXX` methods in `ExpressionTypeCheckingSuite`
### What changes were proposed in this pull request?
This pr do some code clean up for `assertXXX` method in `ExpressionTypeCheckingSuite`:
1. Reuse `analysisException` instead of duplicate `intercept[AnalysisException](assertSuccess(expr))` in `assertErrorForXXX` methods.
2. remove `assertError` method that is no longer used
3. Change `assertErrorForXXX` methods access scope to `private` due to they are only used in `ExpressionTypeCheckingSuite`.
### Why are the changes needed?
Code clean up.
### Does this PR introduce _any_ user-facing change?
No, just for test
### How was this patch tested?
Pass GitHub Actions
Closes #38820 from LuciferYang/SPARK-41293.
Authored-by: yangjie01 <ya...@baidu.com>
Signed-off-by: Max Gekk <ma...@gmail.com>
---
.../analysis/ExpressionTypeCheckingSuite.scala | 41 ++++++----------------
1 file changed, 11 insertions(+), 30 deletions(-)
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/ExpressionTypeCheckingSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/ExpressionTypeCheckingSuite.scala
index d406ec8f74a..6202d1e367a 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/ExpressionTypeCheckingSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/ExpressionTypeCheckingSuite.scala
@@ -44,65 +44,46 @@ class ExpressionTypeCheckingSuite extends SparkFunSuite with SQLHelper with Quer
intercept[AnalysisException](assertSuccess(expr))
}
- def assertError(expr: Expression, errorMessage: String): Unit = {
- val e = intercept[AnalysisException] {
- assertSuccess(expr)
- }
- assert(e.getMessage.contains(
- s"cannot resolve '${expr.sql}' due to data type mismatch:"))
- assert(e.getMessage.contains(errorMessage))
- }
-
- def assertSuccess(expr: Expression): Unit = {
+ private def assertSuccess(expr: Expression): Unit = {
val analyzed = testRelation.select(expr.as("c")).analyze
SimpleAnalyzer.checkAnalysis(analyzed)
}
- def assertErrorForBinaryDifferingTypes(
+ private def assertErrorForBinaryDifferingTypes(
expr: Expression, messageParameters: Map[String, String]): Unit = {
checkError(
- exception = intercept[AnalysisException] {
- assertSuccess(expr)
- },
+ exception = analysisException(expr),
errorClass = "DATATYPE_MISMATCH.BINARY_OP_DIFF_TYPES",
parameters = messageParameters)
}
- def assertErrorForOrderingTypes(
+ private def assertErrorForOrderingTypes(
expr: Expression, messageParameters: Map[String, String]): Unit = {
checkError(
- exception = intercept[AnalysisException] {
- assertSuccess(expr)
- },
+ exception = analysisException(expr),
errorClass = "DATATYPE_MISMATCH.INVALID_ORDERING_TYPE",
parameters = messageParameters)
}
- def assertErrorForDataDifferingTypes(
+ private def assertErrorForDataDifferingTypes(
expr: Expression, messageParameters: Map[String, String]): Unit = {
checkError(
- exception = intercept[AnalysisException] {
- assertSuccess(expr)
- },
+ exception = analysisException(expr),
errorClass = "DATATYPE_MISMATCH.DATA_DIFF_TYPES",
parameters = messageParameters)
}
- def assertErrorForWrongNumParameters(
+ private def assertErrorForWrongNumParameters(
expr: Expression, messageParameters: Map[String, String]): Unit = {
checkError(
- exception = intercept[AnalysisException] {
- assertSuccess(expr)
- },
+ exception = analysisException(expr),
errorClass = "DATATYPE_MISMATCH.WRONG_NUM_ARGS",
parameters = messageParameters)
}
- def assertForWrongType(expr: Expression, messageParameters: Map[String, String]): Unit = {
+ private def assertForWrongType(expr: Expression, messageParameters: Map[String, String]): Unit = {
checkError(
- exception = intercept[AnalysisException] {
- assertSuccess(expr)
- },
+ exception = analysisException(expr),
errorClass = "DATATYPE_MISMATCH.BINARY_OP_WRONG_TYPE",
parameters = messageParameters)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org