druidexception-trial

sergioferragut · Oct 5, 2023 · 8fa0664 · 8fa0664
1 parent a708ef2
commit 8fa0664
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java
@@ -1104,7 +1104,7 @@ public void assertResultsEquals(String sql, List<Object[]> expectedResults, List
     Assert.assertEquals(expectedResults.size(), results.size());
   }
 
-  public void testQueryThrows(final String sql, Consumer<ExpectedException> expectedExceptionInitializer)
+  public void testQueryThrows(final String sql, Consumer<ExpectedException> expectedExceptionInitializer) throws Exception
   {
     testBuilder()
         .sql(sql)

diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/QueryTestRunner.java b/sql/src/test/java/org/apache/druid/sql/calcite/QueryTestRunner.java
@@ -106,7 +106,7 @@ public QueryTestBuilder builder()
    */
   public interface QueryVerifyStep
   {
-    void verify();
+    void verify() throws Exception;
   }
 
   /**
@@ -684,8 +684,9 @@ public QueryTestRunner(QueryTestBuilder builder)
 
   /**
    * All testQuery roads lead to this method.
+   * @throws Exception
    */
-  public void run()
+  public void run() throws Exception
   {
     for (QueryRunStep runStep : runSteps) {
       runStep.run();

diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/QueryVerification.java b/sql/src/test/java/org/apache/druid/sql/calcite/QueryVerification.java
@@ -19,6 +19,10 @@
 
 package org.apache.druid.sql.calcite;
 
+import org.apache.druid.error.DruidException;
+import org.apache.druid.error.DruidException.Category;
+import org.apache.druid.error.DruidException.Persona;
+
 public class QueryVerification
 {
   public static QueryResultsVerifierFactory ofResults(QueryResultsVerifier verifier)
@@ -51,7 +55,10 @@ public QueryTestRunner.QueryVerifyStep make(QueryTestRunner.BaseExecuteQuery exe
             verifier.verifyResults(queryResults);
           }
           catch (Exception e) {
-            throw new RuntimeException("Exception during verification!", e);
+            throw DruidException.forPersona(Persona.DEVELOPER)
+                .ofCategory(Category.UNCATEGORIZED)
+                .build(e, "Exception during verification!");
+            //            throw new RuntimeException("Exception during verification!", e);
           }
         }
       };