CAST: Improve the CAST assertion assertEval (#523)

Improve the CAST assertion assertEval with removing a redundant assertion for permissive mode since we already run tests for this mode as part of the overall process. Issue #, if available: 519 Description of changes: Parameterize the error message.
partiql · Feb 9, 2022 · 271158d · 271158d
1 parent 9af595e
commit 271158d
Showing 1 changed file with 3 additions and 14 deletions.
diff --git a/lang/test/org/partiql/lang/eval/EvaluatorTestBase.kt b/lang/test/org/partiql/lang/eval/EvaluatorTestBase.kt
@@ -97,20 +97,9 @@ abstract class EvaluatorTestBase : TestBase() {
         val originalExprNode = parser.parseExprNode(source)
 
         fun evalAndAssert(exprNodeToEvaluate: ExprNode, message: String) {
-            // LEGACY mode
-            val result = eval(exprNodeToEvaluate, compileOptions, session, compilerPipelineBuilderBlock)
-            AssertExprValue(result, message = "(LEGACY mode) Evaluated '$source' with evaluator ($message)")
-                .apply { assertIonValue(expectedIon) }.run(block)
-            // TODO this should not be here--this should be explicit in the test case
-            // PERMISSIVE mode
-            val resultForPermissiveMode = eval(
-                exprNodeToEvaluate,
-                CompileOptions.builder(compileOptions).typingMode(TypingMode.PERMISSIVE).build(),
-                session,
-                compilerPipelineBuilderBlock
-            )
-            AssertExprValue(resultForPermissiveMode, message = "(PERMISSIVE mode) Evaluated '$source' with evaluator ($message)")
-                .apply { assertIonValue(expectedIon) }.run(block)
+            AssertExprValue(eval(exprNodeToEvaluate, compileOptions, session, compilerPipelineBuilderBlock),
+                message =  "${compileOptions.typedOpBehavior} CAST in ${compileOptions.typingMode} typing mode, " +
+                    "evaluated '$source' with evaluator ($message)").apply { assertIonValue(expectedIon) }.run(block)
         }
 
         // Evaluate the ExprNodes originally obtained from the parser