Skip to content

[SPARK-40936][SQL][TESTS] Refactor AnalysisTest#assertAnalysisErrorClass by reusing the SparkFunSuite#checkError #38413

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 3 commits into from
Closed

[SPARK-40936][SQL][TESTS] Refactor AnalysisTest#assertAnalysisErrorClass by reusing the SparkFunSuite#checkError #38413

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ac5fe7
simplify
LuciferYang Oct 27, 2022
96cf8f2
refactor
LuciferYang Oct 28, 2022
cdb677a
Merge branch 'upmaster' into simplify-assertAnalysisErrorClass
LuciferYang Oct 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
48 changes: 24 additions & 24 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/AnalysisTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ package org.apache.spark.sql.catalyst.analysis
import java.net.URI
import java.util.Locale

import scala.collection.mutable

import org.apache.spark.sql.AnalysisException
import org.apache.spark.sql.catalyst.{QueryPlanningTracker, TableIdentifier}
import org.apache.spark.sql.catalyst.catalog.{CatalogDatabase, CatalogStorageFormat, CatalogTable, CatalogTableType, InMemoryCatalog, SessionCatalog, TemporaryViewRelation}
Expand Down Expand Up @@ -183,30 +185,28 @@ trait AnalysisTest extends PlanTest {
analyzer.checkAnalysis(analyzer.execute(inputPlan))
}

if (e.getErrorClass != expectedErrorClass ||
e.messageParameters != expectedMessageParameters ||
(line >= 0 && e.line.getOrElse(-1) != line) ||
(pos >= 0) && e.startPosition.getOrElse(-1) != pos) {
Comment thread
LuciferYang marked this conversation as resolved.
var failMsg = ""
if (e.getErrorClass != expectedErrorClass) {
failMsg +=
s"""Error class should be: ${expectedErrorClass}
|Actual error class: ${e.getErrorClass}
""".stripMargin
}
if (e.messageParameters != expectedMessageParameters) {
failMsg +=
s"""Message parameters should be: ${expectedMessageParameters.mkString("\n ")}
|Actual message parameters: ${e.messageParameters.mkString("\n ")}
""".stripMargin
}
if (e.line.getOrElse(-1) != line || e.startPosition.getOrElse(-1) != pos) {
failMsg +=
s"""Line/position should be: $line, $pos
|Actual line/position: ${e.line.getOrElse(-1)}, ${e.startPosition.getOrElse(-1)}
""".stripMargin
}
fail(failMsg)
val failMsgBuilder = new mutable.StringBuilder()
if (e.getErrorClass != expectedErrorClass) {
failMsgBuilder.append(
s"""Error class should be: $expectedErrorClass
|Actual error class: ${e.getErrorClass}
""".stripMargin)
}
if (e.messageParameters != expectedMessageParameters) {
failMsgBuilder.append(
s"""Message parameters should be: ${expectedMessageParameters.mkString("\n ")}
|Actual message parameters: ${e.messageParameters.mkString("\n ")}
""".stripMargin)
}
if ((line >= 0 && e.line.getOrElse(-1) != line) ||
(pos >= 0 && e.startPosition.getOrElse(-1) != pos)) {
failMsgBuilder.append(
s"""Line/position should be: $line, $pos
|Actual line/position: ${e.line.getOrElse(-1)}, ${e.startPosition.getOrElse(-1)}
""".stripMargin)
}
if (failMsgBuilder.nonEmpty) {
fail(failMsgBuilder.toString())
}
}
}
Expand Down