From bdfdf4e10e5d46014291d67914f254b8b19652df Mon Sep 17 00:00:00 2001
From: Bryant Austin <bryantaustin13@yahoo.com>
Date: Wed, 5 Nov 2025 12:23:26 -0700
Subject: [PATCH 1/3] added tests for timezone offset tests

---
 tests/cql/CQLTimeZoneOffsetTest.xml | 51 +++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 tests/cql/CQLTimeZoneOffsetTest.xml

diff --git a/tests/cql/CQLTimeZoneOffsetTest.xml b/tests/cql/CQLTimeZoneOffsetTest.xml
new file mode 100644
index 0000000..7d86f4e
--- /dev/null
+++ b/tests/cql/CQLTimeZoneOffsetTest.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://hl7.org/fhirpath/tests" xsi:schemaLocation="http://hl7.org/fhirpath/tests ../../testSchema/testSchema.xsd"
+       name="CqlTimeZoneOffsetTest" reference="https://cql.hl7.org/09-b-cqlreference.html#datetime-operators-2" version="1.4">
+    <capability code="timezone-offset"/>
+    <capability code="component-extraction"/>
+    <capability code="timezone-offset-policy.no-default-offset"/>
+    <group name="Policy: No default offset (preserve offset-less)" version="1.5">
+        <test name="DateTimeEquality_NoDefaultOffset_NullWhenComparingOffsetlessToOffset" version="1.5">
+            <capability code="timezone-offset"/>
+            <capability code="component-extraction"/>
+            <capability code="timezone-offset-policy.no-default-offset"/><!-- Offset-less vs explicit UTC -->
+            <expression>@2012-04-01T00:00 = @2012-04-01T00:00+00:00</expression>
+            <output>true</output>
+        </test>
+        <test name="TimezoneOffsetExtraction_NoDefaultOffset_ReturnsNull" version="1.5">
+            <capability code="timezone-offset"/>
+            <capability code="component-extraction"/>
+            <capability code="timezone-offset-policy.no-default-offset"/>
+            <expression>timezoneoffset from @2012-04-01T00:00</expression>
+            <output>true</output>
+        </test>
+        <test name="DateTimeOrdering_NoDefaultOffset_NullWhenOffsetlessVsOffset" version="1.5">
+            <capability code="timezone-offset"/>
+            <capability code="timezone-offset-policy.no-default-offset"/>
+            <expression>@2012-04-01T00:00 &lt; @2012-04-01T00:00+00:00</expression>
+            <output>true</output>
+        </test>
+    </group>
+    <group name="Policy: Default to server offset (normalize offset-less to server)">
+        <test name="TimezoneOffsetExtraction_DefaultServerOffset_MatchesServer" version="1.5">
+            <capability code="timezone-offset"/>
+            <capability code="component-extraction"/>
+            <capability code="timezone-offset-policy.default-server-offset"/>
+            <expression>(timezoneoffset from @2012-04-01T00:00) = (timezoneoffset from Now())</expression>
+            <output>true</output>
+        </test>
+        <test name="DateTimeEquality_DefaultServerOffset_EqualsWhenExplicitServerOffsetGiven" version="1.5">
+            <capability code="timezone-offset"/>
+            <capability code="timezone-offset-policy.default-server-offset"/>
+            <expression>@2012-04-01T00:00 = @2012-04-01T00:00{{SERVER_OFFSET_ISO}}</expression>
+            <output>true</output>
+        </test>
+        <test name="DateTimeOrdering_DefaultServerOffset_Deterministic" version="1.5">
+            <capability code="timezone-offset"/>
+            <capability code="timezone-offset-policy.default-server-offset"/>
+            <!-- If both normalize to the same instant, < is false -->
+            <expression>@2012-04-01T00:00 &lt; @2012-04-01T00:00{{SERVER_OFFSET_ISO}}</expression>
+            <output>false</output>
+        </test>
+    </group>
+</tests>

From 1e1a3e955bcc68ef2702665d835ec43220bcfd98 Mon Sep 17 00:00:00 2001
From: Bryant Austin <bryantaustin13@yahoo.com>
Date: Wed, 17 Dec 2025 11:24:56 -0700
Subject: [PATCH 2/3] commen/explanationt added for
 TimezoneOffsetExtraction_NoDefaultOffset_ReturnsNull

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

diff --git a/tests/cql/CQLTimeZoneOffsetTest.xml b/tests/cql/CQLTimeZoneOffsetTest.xml
index 7d86f4e..7799d34 100644
--- a/tests/cql/CQLTimeZoneOffsetTest.xml
+++ b/tests/cql/CQLTimeZoneOffsetTest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://hl7.org/fhirpath/tests" xsi:schemaLocation="http://hl7.org/fhirpath/tests ../../testSchema/testSchema.xsd"
-       name="CqlTimeZoneOffsetTest" reference="https://cql.hl7.org/09-b-cqlreference.html#datetime-operators-2" version="1.4">
+       name="" reference="https://cql.hl7.org/09-b-cqlreference.html#datetime-operators-2" version="1.4">
     <capability code="timezone-offset"/>
     <capability code="component-extraction"/>
     <capability code="timezone-offset-policy.no-default-offset"/>
@@ -16,6 +16,12 @@
             <capability code="timezone-offset"/>
             <capability code="component-extraction"/>
             <capability code="timezone-offset-policy.no-default-offset"/>
+            <!--
+            https://cql.hl7.org/02-authorsguide.html
+            Only DateTime values may specify a timezone offset, either as UTC (Z), or as a timezone offset. If no
+            timezone offset is specified, the timezone offset of the evaluation request timestamp is used.
+            Having true as expected is not correct with the current expression.
+            -->
             <expression>timezoneoffset from @2012-04-01T00:00</expression>
             <output>true</output>
         </test>

From f57d83e64891920842021cbeebd91267bfac653f Mon Sep 17 00:00:00 2001
From: Bryant Austin <bryantaustin13@yahoo.com>
Date: Tue, 24 Mar 2026 09:21:05 -0600
Subject: [PATCH 3/3] change of output to be more correct

---
 tests/cql/CQLTimeZoneOffsetTest.xml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/tests/cql/CQLTimeZoneOffsetTest.xml b/tests/cql/CQLTimeZoneOffsetTest.xml
index 7799d34..cfbb764 100644
--- a/tests/cql/CQLTimeZoneOffsetTest.xml
+++ b/tests/cql/CQLTimeZoneOffsetTest.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://hl7.org/fhirpath/tests" xsi:schemaLocation="http://hl7.org/fhirpath/tests ../../testSchema/testSchema.xsd"
-       name="" reference="https://cql.hl7.org/09-b-cqlreference.html#datetime-operators-2" version="1.4">
+       name="CQLTimeZoneOffsetTest" reference="https://cql.hl7.org/09-b-cqlreference.html#datetime-operators-2" version="1.4">
     <capability code="timezone-offset"/>
     <capability code="component-extraction"/>
     <capability code="timezone-offset-policy.no-default-offset"/>
     <group name="Policy: No default offset (preserve offset-less)" version="1.5">
+        <capability code="timezone-offset-policy.no-default-offset"/>
         <test name="DateTimeEquality_NoDefaultOffset_NullWhenComparingOffsetlessToOffset" version="1.5">
             <capability code="timezone-offset"/>
             <capability code="component-extraction"/>
             <capability code="timezone-offset-policy.no-default-offset"/><!-- Offset-less vs explicit UTC -->
-            <expression>@2012-04-01T00:00 = @2012-04-01T00:00+00:00</expression>
-            <output>true</output>
+            <expression>@2020-01-01T12:00:00.000 = @2020-01-01T12:00:00.000+06:00</expression>
+            <output>null</output><!-- Bad test:: Depending on what “If no timezone offset is specified, the timezone offset of the evaluation request timestamp is used.” -->
         </test>
         <test name="TimezoneOffsetExtraction_NoDefaultOffset_ReturnsNull" version="1.5">
             <capability code="timezone-offset"/>
@@ -23,22 +24,23 @@
             Having true as expected is not correct with the current expression.
             -->
             <expression>timezoneoffset from @2012-04-01T00:00</expression>
-            <output>true</output>
+            <output>null</output><!-- Bad test:: Depending on what “If no timezone offset is specified, the timezone offset of the evaluation request timestamp is used.” -->
         </test>
         <test name="DateTimeOrdering_NoDefaultOffset_NullWhenOffsetlessVsOffset" version="1.5">
             <capability code="timezone-offset"/>
             <capability code="timezone-offset-policy.no-default-offset"/>
             <expression>@2012-04-01T00:00 &lt; @2012-04-01T00:00+00:00</expression>
-            <output>true</output>
+            <output>null</output><!-- Bad test:: Depending on what “If no timezone offset is specified, the timezone offset of the evaluation request timestamp is used.” -->
         </test>
     </group>
-    <group name="Policy: Default to server offset (normalize offset-less to server)">
+    <group name="Policy: Default to server offset (normalize offset-less to server)" version="1.5">
+        <capability code="timezone-offset-policy.default-server-offset"/>
         <test name="TimezoneOffsetExtraction_DefaultServerOffset_MatchesServer" version="1.5">
             <capability code="timezone-offset"/>
             <capability code="component-extraction"/>
             <capability code="timezone-offset-policy.default-server-offset"/>
-            <expression>(timezoneoffset from @2012-04-01T00:00) = (timezoneoffset from Now())</expression>
-            <output>true</output>
+            <expression>(timezoneoffset from @2012-04-01T00:00) = (timezoneoffset from @2012-04-01T00:00{{SERVER_OFFSET_ISO}})</expression>
+            <output>true</output><!-- Bad test:: Depending on what “If no timezone offset is specified, the timezone offset of the evaluation request timestamp is used.” -->
         </test>
         <test name="DateTimeEquality_DefaultServerOffset_EqualsWhenExplicitServerOffsetGiven" version="1.5">
             <capability code="timezone-offset"/>