cleaner exception handling

apache · Jul 21, 2022 · 0fdc134 · 0fdc134
1 parent 19e2774
commit 0fdc134
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/...tasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/HoodieSparkSqlTestBase.scala b/...tasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/HoodieSparkSqlTestBase.scala
@@ -139,12 +139,8 @@ class HoodieSparkSqlTestBase extends FunSuite with BeforeAndAfterAll {
     try {
       spark.sql(sql)
     } catch {
-      case e: Throwable =>
-        if (e.getMessage.contains(errorMsg)) {
-          hasException = true
-        } else {
-          fail("Exception should contain: " + errorMsg + ", error message: " + e.getMessage, e)
-        }
+      case e: Throwable if e.getMessage.contains(errorMsg) => hasException = true
+      case f: Throwable => fail("Exception should contain: " + errorMsg + ", error message: " + f.getMessage, f)
     }
     assertResult(true)(hasException)
   }

diff --git a/...hudi-spark/src/test/scala/org/apache/spark/sql/hudi/procedure/TestCallCommandParser.scala b/...hudi-spark/src/test/scala/org/apache/spark/sql/hudi/procedure/TestCallCommandParser.scala
@@ -114,12 +114,8 @@ class TestCallCommandParser extends HoodieSparkSqlTestBase {
     try {
       parser.parsePlan(sql)
     } catch {
-      case e: Throwable =>
-        if (e.getMessage.contains(errorMsg)) {
-          hasException = true
-        } else {
-          fail("Exception should contain: " + errorMsg + ", error message: " + e.getMessage, e)
-        }
+      case e: Throwable if e.getMessage.contains(errorMsg) => hasException = true
+      case f: Throwable => fail("Exception should contain: " + errorMsg + ", error message: " + f.getMessage, f)
     }
     assertResult(true)(hasException)
   }