cloud-fan commented on a change in pull request #35707:
URL: https://github.com/apache/spark/pull/35707#discussion_r818309367
##########
File path:
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/ErrorParserSuite.scala
##########
@@ -31,26 +32,47 @@ class ErrorParserSuite extends AnalysisTest {
assert(parsePlan(sqlCommand) == plan)
}
- def intercept(sqlCommand: String, messages: String*): Unit =
- interceptParseException(CatalystSqlParser.parsePlan)(sqlCommand, messages:
_*)
-
- def intercept(sql: String, line: Int, startPosition: Int, stopPosition: Int,
- messages: String*): Unit = {
+ private def interceptImpl(sql: String, messages: String*)(
+ line: Option[Int] = None, startPosition: Option[Int] = None, stopPosition:
Option[Int] = None)(
+ errorClass: Option[String] = None): Unit = {
val e = intercept[ParseException](CatalystSqlParser.parsePlan(sql))
- // Check position.
- assert(e.line.isDefined)
- assert(e.line.get === line)
- assert(e.startPosition.isDefined)
- assert(e.startPosition.get === startPosition)
- assert(e.stop.startPosition.isDefined)
- assert(e.stop.startPosition.get === stopPosition)
-
// Check messages.
val error = e.getMessage
messages.foreach { message =>
assert(error.contains(message))
}
+
+ // Check position.
+ if (line.isDefined) {
+ assert(line.isDefined && startPosition.isDefined &&
stopPosition.isDefined)
+ assert(e.line.isDefined)
+ assert(e.line.get === line.get)
+ assert(e.startPosition.isDefined)
+ assert(e.startPosition.get === startPosition.get)
+ assert(e.stop.startPosition.isDefined)
+ assert(e.stop.startPosition.get === stopPosition.get)
+ }
+
+ // Check error class.
+ if (errorClass.isDefined) {
+ assert(e.getErrorClass == errorClass.get)
+ }
+ }
+
+ def intercept(sqlCommand: String, errorClass: Option[String], messages:
String*): Unit = {
+ interceptImpl(sqlCommand, messages: _*)()(errorClass)
Review comment:
nit: 2 spaces indentation
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
