From b863d94c3c47c08a3248c46a8428ea3a600bce96 Mon Sep 17 00:00:00 2001
From: Anton Vasetenkov <antvaset@gmail.com>
Date: Fri, 9 Aug 2024 18:29:21 +1200
Subject: [PATCH 1/8] Add comparison operator tests

---
 tests/cql/CqlComparisonOperatorsTest.xml | 100 +++++++++++++++++++++++
 1 file changed, 100 insertions(+)

diff --git a/tests/cql/CqlComparisonOperatorsTest.xml b/tests/cql/CqlComparisonOperatorsTest.xml
index e8407b5..c585851 100644
--- a/tests/cql/CqlComparisonOperatorsTest.xml
+++ b/tests/cql/CqlComparisonOperatorsTest.xml
@@ -44,6 +44,10 @@
 			<expression>1 = 2</expression>
 			<output>false</output>
 		</test>
+		<test name="SimpleEqInt1Int2Long">
+			<expression>10L = 20L</expression>
+			<output>false</output>
+		</test>
 		<test name="SimpleEqStringAStringA">
 			<expression>'a' = 'a'</expression>
 			<output>true</output>
@@ -60,6 +64,14 @@
 			<expression>1.0 = 2.0</expression>
 			<output>false</output>
 		</test>
+		<test name="SimpleEqFloat1Float1WithZ">
+			<expression>1.0 = 1.00</expression>
+			<output>true</output>
+		</test>
+		<test name="SimpleEqFloat1Float1WithPrecisionAndZ">
+			<expression>1.50 = 1.55</expression>
+			<output>false</output>
+		</test>
 		<test name="SimpleEqFloat1Int1">
 			<expression>1.0 = 1</expression>
 			<output>true</output>
@@ -80,10 +92,26 @@
 			<expression>2.0'cm' = 2.00'cm'</expression>
 			<output>true</output>
 		</test>
+		<test name="RatioEqual">
+			<expression>1'cm':2'cm' = 1'cm':2'cm'</expression>
+			<output>true</output>
+		</test>
+		<test name="RatioNotEqual">
+			<expression>1'cm':2'cm' = 1.1'cm':2'cm'</expression>
+			<output>false</output>
+		</test>
 		<test name="TupleEqJohnJohn">
 			<expression>Tuple { Id : 1, Name : 'John' } = Tuple { Id : 1, Name : 'John' }</expression>
 			<output>true</output>
 		</test>
+		<test name="TupleEqJohnJohnFalse">
+			<expression invalid="true">Tuple { Id : 1, Name : 'John', Position: 'Shift Manager' } = Tuple { Id : 1, Name : 'John' }</expression>
+			<!-- EXPECT: Could not resolve call to operator Equal with signature (tuple{Id:System.Integer,Name:System.String,Position:System.String},tuple{Id:System.Integer,Name:System.String}). -->
+		</test>
+		<test name="TupleEqJohnJohnFalse2">
+			<expression invalid="true">Tuple { Id : 1, Name : 'John' } = Tuple { Id : 1, Name : 'John', Position: 'Shift Manager' }</expression>
+			<!-- EXPECT: Could not resolve call to operator Equal with signature (tuple{Id:System.Integer,Name:System.String},tuple{Id:System.Integer,Name:System.String,Position:System.String}). -->
+		</test>
 		<test name="TupleEqJohnJane">
 			<expression>Tuple { Id : 1, Name : 'John' } = Tuple { Id : 2, Name : 'Jane' }</expression>
 			<output>false</output>
@@ -120,6 +148,10 @@
 			<expression>Tuple { dateId: 1, Date: DateTime(2012, 10, 5, 0, 0, 0, 0) } = Tuple { dateId: 1, Date: DateTime(2012, 10, 5, 5, 0, 0, 0) }</expression>
 			<output>false</output>
 		</test>
+		<test name="TupleEqDateTimeTrue2">
+			<expression>Tuple { dateId: 12, Date: DateTime(2012, 1, 1) } = Tuple { dateId: 12, Date: DateTime(2012, 1, 1) }</expression>
+			<output>true</output>
+		</test>
 		<test name="TupleEqTimeTrue">
 			<expression>Tuple { timeId: 55, TheTime: @T05:15:15.541 } = Tuple { timeId: 55, TheTime: @T05:15:15.541 }</expression>
 			<output>true</output>
@@ -144,10 +176,18 @@
 			<expression>DateTime(2014, 1, 5, 5, 0, 0, 0, 0) = DateTime(2014, 7, 5, 5, 0, 0, 0, 0)</expression>
 			<output>false</output>
 		</test>
+		<test name="DateTimeEqMissingArg">
+			<expression>DateTime(2015, 1, 5, 5, 0, 0) = DateTime(2015, 1, 5, 5, 0, 0)</expression>
+			<output>true</output>
+		</test>
 		<test name="DateTimeEqNull">
 			<expression>DateTime(null) = DateTime(null)</expression>
 			<output>null</output>
 		</test>
+		<test name="DateTimeEqNull2">
+			<expression>DateTime(2001, 1, 1, null) = DateTime(2001, 1, 1, null, null)</expression>
+			<output>null</output>
+		</test>
 		<test name="DateTimeUTC">
 			<expression>@2014-01-25T14:30:14.559+01:00 = @2014-01-25T14:30:14.559+01:00</expression>
 			<output>true</output>
@@ -174,6 +214,10 @@
 			<expression>0 &gt; 1</expression>
 			<output>false</output>
 		</test>
+		<test name="GreaterLong">
+			<expression>00L > 10L</expression>
+			<output>false</output>
+		</test>
 		<test name="GreaterZNeg1">
 			<expression>0 &gt; -1</expression>
 			<output>true</output>
@@ -276,6 +320,10 @@
 			<expression>0 &gt;= 1</expression>
 			<output>false</output>
 		</test>
+		<test name="GreaterOrEqualZ1Long">
+			<expression>00L &gt;= 10L</expression>
+			<output>false</output>
+		</test>
 		<test name="GreaterOrEqualZNeg1">
 			<expression>0 &gt;= -1</expression>
 			<output>true</output>
@@ -386,6 +434,14 @@
 			<expression>0 &lt; 1</expression>
 			<output>true</output>
 		</test>
+		<test name="LessLong">
+			<expression>00L &lt; 10L</expression>
+			<output>true</output>
+		</test>
+		<test name="LessLongNeg">
+			<expression>-30L &lt; -20L</expression>
+			<output>true</output>
+		</test>
 		<test name="LessZNeg1">
 			<expression>0 &lt; -1</expression>
 			<output>false</output>
@@ -488,6 +544,10 @@
 			<expression>0 &lt;= 1</expression>
 			<output>true</output>
 		</test>
+		<test name="LessOrEqualZ1Long">
+			<expression>00L &lt;= 10L</expression>
+			<output>true</output>
+		</test>
 		<test name="LessOrEqualZNeg1">
 			<expression>0 &lt;= -1</expression>
 			<output>false</output>
@@ -634,6 +694,10 @@
 			<expression>'a' ~ 'b'</expression>
 			<output>false</output>
 		</test>
+		<test name="EquivStringIgnoreCase">
+			<expression>'Abel' ~ 'abel'</expression>
+			<output>true</output>
+		</test>
 		<test name="EquivFloat1Float1">
 			<expression>1.0 ~ 1.0</expression>
 			<output>true</output>
@@ -642,6 +706,22 @@
 			<expression>1.0 ~ 2.0</expression>
 			<output>false</output>
 		</test>
+		<test name="EquivFloat1Float1WithZ">
+			<expression>1.0 ~ 1.00</expression>
+			<output>true</output>
+		</test>
+		<test name="EquivFloat1Float1WithPrecision">
+			<expression>1.5 ~ 1.55</expression>
+			<output>true</output>
+		</test>
+		<test name="EquivFloat1Float1WithPrecisionAndZ">
+			<expression>1.50 ~ 1.55</expression>
+			<output>true</output>
+		</test>
+		<test name="EquivFloatTrailingZero">
+			<expression>1.001 ~ 1.000</expression>
+			<output>true</output>
+		</test>
 		<test name="EquivFloat1Int1">
 			<expression>1.0 ~ 1</expression>
 			<output>true</output>
@@ -658,6 +738,14 @@
 			<expression>1'cm' ~ 0.01'm'</expression>
 			<output>true</output>
 		</test>
+		<test name="RatioEquivalent">
+			<expression>1'cm':2'cm' ~ 1'cm':2'cm'</expression>
+			<output>true</output>
+		</test>
+		<test name="RatioNotEquivalent">
+			<expression>1'cm':2'cm' ~ 1'cm':3'cm'</expression>
+			<output>false</output>
+		</test>
 		<test name="EquivTupleJohnJohn">
 			<expression>Tuple { Id : 1, Name : 'John' } ~ Tuple { Id : 1, Name : 'John' }</expression>
 			<output>true</output>
@@ -666,6 +754,14 @@
 			<expression>Tuple { Id : 1, Name : 'John', Position: null } ~ Tuple { Id : 1, Name : 'John', Position: null }</expression>
 			<output>true</output>
 		</test>
+		<test name="EquivTupleJohnJohnFalse">
+			<expression invalid="true">Tuple { Id : 1, Name : 'John', Position: 'Shift Manager' } ~ Tuple { Id : 1, Name : 'John' }</expression>
+			<!-- EXPECT: Could not resolve call to operator Equivalent with signature (tuple{Id:System.Integer,Name:System.String,Position:System.String},tuple{Id:System.Integer,Name:System.String}). -->
+		</test>
+		<test name="EquivTupleJohnJohnFalse2">
+			<expression invalid="true">Tuple { Id : 1, Name : 'John' } ~ Tuple { Id : 1, Name : 'John', Position: 'Shift Manager' }</expression>
+			<!-- EXPECT: Could not resolve call to operator Equivalent with signature (tuple{Id:System.Integer,Name:System.String},tuple{Id:System.Integer,Name:System.String,Position:System.String}). -->
+		</test>
 		<test name="EquivTupleJohnJane">
 			<expression>Tuple { Id : 1, Name : 'John' } ~ Tuple { Id : 2, Name : 'Jane' }</expression>
 			<output>false</output>
@@ -728,6 +824,10 @@
 			<expression>1 != 2</expression>
 			<output>true</output>
 		</test>
+		<test name="SimpleNotEqInt1Int2Long">
+			<expression>10L != 20L</expression>
+			<output>true</output>
+		</test>
 		<test name="SimpleNotEqStringAStringA">
 			<expression>'a' != 'a'</expression>
 			<output>false</output>

From 1fd41ac6b0131209519df527c6300d31377cbbe9 Mon Sep 17 00:00:00 2001
From: Anton Vasetenkov <antvaset@gmail.com>
Date: Fri, 9 Aug 2024 18:33:19 +1200
Subject: [PATCH 2/8] Update test

---
 tests/cql/CqlComparisonOperatorsTest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/cql/CqlComparisonOperatorsTest.xml b/tests/cql/CqlComparisonOperatorsTest.xml
index c585851..926a90e 100644
--- a/tests/cql/CqlComparisonOperatorsTest.xml
+++ b/tests/cql/CqlComparisonOperatorsTest.xml
@@ -184,9 +184,9 @@
 			<expression>DateTime(null) = DateTime(null)</expression>
 			<output>null</output>
 		</test>
-		<test name="DateTimeEqNull2">
+		<test name="DateTimeEqTrue">
 			<expression>DateTime(2001, 1, 1, null) = DateTime(2001, 1, 1, null, null)</expression>
-			<output>null</output>
+			<output>true</output>
 		</test>
 		<test name="DateTimeUTC">
 			<expression>@2014-01-25T14:30:14.559+01:00 = @2014-01-25T14:30:14.559+01:00</expression>

From 2ea18f19fe2ced76a07c1fd9977bf1647897aa0f Mon Sep 17 00:00:00 2001
From: Anton Vasetenkov <antvaset@gmail.com>
Date: Fri, 6 Feb 2026 15:21:45 +1300
Subject: [PATCH 3/8] Fix test names

---
 tests/cql/CqlComparisonOperatorsTest.xml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/tests/cql/CqlComparisonOperatorsTest.xml b/tests/cql/CqlComparisonOperatorsTest.xml
index 784b769..3c456df 100644
--- a/tests/cql/CqlComparisonOperatorsTest.xml
+++ b/tests/cql/CqlComparisonOperatorsTest.xml
@@ -47,8 +47,8 @@
 			<expression>1 = 2</expression>
 			<output>false</output>
 		</test>
-		<test name="SimpleEqInt1Int2Long" version="1.5">
-			<expression>10L = 20L</expression>
+		<test name="SimpleEqLong1Long2" version="1.5">
+			<expression>1L = 2L</expression>
 			<output>false</output>
 		</test>
 		<test name="SimpleEqStringAStringA" version="1.0">
@@ -224,7 +224,7 @@
 			<output>false</output>
 		</test>
 		<test name="GreaterLong" version="1.5">
-			<expression>00L > 10L</expression>
+			<expression>0L &gt; 10L</expression>
 			<output>false</output>
 		</test>
 		<test name="GreaterZNeg1" version="1.0">
@@ -333,7 +333,7 @@
 			<output>false</output>
 		</test>
 		<test name="GreaterOrEqualZ1Long" version="1.5">
-			<expression>00L &gt;= 10L</expression>
+			<expression>0L &gt;= 10L</expression>
 			<output>false</output>
 		</test>
 		<test name="GreaterOrEqualZNeg1" version="1.0">
@@ -450,7 +450,7 @@
 			<output>true</output>
 		</test>
 		<test name="LessLong" version="1.5">
-			<expression>00L &lt; 10L</expression>
+			<expression>0L &lt; 10L</expression>
 			<output>true</output>
 		</test>
 		<test name="LessLongNeg" version="1.5">
@@ -563,7 +563,7 @@
 			<output>true</output>
 		</test>
 		<test name="LessOrEqualZ1Long" version="1.5">
-			<expression>00L &lt;= 10L</expression>
+			<expression>0L &lt;= 10L</expression>
 			<output>true</output>
 		</test>
 		<test name="LessOrEqualZNeg1" version="1.0">
@@ -778,11 +778,13 @@
 			<expression>Tuple { Id : 1, Name : 'John', Position: null } ~ Tuple { Id : 1, Name : 'John', Position: null }</expression>
 			<output>true</output>
 		</test>
-		<test name="EquivTupleJohnJohnFalse">
+		<test name="EquivTupleJohnJohnFalse" version="1.5">
+			<capability code="tuple"/>
 			<expression invalid="true">Tuple { Id : 1, Name : 'John', Position: 'Shift Manager' } ~ Tuple { Id : 1, Name : 'John' }</expression>
 			<!-- EXPECT: Could not resolve call to operator Equivalent with signature (tuple{Id:System.Integer,Name:System.String,Position:System.String},tuple{Id:System.Integer,Name:System.String}). -->
 		</test>
-		<test name="EquivTupleJohnJohnFalse2">
+		<test name="EquivTupleJohnJohnFalse2" version="1.5">
+			<capability code="tuple"/>
 			<expression invalid="true">Tuple { Id : 1, Name : 'John' } ~ Tuple { Id : 1, Name : 'John', Position: 'Shift Manager' }</expression>
 			<!-- EXPECT: Could not resolve call to operator Equivalent with signature (tuple{Id:System.Integer,Name:System.String},tuple{Id:System.Integer,Name:System.String,Position:System.String}). -->
 		</test>
@@ -851,8 +853,8 @@
 			<expression>1 != 2</expression>
 			<output>true</output>
 		</test>
-		<test name="SimpleNotEqInt1Int2Long" version="1.5">
-			<expression>10L != 20L</expression>
+		<test name="SimpleNotEqLong1Long2" version="1.5">
+			<expression>1L != 2L</expression>
 			<output>true</output>
 		</test>
 		<test name="SimpleNotEqStringAStringA" version="1.0">

From fccc74aef6582c5930e5c53374ce31f78e0baa63 Mon Sep 17 00:00:00 2001
From: Anton Vasetenkov <antvaset@gmail.com>
Date: Fri, 6 Feb 2026 15:47:08 +1300
Subject: [PATCH 4/8] Add ratio tests

---
 tests/cql/CqlComparisonOperatorsTest.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/cql/CqlComparisonOperatorsTest.xml b/tests/cql/CqlComparisonOperatorsTest.xml
index 3c456df..15942a8 100644
--- a/tests/cql/CqlComparisonOperatorsTest.xml
+++ b/tests/cql/CqlComparisonOperatorsTest.xml
@@ -100,10 +100,14 @@
 			<expression>1'cm':2'cm' = 1'cm':2'cm'</expression>
 			<output>true</output>
 		</test>
-		<test name="RatioNotEqual" version="1.0">
+		<test name="RatioNotEqualDiffNumerator" version="1.0">
 			<expression>1'cm':2'cm' = 1.1'cm':2'cm'</expression>
 			<output>false</output>
 		</test>
+		<test name="RatioNotEqualDiffDenominator" version="1.0">
+			<expression>1'cm':2'cm' = 1'cm':2.1'cm'</expression>
+			<output>false</output>
+		</test>
 		<test name="TupleEqJohnJohn" version="1.5">
 			<capability code="tuple"/>
 			<expression>Tuple { Id : 1, Name : 'John' } = Tuple { Id : 1, Name : 'John' }</expression>

From f3d4156844269b9e860391fc8e9338a6d8a5ae29 Mon Sep 17 00:00:00 2001
From: Anton Vasetenkov <antvaset@gmail.com>
Date: Fri, 6 Feb 2026 15:54:57 +1300
Subject: [PATCH 5/8] Add ratio test

---
 tests/cql/CqlComparisonOperatorsTest.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/cql/CqlComparisonOperatorsTest.xml b/tests/cql/CqlComparisonOperatorsTest.xml
index 15942a8..ec88324 100644
--- a/tests/cql/CqlComparisonOperatorsTest.xml
+++ b/tests/cql/CqlComparisonOperatorsTest.xml
@@ -768,7 +768,11 @@
 			<expression>1'cm':2'cm' ~ 1'cm':2'cm'</expression>
 			<output>true</output>
 		</test>
-		<test name="RatioNotEquivalent" version="1.0">
+		<test name="RatioNotEquivalentDiffNumerator" version="1.0">
+			<expression>1'cm':2'cm' ~ 3'cm':2'cm'</expression>
+			<output>false</output>
+		</test>
+		<test name="RatioNotEquivalentDiffDenominator" version="1.0">
 			<expression>1'cm':2'cm' ~ 1'cm':3'cm'</expression>
 			<output>false</output>
 		</test>

From f014988723e4f2765e51a561e5e5e3739955f128 Mon Sep 17 00:00:00 2001
From: Anton Vasetenkov <antvaset@gmail.com>
Date: Fri, 6 Feb 2026 16:04:26 +1300
Subject: [PATCH 6/8] Fix typo

---
 tests/cql/CqlComparisonOperatorsTest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/cql/CqlComparisonOperatorsTest.xml b/tests/cql/CqlComparisonOperatorsTest.xml
index ec88324..bd29e0f 100644
--- a/tests/cql/CqlComparisonOperatorsTest.xml
+++ b/tests/cql/CqlComparisonOperatorsTest.xml
@@ -195,7 +195,7 @@
 		<test name="DateTimeEqNull" version="1.0">
 			<expression>DateTime(null) = DateTime(null)</expression>
 			<output>null</output>
-		</test>>
+		</test>
 		<test name="DateTimeEqTrue" version="1.0">
 			<expression>DateTime(2001, 1, 1, null) = DateTime(2001, 1, 1, null, null)</expression>
 			<output>true</output>

From 620ea049291b7573f36dea344298ce670f239859 Mon Sep 17 00:00:00 2001
From: Anton Vasetenkov <antvaset@gmail.com>
Date: Fri, 6 Feb 2026 16:09:15 +1300
Subject: [PATCH 7/8] Add capability

---
 tests/cql/CqlComparisonOperatorsTest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/cql/CqlComparisonOperatorsTest.xml b/tests/cql/CqlComparisonOperatorsTest.xml
index bd29e0f..6db6d4a 100644
--- a/tests/cql/CqlComparisonOperatorsTest.xml
+++ b/tests/cql/CqlComparisonOperatorsTest.xml
@@ -159,6 +159,7 @@
 			<output>false</output>
 		</test>
 		<test name="TupleEqDateTimeTrue2" version="1.0">
+			<capability code="tuple"/>
 			<expression>Tuple { dateId: 12, Date: DateTime(2012, 1, 1) } = Tuple { dateId: 12, Date: DateTime(2012, 1, 1) }</expression>
 			<output>true</output>
 		</test>

From 0bea5b00344bb60b3502ccc979c894776657a916 Mon Sep 17 00:00:00 2001
From: Anton Vasetenkov <antvaset@gmail.com>
Date: Fri, 6 Feb 2026 16:12:09 +1300
Subject: [PATCH 8/8] Add capability

---
 tests/cql/CqlComparisonOperatorsTest.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/cql/CqlComparisonOperatorsTest.xml b/tests/cql/CqlComparisonOperatorsTest.xml
index 6db6d4a..1974fef 100644
--- a/tests/cql/CqlComparisonOperatorsTest.xml
+++ b/tests/cql/CqlComparisonOperatorsTest.xml
@@ -48,6 +48,7 @@
 			<output>false</output>
 		</test>
 		<test name="SimpleEqLong1Long2" version="1.5">
+			<capability code="system.long"/>
 			<expression>1L = 2L</expression>
 			<output>false</output>
 		</test>
@@ -229,6 +230,7 @@
 			<output>false</output>
 		</test>
 		<test name="GreaterLong" version="1.5">
+			<capability code="system.long"/>
 			<expression>0L &gt; 10L</expression>
 			<output>false</output>
 		</test>
@@ -338,6 +340,7 @@
 			<output>false</output>
 		</test>
 		<test name="GreaterOrEqualZ1Long" version="1.5">
+			<capability code="system.long"/>
 			<expression>0L &gt;= 10L</expression>
 			<output>false</output>
 		</test>
@@ -455,10 +458,12 @@
 			<output>true</output>
 		</test>
 		<test name="LessLong" version="1.5">
+			<capability code="system.long"/>
 			<expression>0L &lt; 10L</expression>
 			<output>true</output>
 		</test>
 		<test name="LessLongNeg" version="1.5">
+			<capability code="system.long"/>
 			<expression>-30L &lt; -20L</expression>
 			<output>true</output>
 		</test>
@@ -568,6 +573,7 @@
 			<output>true</output>
 		</test>
 		<test name="LessOrEqualZ1Long" version="1.5">
+			<capability code="system.long"/>
 			<expression>0L &lt;= 10L</expression>
 			<output>true</output>
 		</test>
@@ -863,6 +869,7 @@
 			<output>true</output>
 		</test>
 		<test name="SimpleNotEqLong1Long2" version="1.5">
+			<capability code="system.long"/>
 			<expression>1L != 2L</expression>
 			<output>true</output>
 		</test>