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 857acca1d17 [SPARK-38746][SQL][TESTS] Move the tests for `PARSE_EMPTY_STATEMENT` to QueryParsingErrorsSuite 857acca1d17 is described below commit 857acca1d176fd0836b350eb163b0793db241f3b Author: panbingkun <pbk1...@gmail.com> AuthorDate: Mon Apr 18 11:05:42 2022 +0300 [SPARK-38746][SQL][TESTS] Move the tests for `PARSE_EMPTY_STATEMENT` to QueryParsingErrorsSuite ### What changes were proposed in this pull request? This pr aims to move tests for the error class `PARSE_EMPTY_STATEMENT` from ErrorParserSuite to QueryParsingErrorsSuite., it's a followup of SPARK-37935. ### Why are the changes needed? To improve code maintenance. ### Does this PR introduce any user-facing change? No. ### How was this patch tested? By running the moved tests: ``` $ build/sbt "sql/testOnly *QueryParsingErrorsSuite*" ``` Closes #36221 from panbingkun/SPARK-38746. Authored-by: panbingkun <pbk1...@gmail.com> Signed-off-by: Max Gekk <max.g...@gmail.com> --- .../sql/catalyst/parser/ErrorParserSuite.scala | 7 ---- .../spark/sql/errors/QueryParsingErrorsSuite.scala | 41 ++++++++++++++++++++++ 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/ErrorParserSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/ErrorParserSuite.scala index 6fb77aa012f..aa9f096cfe2 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/ErrorParserSuite.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/ErrorParserSuite.scala @@ -99,13 +99,6 @@ class ErrorParserSuite extends AnalysisTest { "Syntax error at or near", "^^^") } - test("empty input") { - val expectedErrMsg = SparkThrowableHelper.getMessage("PARSE_EMPTY_STATEMENT", Array[String]()) - intercept("", Some("PARSE_EMPTY_STATEMENT"), expectedErrMsg) - intercept(" ", Some("PARSE_EMPTY_STATEMENT"), expectedErrMsg) - intercept(" \n", Some("PARSE_EMPTY_STATEMENT"), expectedErrMsg) - } - test("jargon token substitute to user-facing language") { // '<EOF>' -> end of input intercept("select count(*", "PARSE_SYNTAX_ERROR", diff --git a/sql/core/src/test/scala/org/apache/spark/sql/errors/QueryParsingErrorsSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/errors/QueryParsingErrorsSuite.scala index bf8aa9494eb..225d4f33b41 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/errors/QueryParsingErrorsSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/errors/QueryParsingErrorsSuite.scala @@ -431,4 +431,45 @@ class QueryParsingErrorsSuite extends QueryTest with SharedSparkSession { |---------------------------------------^^^ |""".stripMargin) } + + test("PARSE_EMPTY_STATEMENT: empty input") { + validateParsingError( + sqlText = "", + errorClass = "PARSE_EMPTY_STATEMENT", + sqlState = "42000", + message = + """ + |Syntax error, unexpected empty statement(line 1, pos 0) + | + |== SQL == + | + |^^^ + |""".stripMargin) + + validateParsingError( + sqlText = " ", + errorClass = "PARSE_EMPTY_STATEMENT", + sqlState = "42000", + message = + s""" + |Syntax error, unexpected empty statement(line 1, pos 3) + | + |== SQL == + |${" "} + |---^^^ + |""".stripMargin) + + validateParsingError( + sqlText = " \n", + errorClass = "PARSE_EMPTY_STATEMENT", + sqlState = "42000", + message = + s""" + |Syntax error, unexpected empty statement(line 2, pos 0) + | + |== SQL == + |${" "} + |^^^ + |""".stripMargin) + } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org