Fix list equality logic

cqframework · Jul 23, 2024 · 96b04c1 · 96b04c1
1 parent 179c762
commit 96b04c1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/Src/java/engine-fhir/src/test/java/org/hl7/fhirpath/CQLOperationsR4Test.java b/Src/java/engine-fhir/src/test/java/org/hl7/fhirpath/CQLOperationsR4Test.java
@@ -108,7 +108,6 @@ public static Object[][] dataMethod() {
             "cql/CqlListOperatorsTest/Equivalent/Equivalent123AndABC",
             "cql/CqlListOperatorsTest/Equivalent/Equivalent123AndString123",
             "cql/CqlListOperatorsTest/Equivalent/EquivalentABCAnd123",
-            "cql/CqlListOperatorsTest/Flatten/FlattenListNullAndNull",
             "cql/CqlListOperatorsTest/NotEqual/NotEqual123AndABC",
             "cql/CqlListOperatorsTest/NotEqual/NotEqual123AndString123",
             "cql/CqlListOperatorsTest/NotEqual/NotEqualABCAnd123",

diff --git a/Src/java/engine-fhir/src/test/resources/org/hl7/fhirpath/cql/CqlListOperatorsTest.xml b/Src/java/engine-fhir/src/test/resources/org/hl7/fhirpath/cql/CqlListOperatorsTest.xml
@@ -129,7 +129,7 @@
 	<group name="Equal">
 		<test name="EqualNullNull">
 			<expression>{null} = {null}</expression>
-			<output>null</output>
+			<output>true</output>
 		</test>
 		<test name="EqualEmptyListNull">
 			<expression>{} as List&lt;String&gt; = null</expression>

diff --git a/Src/java/engine/src/main/java/org/opencds/cqf/cql/engine/runtime/CqlList.java b/Src/java/engine/src/main/java/org/opencds/cqf/cql/engine/runtime/CqlList.java
@@ -109,6 +109,9 @@ public static Boolean equal(Iterable<?> left, Iterable<?> right, State state) {
                 if (leftObject instanceof Iterable && rightObject instanceof Iterable) {
                     return equal((Iterable<?>) leftObject, (Iterable<?>) rightObject, state);
                 }
+                if (leftObject == null && rightObject == null) {
+                    return true;
+                }
                 Boolean elementEquals = EqualEvaluator.equal(leftObject, rightObject, state);
                 if (elementEquals == null || !elementEquals) {
                     return elementEquals;

diff --git a/Src/java/engine/src/test/java/org/opencds/cqf/cql/engine/execution/ListOperatorsTest.java b/Src/java/engine/src/test/java/org/opencds/cqf/cql/engine/execution/ListOperatorsTest.java
@@ -164,7 +164,7 @@ void all_interval_operators() {
         assertThat(((List<?>) value).size(), is(2));
 
         value = results.forExpression("EqualNullNull").value();
-        assertThat(value, is(nullValue()));
+        assertThat(value, is(true));
 
         value = results.forExpression("EqualEmptyListNull").value();
         assertThat(value, is(nullValue()));