Updates conformance tests and enables easier conformance debugging (#…

…1470)
partiql · May 28, 2024 · c53be04 · c53be04
1 parent 07d8d46
commit c53be04
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/test/partiql-tests b/test/partiql-tests
diff --git a/test/partiql-tests-runner/src/test/kotlin/org/partiql/runner/executor/EvalExecutor.kt b/test/partiql-tests-runner/src/test/kotlin/org/partiql/runner/executor/EvalExecutor.kt
@@ -64,7 +64,12 @@ class EvalExecutor(
         if (actual is PartiQLResult.Value && expect is PartiQLResult.Value) {
             return valueComparison(actual.value, expect.value)
         }
-        error("Cannot compare different types of PartiQLResult")
+        val errorMessage = buildString {
+            appendLine("Cannot compare different types of PartiQLResult.")
+            appendLine(" - Expected : $expect")
+            appendLine(" - Actual   : $actual")
+        }
+        error(errorMessage)
     }
 
     // Value comparison of PartiQL Value that utilized Ion Hashcode.

diff --git a/test/partiql-tests-runner/src/test/kotlin/org/partiql/runner/test/TestRunner.kt b/test/partiql-tests-runner/src/test/kotlin/org/partiql/runner/test/TestRunner.kt
@@ -46,7 +46,7 @@ class TestRunner<T, V>(private val factory: TestExecutor.Factory<T, V>) {
             }
         } catch (e: Exception) {
             when (case.assertion) {
-                is Assertion.EvaluationSuccess -> error("Expected success but exception thrown: $e")
+                is Assertion.EvaluationSuccess -> throw IllegalStateException("Expected success but exception thrown.", e)
                 is Assertion.EvaluationFailure -> {} // skip
             }
         }
+1 −1		partiql-tests-data/eval-equiv/spec-tests.ion
+18 −12		partiql-tests-data/eval/misc.ion
+45 −32		partiql-tests-data/eval/primitives/functions/mod.ion
+155 −2		partiql-tests-data/eval/primitives/operators/bag-operators.ion
+81 −0		partiql-tests-data/eval/primitives/operators/nary-operators.ion
+990 −882		partiql-tests-data/eval/query/group-by/group-by.ion
+32 −32		partiql-tests-data/eval/query/limitoffset.ion
+34 −4		partiql-tests-data/eval/query/order-by.ion
+2 −2		partiql-tests-data/eval/query/pivot.ion
+71 −55		partiql-tests-data/eval/query/select/from-clause.ion
+16 −10		partiql-tests-data/eval/query/select/projection.ion
+20 −14		partiql-tests-data/eval/query/select/select.ion
+149 −133		partiql-tests-data/eval/query/select/sql-aggregate.ion
+16 −10		partiql-tests-data/eval/query/undefined-variable-behavior.ion
+97 −49		partiql-tests-data/eval/spec-tests.ion
+7 −0		partiql-tests-data/fail/static-analysis/query/select/having.ion
+55 −2		partiql-tests-data/success/syntax/primitives/path-expression.ion
+166 −0		partiql-tests-data/success/syntax/primitives/union-except-intersect.ion