From 597a87f59117c83ace0d558c6e5815ba1889ab62 Mon Sep 17 00:00:00 2001
From: Anton Vasetenkov <antvaset@gmail.com>
Date: Sat, 24 Aug 2024 23:48:58 +1200
Subject: [PATCH] Resolve list/interval ambiguities

---
 tests/cql/CqlIntervalOperatorsTest.xml | 2 +-
 tests/cql/CqlListOperatorsTest.xml     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/cql/CqlIntervalOperatorsTest.xml b/tests/cql/CqlIntervalOperatorsTest.xml
index 72356c8..47be86a 100644
--- a/tests/cql/CqlIntervalOperatorsTest.xml
+++ b/tests/cql/CqlIntervalOperatorsTest.xml
@@ -277,7 +277,7 @@
 			<output>null</output>
 		</test>
 		<test name="TestNullElement1">
-			<expression>null contains 5</expression>
+			<expression>null as Interval&lt;Integer&gt; contains 5</expression>
 			<output>false</output>
 		</test>
 		<test name="TestNullElement2">
diff --git a/tests/cql/CqlListOperatorsTest.xml b/tests/cql/CqlListOperatorsTest.xml
index 620834d..707c13e 100644
--- a/tests/cql/CqlListOperatorsTest.xml
+++ b/tests/cql/CqlListOperatorsTest.xml
@@ -77,7 +77,7 @@
 			<output>false</output>
 		</test>
 		<test name="ContainsNullLeft">
-			<expression>null contains 'a'</expression>
+			<expression>null as List&lt;String&gt; contains 'a'</expression>
 			<output>false</output>
 		</test>
 	</group>
@@ -306,7 +306,7 @@
 			<output>true</output>
 		</test>
 		<test name="In1Null">
-			<expression>1 in null</expression>
+			<expression>1 in null as List&lt;Integer&gt;</expression>
 			<output>false</output>
 		</test>
 		<test name="In1And12">
@@ -372,7 +372,7 @@
 			<output>false</output>
 		</test>
 		<test name="IncludesNullLeft">
-			<expression>null includes {2}</expression>
+			<expression>null as List&lt;Integer&gt; includes {2}</expression>
 			<output>null</output>
 		</test>
 		<!-- this test is going to the ContainsEvaluator -->
@@ -424,7 +424,7 @@
 			<output>null</output>
 		</test>
 		<test name="IncludedInNullRight">
-			<expression>{'s', 'a', 'm'} included in null</expression>
+			<expression>{'s', 'a', 'm'} included in null as List&lt;String&gt;</expression>
 			<output>null</output>
 		</test>
 	</group>