Skip to content

Commit

Permalink
Fixing up tests from the published spec (#1346)
Browse files Browse the repository at this point in the history
  • Loading branch information
@brynrhodes
brynrhodes authored Mar 21, 2024
1 parent 4586863 commit e7c722e
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 83 deletions.
10 changes: 10 additions & 0 deletions Src/java/engine-fhir/src/test/java/org/hl7/fhirpath/CQLOperationsR4Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,17 +112,25 @@ public static Object[][] dataMethod() {
"cql/CqlDateTimeOperatorsTest/Uncertainty tests/DurationInDaysA",
"cql/CqlDateTimeOperatorsTest/Uncertainty tests/DurationInDaysAA",
"cql/CqlDateTimeOperatorsTest/Uncertainty tests/TimeDurationBetweenHourDiffPrecision",
"cql/CqlIntervalOperatorsTest/Intersect/TestIntersectNull",
"cql/CqlIntervalOperatorsTest/Intersect/TestIntersectNull1",
"cql/CqlIntervalOperatorsTest/Intersect/TestIntersectNull2",
"cql/CqlIntervalOperatorsTest/Intersect/TestIntersectNull3",
"cql/CqlIntervalOperatorsTest/Intersect/TestIntersectNull4",
"cql/CqlIntervalOperatorsTest/Expand/ExpandIntervalPer2",
"cql/CqlIntervalOperatorsTest/Expand/ExpandPer0D1",
"cql/CqlIntervalOperatorsTest/Expand/ExpandPer1",
"cql/CqlIntervalOperatorsTest/Expand/ExpandPer2Days",
"cql/CqlIntervalOperatorsTest/Expand/ExpandPerMinute",
"cql/CqlListOperatorsTest/Contains/ContainsABNullHasNull",
"cql/CqlListOperatorsTest/Distinct/DistinctANullANull",
"cql/CqlListOperatorsTest/Distinct/DistinctNullNullNull",
"cql/CqlListOperatorsTest/Equivalent/Equivalent123AndABC",
"cql/CqlListOperatorsTest/Equivalent/Equivalent123AndString123",
"cql/CqlListOperatorsTest/Equivalent/EquivalentABCAnd123",
"cql/CqlListOperatorsTest/Flatten/FlattenListNullAndNull",
"cql/CqlListOperatorsTest/In/InNullAnd1Null",
"cql/CqlListOperatorsTest/In/InNullEmpty",
"cql/CqlListOperatorsTest/IncludedIn/IncludedInNullRight",
"cql/CqlListOperatorsTest/Includes/IncludesNullLeft",
"cql/CqlListOperatorsTest/Includes/IncludesNullRight",
Expand All @@ -142,7 +150,9 @@ public static Object[][] dataMethod() {
"cql/CqlTypeOperatorsTest/As/CastAsQuantity",
"cql/CqlTypeOperatorsTest/Convert/StringToDateTimeMalformed",
"cql/CqlTypeOperatorsTest/Convert/StringToIntegerError",
"cql/CqlTypeOperatorsTest/ToDateTime/ToDateTimeDate",
"cql/CqlTypeOperatorsTest/ToDateTime/ToDateTimeMalformed",
"cql/CqlTypeOperatorsTest/ToDateTime/ToDateTimeTimeUnspecified",
"cql/CqlTypeOperatorsTest/ToTime/ToTime2",
"cql/CqlTypeOperatorsTest/ToTime/ToTime3",
"cql/CqlTypeOperatorsTest/ToTime/ToTime4",
Expand Down
31 changes: 20 additions & 11 deletions Src/java/engine-fhir/src/test/resources/org/hl7/fhirpath/cql/CqlComparisonOperatorsTest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
<test name="QuantityEqCM1M01">
<expression>1'cm' = 0.01'm'</expression>
<output>true</output>
<!-- TODO: make Engine convert units properly -->
</test>
<test name="QuantityEqDiffPrecision">
<expression>2.0'cm' = 2.00'cm'</expression>
Expand Down Expand Up @@ -133,6 +132,10 @@
<expression>@2014-01-25T14:30:14.559+01:00 = @2014-01-25T14:30:14.559+01:00</expression>
<output>true</output>
</test>
<test name="DateTimeDayCompare">
<expression>@2022-02-22T00:00:00.000-05:00 same day as @2022-02-22T04:59:00.000Z</expression>
<output>true</output>
</test>
<test name="TimeEq10A10A">
<expression>@T10:00:00.000 = @T10:00:00.000</expression>
<output>true</output>
Expand Down Expand Up @@ -167,6 +170,10 @@
<expression>0.0 &gt; -1.0</expression>
<output>true</output>
</test>
<test name="GreaterDec1Int2">
<expression>1.0 &gt; 2</expression>
<output>false</output>
</test>
<test name="GreaterCM0CM0">
<expression>0'cm' &gt; 0'cm'</expression>
<output>false</output>
Expand All @@ -182,12 +189,10 @@
<test name="GreaterM1CM1">
<expression>1'm' &gt; 1'cm'</expression>
<output>true</output>
<!-- TODO: make Engine convert units properly -->
</test>
<test name="GreaterM1CM10">
<expression>1'm' &gt; 10'cm'</expression>
<output>true</output>
<!-- TODO: make Engine convert units properly -->
</test>
<test name="GreaterAA">
<expression>'a' &gt; 'a'</expression>
Expand Down Expand Up @@ -267,6 +272,10 @@
<expression>0.0 &gt;= -1.0</expression>
<output>true</output>
</test>
<test name="GreaterOrEqualDec1Int2">
<expression>1.0 &gt;= 2</expression>
<output>false</output>
</test>
<test name="GreaterOrEqualCM0CM0">
<expression>0'cm' &gt;= 0'cm'</expression>
<output>true</output>
Expand All @@ -282,12 +291,10 @@
<test name="GreaterOrEqualM1CM1">
<expression>1'm' &gt;= 1'cm'</expression>
<output>true</output>
<!-- TODO: make Engine convert units properly; note, only passes by coincidence -->
</test>
<test name="GreaterOrEqualM1CM10">
<expression>1'm' &gt;= 10'cm'</expression>
<output>true</output>
<!-- TODO: make Engine convert units properly -->
</test>
<test name="GreaterOrEqualAA">
<expression>'a' &gt;= 'a'</expression>
Expand Down Expand Up @@ -375,6 +382,10 @@
<expression>0.0 &lt; -1.0</expression>
<output>false</output>
</test>
<test name="LessDec1Int2">
<expression>1.0 &lt; 2</expression>
<output>true</output>
</test>
<test name="LessCM0CM0">
<expression>0'cm' &lt; 0'cm'</expression>
<output>false</output>
Expand All @@ -390,12 +401,10 @@
<test name="LessM1CM1">
<expression>1'm' &lt; 1'cm'</expression>
<output>false</output>
<!-- TODO: make Engine convert units properly; note, only works by coincidence -->
</test>
<test name="LessM1CM10">
<expression>1'm' &lt; 10'cm'</expression>
<output>false</output>
<!-- TODO: make Engine convert units properly -->
</test>
<test name="LessAA">
<expression>'a' &lt; 'a'</expression>
Expand Down Expand Up @@ -475,6 +484,10 @@
<expression>0.0 &lt;= -1.0</expression>
<output>false</output>
</test>
<test name="LessOrEqualDec1Int2">
<expression>1.0 &lt;= 2</expression>
<output>true</output>
</test>
<test name="LessOrEqualCM0CM0">
<expression>0'cm' &lt;= 0'cm'</expression>
<output>true</output>
Expand All @@ -490,12 +503,10 @@
<test name="LessOrEqualM1CM1">
<expression>1'm' &lt;= 1'cm'</expression>
<output>false</output>
<!-- TODO: make Engine convert units properly -->
</test>
<test name="LessOrEqualM1CM10">
<expression>1'm' &lt;= 10'cm'</expression>
<output>false</output>
<!-- TODO: make Engine convert units properly -->
</test>
<test name="LessOrEqualAA">
<expression>'a' &lt;= 'a'</expression>
Expand Down Expand Up @@ -626,7 +637,6 @@
<test name="EquivEqCM1M01">
<expression>1'cm' ~ 0.01'm'</expression>
<output>true</output>
<!-- TODO: make Engine convert units properly -->
</test>
<test name="EquivTupleJohnJohn">
<expression>Tuple { Id : 1, Name : 'John' } ~ Tuple { Id : 1, Name : 'John' }</expression>
Expand Down Expand Up @@ -729,7 +739,6 @@
<test name="QuantityNotEqCM1M01">
<expression>1'cm' != 0.01'm'</expression>
<output>false</output>
<!-- TODO: make Engine convert units properly -->
</test>
<test name="TupleNotEqJohnJohn">
<expression>Tuple{ Id : 1, Name : 'John' } != Tuple{ Id : 1, Name : 'John' }</expression>
Expand Down
67 changes: 0 additions & 67 deletions ...ngine-fhir/src/test/resources/org/hl7/fhirpath/cql/CqlComparisonOperatorsTestsFailing.xml
View file

This file was deleted.

19 changes: 17 additions & 2 deletions Src/java/engine-fhir/src/test/resources/org/hl7/fhirpath/cql/CqlIntervalOperatorsTest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -666,8 +666,23 @@
<group name="Intersect">
<test name="TestIntersectNull">
<expression>Interval[1, 10] intersect Interval[5, null)</expression>
<output>null</output>
<!-- TODO: Fix CQL Engine to not throw a java.lang.NullPointerException -->
<output>Interval[5, null)</output>
</test>
<test name="TestIntersectNull1">
<expression>start of (Interval[1, 10] intersect Interval[5, null)) &lt;= 10</expression>
<output>true</output>
</test>
<test name="TestIntersectNull2">
<expression>start of (Interval[1, 10] intersect Interval[5, null)) &gt;= 5</expression>
<output>true</output>
</test>
<test name="TestIntersectNull3">
<expression>start of (Interval[1, 10] intersect Interval[5, null)) &gt; 10</expression>
<output>false</output>
</test>
<test name="TestIntersectNull4">
<expression>start of (Interval[1, 10] intersect Interval[5, null)) &lt; 5</expression>
<output>false</output>
</test>
<test name="IntegerIntervalIntersectTest4to10">
<expression>Interval[1, 10] intersect Interval[4, 10]</expression>
Expand Down
6 changes: 3 additions & 3 deletions Src/java/engine-fhir/src/test/resources/org/hl7/fhirpath/cql/CqlListOperatorsTest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<group name="Contains">
<test name="ContainsABNullHasNull">
<expression>{ 'a', 'b', null } contains null</expression>
<output>null</output>
<output>true</output>
</test>
<test name="ContainsNullFirst">
<expression>{ null, 'b', 'c' } contains 'a'</expression>
Expand Down Expand Up @@ -279,11 +279,11 @@
<group name="In">
<test name="InNullEmpty">
<expression>null in {}</expression>
<output>null</output>
<output>false</output>
</test>
<test name="InNullAnd1Null">
<expression>null in { 1, null }</expression>
<output>null</output>
<output>true</output>
</test>
<test name="In1Null">
<expression>1 in null</expression>
Expand Down
8 changes: 8 additions & 0 deletions Src/java/engine-fhir/src/test/resources/org/hl7/fhirpath/cql/CqlTypeOperatorsTest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,14 @@
<expression invalid="true">ToDateTime('2014/01/01T12:05:05.955Z')</expression>
<!-- EXPECT: Invalid format: "2014/01/01T12:05:05.955" is malformed at "/01/01T12:05:05.955" -->
</test>
<test name="ToDateTimeDate">
<expression>ToDateTime(@2014-01-01)</expression>
<output>@2014-01-01T</output>
</test>
<test name="ToDateTimeTimeUnspecified">
<expression>hour from ToDateTime(@2014-01-01) is null</expression>
<output>true</output>
</test>
</group>
<group name="ToDecimal">
<test name="String25D5ToDecimal">
Expand Down
4 changes: 4 additions & 0 deletions Src/java/engine-fhir/src/test/resources/org/hl7/fhirpath/cql/CqlTypesTest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@
<expression>DateTime(9999, 12, 31, 23, 59, 59, 999)</expression>
<output>@9999-12-31T23:59:59.999</output>
</test>
<test name="DateTimeTimeUnspecified">
<expression>hour from @2015-02-10T is null</expression>
<output>true</output>
</test>
</group>
<group name="Decimal">
<!-- REPLACED BY TestIsolatedCqlExprs : ValueLiteralsAndSelectors.xml
Expand Down

0 comments on commit e7c722e

Please sign in to comment.