Skip to content

Commit a40f8c1

Browse files
LuciferYangMaxGekk
authored andcommitted
[SPARK-40919][SQL][TESTS] Fix AnalysisTest#assertAnalysisErrorClass to avoid wrong check result when expectedMessageParameters.size <= 4
### What changes were proposed in this pull request? This pr refactor `AnalysisTest#assertAnalysisErrorClass` method to use `e.messageParameters != expectedMessageParameters` instead of `!e.messageParameters.sameElements(expectedMessageParameters)` to avoid wrong check result when `expectedMessageParameters.size <= 4` ### Why are the changes needed? Avoid wrong check result of `AnalysisTest#assertAnalysisErrorClass` when `expectedMessageParameters.size <= 4`. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? - Pass GitHub Actions - Manual test: ```scala Welcome to Scala 2.12.17 (OpenJDK 64-Bit Server VM, Java 1.8.0_352). Type in expressions for evaluation. Or try :help. scala> :paste // Entering paste mode (ctrl-D to finish) val messageParameters = Map( "exprName" -> "`window_duration`", "valueRange" -> s"(0, 9223372036854775807]", "currentValue" -> "-1000000L", "sqlExpr" -> "\"window(2016-01-01 01:01:01, -1000000, 1000000, 0)\"" ) val expectedMessageParameters = Map( "sqlExpr" -> "\"window(2016-01-01 01:01:01, -1000000, 1000000, 0)\"", "exprName" -> "`window_duration`", "valueRange" -> s"(0, 9223372036854775807]", "currentValue" -> "-1000000L" ) val tret = !messageParameters.sameElements(expectedMessageParameters) val fret = messageParameters != expectedMessageParameters // Exiting paste mode, now interpreting. messageParameters: scala.collection.immutable.Map[String,String] = Map(exprName -> `window_duration`, valueRange -> (0, 9223372036854775807], currentValue -> -1000000L, sqlExpr -> "window(2016-01-01 01:01:01, -1000000, 1000000, 0)") expectedMessageParameters: scala.collection.immutable.Map[String,String] = Map(sqlExpr -> "window(2016-01-01 01:01:01, -1000000, 1000000, 0)", exprName -> `window_duration`, valueRange -> (0, 9223372036854775807], currentValue -> -1000000L) tret: Boolean = true fret: Boolean = false ``` Closes #38396 from LuciferYang/SPARK-40919. Authored-by: yangjie01 <yangjie01@baidu.com> Signed-off-by: Max Gekk <max.gekk@gmail.com>
1 parent f5dc00b commit a40f8c1

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/AnalysisTest.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,17 +184,17 @@ trait AnalysisTest extends PlanTest {
184184
}
185185

186186
if (e.getErrorClass != expectedErrorClass ||
187-
!e.messageParameters.sameElements(expectedMessageParameters) ||
188-
(line >= 0 && e.line.getOrElse(-1) != line) ||
189-
(pos >= 0) && e.startPosition.getOrElse(-1) != pos) {
187+
e.messageParameters != expectedMessageParameters ||
188+
(line >= 0 && e.line.getOrElse(-1) != line) ||
189+
(pos >= 0) && e.startPosition.getOrElse(-1) != pos) {
190190
var failMsg = ""
191191
if (e.getErrorClass != expectedErrorClass) {
192192
failMsg +=
193193
s"""Error class should be: ${expectedErrorClass}
194194
|Actual error class: ${e.getErrorClass}
195195
""".stripMargin
196196
}
197-
if (!e.messageParameters.sameElements(expectedMessageParameters)) {
197+
if (e.messageParameters != expectedMessageParameters) {
198198
failMsg +=
199199
s"""Message parameters should be: ${expectedMessageParameters.mkString("\n ")}
200200
|Actual message parameters: ${e.messageParameters.mkString("\n ")}

0 commit comments

Comments
 (0)