Skip to content

[SPARK-41293][SQL][TESTS] Code cleanup for assertXXX methods in ExpressionTypeCheckingSuite #38820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LuciferYang wants to merge 2 commits into from
Closed

[SPARK-41293][SQL][TESTS] Code cleanup for assertXXX methods in ExpressionTypeCheckingSuite #38820

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ccd107
de dup
LuciferYang Nov 28, 2022
a607f01
refactor
LuciferYang Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 11 additions & 30 deletions ...t/src/test/scala/org/apache/spark/sql/catalyst/analysis/ExpressionTypeCheckingSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down