diff --git a/tests/cql/CqlDateTimeOperatorsTest.xml b/tests/cql/CqlDateTimeOperatorsTest.xml index 08e060e..269bf32 100644 --- a/tests/cql/CqlDateTimeOperatorsTest.xml +++ b/tests/cql/CqlDateTimeOperatorsTest.xml @@ -809,7 +809,7 @@ years between DateTime(2005) and DateTime(2010) - Interval[ 4, 5 ] + Interval[4, 5] + currently Equivalent() results in null from comparing with an Interval. + NOTE: this should pass when this issue is fixed https://github.com/cqframework/clinical-reasoning/issues/947#issue-4013077176 --> (days between DateTime(2014, 1, 15) and DateTime(2014, 2)) - (months between DateTime(2005) and DateTime(2006, 5)) - Interval[ 0, 40 ] + Interval[13, 28] + collapse { Interval[1,2], Interval[3,7], Interval[10,19], Interval[7,10] } - {Interval [ 1, 19 ]} + {interval [1, 19]} + collapse { Interval[4,6], Interval[7,8] } - {Interval [ 4, 8 ]} + {interval [4, 8]} + collapse { Interval[1.0,5.0], Interval[3.0,7.0], Interval[12.0,19.0], Interval[7.0,10.0] } - {Interval [ 1.0, 10.0 ], Interval [ 12.0, 19.0 ]} + {interval [1.0, 10.0], interval [12.0, 19.0]} + collapse { Interval[4.0,6.0], Interval[6.00000001,8.0] } - {Interval [ 4.0, 8.0 ]} + {interval [4.0, 8.0]} + collapse { Interval[1.0 'g',5.0 'g'], Interval[3.0 'g',7.0 'g'], Interval[12.0 'g',19.0 'g'], Interval[7.0 'g',10.0 'g'] } - {Interval [ 1.0 'g', 10.0 'g' ], Interval [ 12.0 'g', 19.0 'g' ]} + {interval [1.0 'g', 10.0 'g'], interval [12.0 'g', 19.0 'g']} collapse { Interval[DateTime(2012, 1, 1), DateTime(2012, 1, 15)], Interval[DateTime(2012, 1, 10), DateTime(2012, 1, 25)], Interval[DateTime(2012, 5, 10), DateTime(2012, 5, 25)], Interval[DateTime(2012, 5, 20), DateTime(2012, 5, 30)] } - {Interval [ @2012-01-01T, @2012-01-25T ], Interval [ @2012-05-10T, @2012-05-30T ]} + {interval [@2012-01-01T, @2012-01-25T], interval [@2012-05-10T, @2012-05-30T]} collapse { Interval[DateTime(2012, 1, 1), DateTime(2012, 1, 15)], Interval[DateTime(2012, 1, 16), DateTime(2012, 5, 25)] } - {Interval [ @2012-01-01T, @2012-05-25T ]} + {interval [@2012-01-01T, @2012-05-25T]} collapse { Interval[@T01:59:59.999, @T10:59:59.999], Interval[@T08:59:59.999, @T15:59:59.999], Interval[@T17:59:59.999, @T20:59:59.999], Interval[@T18:59:59.999, @T22:59:59.999] } - {Interval [ @T01:59:59.999, @T15:59:59.999 ], Interval [ @T17:59:59.999, @T22:59:59.999 ]} + {interval [@T01:59:59.999, @T15:59:59.999], interval [@T17:59:59.999, @T22:59:59.999]} collapse { Interval[@T01:59:59.999, @T10:59:59.999], Interval[@T11:00:00.000, @T15:59:59.999] } - {Interval [ @T01:59:59.999, @T15:59:59.999 ]} + {interval [@T01:59:59.999, @T15:59:59.999]} @@ -385,13 +390,14 @@ - expand { Interval[10, 10] } per 0.1 - { Interval[10.0, 10.0], Interval[10.1, 10.1], Interval[10.2, 10.2], Interval[10.3, 10.3], Interval[10.4, 10.4], Interval[10.5, 10.5], Interval[10.6, 10.6], Interval[10.7, 10.7], Interval[10.8, 10.8], Interval[10.9, 10.9] } + expand { Interval[10.0, 11.0] } per 0.1 + { Interval[10.0, 10.0], Interval[10.1, 10.1], Interval[10.2, 10.2], Interval[10.3, 10.3], Interval[10.4, 10.4], Interval[10.5, 10.5], Interval[10.6, 10.6], Interval[10.7, 10.7], Interval[10.8, 10.8], Interval[10.9, 10.9], Interval[11.0, 11.0] } + - expand Interval[10, 10] per 0.1 - { 10.0, 10.1, 10.2, 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.9 } + expand Interval[10.0, 11.0] per 0.1 + { 10.0, 10.1, 10.2, 10.3, 10.4, 10.5, 10.6, 10.7, 10.8, 10.9, 11.0 } @@ -661,7 +667,7 @@ Interval[1, 10] except Interval[4, 10] - Interval [ 1, 3 ] + interval [1, 3] @@ -671,7 +677,7 @@ Interval[1.0, 10.0] except Interval[4.0, 10.0] - Interval [ 1.0, 3.99999999 ] + interval [1.0, 3.99999999] @@ -681,32 +687,32 @@ Interval[1.0 'g', 10.0 'g'] except Interval[5.0 'g', 10.0 'g'] - Interval [ 1.0 'g', 4.99999999 'g' ] + interval [1.0 'g', 4.99999999 'g'] Interval[1, 4] except Interval[3, 6] - Interval [ 1, 2 ] + interval [1, 2] Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 15)] except Interval[DateTime(2012, 1, 7), DateTime(2012, 1, 15)] - Interval [ @2012-01-05T, @2012-01-06T ] + interval [@2012-01-05T, @2012-01-06T] Interval[DateTime(2012, 1, 7), DateTime(2012, 1, 16)] except Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 12)] - Interval [ @2012-01-13T, @2012-01-16T ] + interval [@2012-01-13T, @2012-01-16T] Interval[@T05:59:59.999, @T10:59:59.999] except Interval[@T08:59:59.999, @T10:59:59.999] - Interval [ @T05:59:59.999, @T08:59:59.998 ] + interval [@T05:59:59.999, @T08:59:59.998] Interval[@T08:59:59.999, @T11:59:59.999] except Interval[@T05:59:59.999, @T10:59:59.999] - Interval [ @T11:00:00.000, @T11:59:59.999 ] + interval [@T11:00:00.000, @T11:59:59.999] @@ -779,12 +785,12 @@ Interval[@2017-12-20T11:00:00, @2017-12-21T21:00:00] - Interval [ @2017-12-20T11:00:00, @2017-12-21T21:00:00 ] + interval [@2017-12-20T11:00:00, @2017-12-21T21:00:00] Interval[@2017-12-20T10:30:00, @2017-12-20T12:00:00] - Interval [ @2017-12-20T10:30:00, @2017-12-20T12:00:00 ] + interval [@2017-12-20T10:30:00, @2017-12-20T12:00:00] @@ -957,7 +963,7 @@ Interval[1, 10] intersect Interval[4, 10] - Interval [ 4, 10 ] + interval [4, 10] @@ -967,7 +973,7 @@ Interval[1.0, 10.0] intersect Interval[4.0, 10.0] - Interval [ 4.0, 10.0 ] + interval [4.0, 10.0] @@ -977,7 +983,7 @@ Interval[1.0 'g', 10.0 'g'] intersect Interval[5.0 'g', 10.0 'g'] - Interval [ 5.0 'g', 10.0 'g' ] + interval [5.0 'g', 10.0 'g'] @@ -987,12 +993,12 @@ Interval[DateTime(2012, 1, 7), DateTime(2012, 1, 14)] intersect Interval[DateTime(2012, 1, 7), DateTime(2012, 1, 10)] - Interval [ @2012-01-07T, @2012-01-10T ] + interval [@2012-01-07T, @2012-01-10T] Interval[@T04:59:59.999, @T09:59:59.999] intersect Interval[@T04:59:59.999, @T06:59:59.999] - Interval [ @T04:59:59.999, @T06:59:59.999 ] + interval [@T04:59:59.999, @T06:59:59.999] @@ -1998,7 +2004,7 @@ Interval[1, 10] union Interval[4, 15] - Interval [ 1, 15 ] + interval [1, 15] @@ -2008,7 +2014,7 @@ Interval[1.0, 10.0] union Interval[4.0, 15.0] - Interval [ 1.0, 15.0 ] + interval [1.0, 15.0] @@ -2018,7 +2024,7 @@ Interval[1.0 'g', 10.0 'g'] union Interval[5.0 'g', 15.0 'g'] - Interval [ 1.0 'g', 15.0 'g' ] + interval [1.0 'g', 15.0 'g'] @@ -2028,7 +2034,7 @@ Interval[DateTime(2012, 1, 5), DateTime(2012, 1, 25)] union Interval[DateTime(2012, 1, 25), DateTime(2012, 1, 28)] - Interval [ @2012-01-05T, @2012-01-28T ] + interval [@2012-01-05T, @2012-01-28T] @@ -2038,7 +2044,7 @@ Interval[@T05:59:59.999, @T15:59:59.999] union Interval[@T10:59:59.999, @T20:59:59.999] - Interval [ @T05:59:59.999, @T20:59:59.999 ] + interval [@T05:59:59.999, @T20:59:59.999] @@ -2158,16 +2164,19 @@ Interval[@2016-05-01T00:00:00.000, @2016-05-02T00:00:00.000] Interval[@2016-05-01T00:00:00.000, @2016-05-02T00:00:00.000] + Interval[@T00:00:00.000, @T23:59:59.599] Interval[@T00:00:00.000, @T23:59:59.599] + {Interval[1, 10], Interval[11, 20], Interval[44, 50]} {Interval[1, 10], Interval[11, 20], Interval[44, 50]} +