Skip to content

Commit 13e7cdf

Browse files
brynrhodesbrynrhodes
authored
Merge pull request #76 from bryantaustin13/issue75-Capture-version-information-correctly
Issue 75 Capture version information correctly
2 parents 6e013ad + 5d470c8 commit 13e7cdf

17 files changed

+1920
-1905
lines changed

‎tests/cql/CqlAggregateFunctionsTest.xml‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,232 +1,232 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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"
3-
name="CqlAggregateFunctionsTest" reference="https://cql.hl7.org/09-b-cqlreference.html#aggregate-functions">
4-
<group name="AllTrue">
5-
<test name="AllTrueAllTrue">
3+
name="CqlAggregateFunctionsTest" reference="https://cql.hl7.org/09-b-cqlreference.html#aggregate-functions" version="1.5">
4+
<group name="AllTrue" version="1.5">
5+
<test name="AllTrueAllTrue" version="1.5">
66
<expression>AllTrue({true,true})</expression>
77
<output>true</output>
88
</test>
9-
<test name="AllTrueTrueFirst">
9+
<test name="AllTrueTrueFirst" version="1.5">
1010
<expression>AllTrue({true,false})</expression>
1111
<output>false</output>
1212
</test>
13-
<test name="AllTrueFalseFirst">
13+
<test name="AllTrueFalseFirst" version="1.5">
1414
<expression>AllTrue({false,true})</expression>
1515
<output>false</output>
1616
</test>
17-
<test name="AllTrueAllTrueFalseTrue">
17+
<test name="AllTrueAllTrueFalseTrue" version="1.5">
1818
<expression>AllTrue({true,false,true})</expression>
1919
<output>false</output>
2020
</test>
21-
<test name="AllTrueAllFalseTrueFalse">
21+
<test name="AllTrueAllFalseTrueFalse" version="1.5">
2222
<expression>AllTrue({false,true,false})</expression>
2323
<output>false</output>
2424
</test>
25-
<test name="AllTrueNullFirst">
25+
<test name="AllTrueNullFirst" version="1.5">
2626
<expression>AllTrue({null,true,true})</expression>
2727
<output>true</output>
2828
</test>
29-
<test name="AllTrueEmptyList">
29+
<test name="AllTrueEmptyList" version="1.5">
3030
<expression>AllTrue({})</expression>
3131
<output>true</output>
3232
</test>
33-
<test name="AllTrueIsTrueWhenNull">
33+
<test name="AllTrueIsTrueWhenNull" version="1.5">
3434
<expression>AllTrue(null)</expression>
3535
<output>true</output>
3636
</test>
3737
</group>
38-
<group name="AnyTrue">
39-
<test name="AnyTrueAllTrue">
38+
<group name="AnyTrue" version="1.5">
39+
<test name="AnyTrueAllTrue" version="1.5">
4040
<expression>AnyTrue({true,true})</expression>
4141
<output>true</output>
4242
</test>
43-
<test name="AnyTrueAllFalse">
43+
<test name="AnyTrueAllFalse" version="1.5">
4444
<expression>AnyTrue({false,false})</expression>
4545
<output>false</output>
4646
</test>
47-
<test name="AnyTrueAllTrueFalseTrue">
47+
<test name="AnyTrueAllTrueFalseTrue" version="1.5">
4848
<expression>AnyTrue({true,false,true})</expression>
4949
<output>true</output>
5050
</test>
51-
<test name="AnyTrueAllFalseTrueFalse">
51+
<test name="AnyTrueAllFalseTrueFalse" version="1.5">
5252
<expression>AnyTrue({false,true,false})</expression>
5353
<output>true</output>
5454
</test>
55-
<test name="AnyTrueTrueFirst">
55+
<test name="AnyTrueTrueFirst" version="1.5">
5656
<expression>AnyTrue({true,false})</expression>
5757
<output>true</output>
5858
</test>
59-
<test name="AnyTrueFalseFirst">
59+
<test name="AnyTrueFalseFirst" version="1.5">
6060
<expression>AnyTrue({false,true})</expression>
6161
<output>true</output>
6262
</test>
63-
<test name="AnyTrueNullFirstThenTrue">
63+
<test name="AnyTrueNullFirstThenTrue" version="1.5">
6464
<expression>AnyTrue({null,true})</expression>
6565
<output>true</output>
6666
</test>
67-
<test name="AnyTrueNullFirstThenFalse">
67+
<test name="AnyTrueNullFirstThenFalse" version="1.5">
6868
<expression>AnyTrue({null,false})</expression>
6969
<output>false</output>
7070
</test>
71-
<test name="AnyTrueEmptyList">
71+
<test name="AnyTrueEmptyList" version="1.5">
7272
<expression>AnyTrue({})</expression>
7373
<output>false</output>
7474
</test>
75-
<test name="AnyTrueIsFalseWhenNull">
75+
<test name="AnyTrueIsFalseWhenNull" version="1.5">
7676
<expression>AnyTrue(null)</expression>
7777
<output>false</output>
7878
</test>
7979
</group>
80-
<group name="Avg">
81-
<test name="AvgTest1">
80+
<group name="Avg" version="1.5">
81+
<test name="AvgTest1" version="1.5">
8282
<expression>Avg({ 1.0, 2.0, 3.0, 6.0 })</expression>
8383
<output>3.0</output>
8484
</test>
8585
</group>
86-
<group name="Product">
87-
<test name="ProductLong">
86+
<group name="Product" version="1.5">
87+
<test name="ProductLong" version="1.5">
8888
<expression>Product({5L, 4L, 5L})</expression>
8989
<output>100L</output>
9090
</test>
9191
</group>
92-
<group name="Count">
93-
<test name="CountTest1">
92+
<group name="Count" version="1.5">
93+
<test name="CountTest1" version="1.5">
9494
<expression>Count({ 15, 5, 99, null, 1 })</expression>
9595
<output>4</output>
9696
</test>
97-
<test name="CountTestDateTime">
97+
<test name="CountTestDateTime" version="1.5">
9898
<expression>Count({ DateTime(2014), DateTime(2001), DateTime(2010) })</expression>
9999
<output>3</output>
100100
</test>
101-
<test name="CountTestTime">
101+
<test name="CountTestTime" version="1.5">
102102
<expression>Count({ @T15:59:59.999, @T05:59:59.999, @T20:59:59.999 })</expression>
103103
<output>3</output>
104104
</test>
105-
<test name="CountTestNull">
105+
<test name="CountTestNull" version="1.5">
106106
<expression>Count({})</expression>
107107
<output>0</output>
108108
</test>
109109
</group>
110-
<group name="Max">
111-
<test name="MaxTestInteger">
110+
<group name="Max" version="1.5">
111+
<test name="MaxTestInteger" version="1.5">
112112
<expression>Max({ 5, 12, 1, 15, 0, 4, 90, 44 })</expression>
113113
<output>90</output>
114114
</test>
115-
<test name="MaxTestLong">
115+
<test name="MaxTestLong" version="1.5">
116116
<expression>Max({ 5L, 12L, 1L, 15L, 0L, 4L, 90L, 44L })</expression>
117117
<output>90L</output>
118118
</test>
119-
<test name="MaxTestString">
119+
<test name="MaxTestString" version="1.5">
120120
<expression>Max({ 'hi', 'bye', 'zebra' })</expression>
121121
<output>'zebra'</output>
122122
</test>
123-
<test name="MaxTestDateTime">
123+
<test name="MaxTestDateTime" version="1.5">
124124
<expression>Max({ DateTime(2012, 10, 5), DateTime(2012, 9, 5), DateTime(2012, 10, 6) })</expression>
125125
<output>@2012-10-06T</output>
126126
</test>
127-
<test name="MaxTestTime">
127+
<test name="MaxTestTime" version="1.5">
128128
<expression>Max({ @T15:59:59.999, @T05:59:59.999, @T20:59:59.999 })</expression>
129129
<output>@T20:59:59.999</output>
130130
</test>
131131
</group>
132-
<group name="Median">
133-
<test name="MedianTestDecimal">
132+
<group name="Median" version="1.5">
133+
<test name="MedianTestDecimal" version="1.5">
134134
<expression>Median({6.0, 5.0, 4.0, 3.0, 2.0, 1.0})</expression>
135135
<output>3.5</output>
136136
</test>
137137
</group>
138-
<group name="Min">
139-
<test name="MinTestInteger">
138+
<group name="Min" version="1.5">
139+
<test name="MinTestInteger" version="1.5">
140140
<expression>Min({5, 12, 1, 15, 0, 4, 90, 44})</expression>
141141
<output>0</output>
142142
</test>
143-
<test name="MinTestLong">
143+
<test name="MinTestLong" version="1.5">
144144
<expression>Min({5L, 12L, 1L, 15L, 0L, 4L, 90L, 44L})</expression>
145145
<output>0L</output>
146146
</test>
147-
<test name="MinTestString">
147+
<test name="MinTestString" version="1.5">
148148
<expression>Min({'hi', 'bye', 'zebra'})</expression>
149149
<output>'bye'</output>
150150
</test>
151-
<test name="MinTestDateTime">
151+
<test name="MinTestDateTime" version="1.5">
152152
<expression>Min({ DateTime(2012, 10, 5), DateTime(2012, 9, 5), DateTime(2012, 10, 6) })</expression>
153153
<output>@2012-09-05T</output>
154154
</test>
155-
<test name="MinTestTime">
155+
<test name="MinTestTime" version="1.5">
156156
<expression>Min({ @T15:59:59.999, @T05:59:59.999, @T20:59:59.999 })</expression>
157157
<output>@T05:59:59.999</output>
158158
</test>
159159
</group>
160-
<group name="Mode">
161-
<test name="ModeTestInteger">
160+
<group name="Mode" version="1.5">
161+
<test name="ModeTestInteger" version="1.5">
162162
<expression>Mode({ 2, 1, 8, 2, 9, 1, 9, 9 })</expression>
163163
<output>9</output>
164164
</test>
165-
<test name="ModeTestDateTime">
165+
<test name="ModeTestDateTime" version="1.5">
166166
<expression>Mode({ DateTime(2012, 10, 5), DateTime(2012, 9, 5), DateTime(2012, 10, 6), DateTime(2012, 9, 5) })</expression>
167167
<output>@2012-09-05T</output>
168168
</test>
169-
<test name="ModeTestDateTime2">
169+
<test name="ModeTestDateTime2" version="1.5">
170170
<expression>Mode({ DateTime(2012, 10, 5), DateTime(2012, 10, 5), DateTime(2012, 10, 6), DateTime(2012, 9, 5) })</expression>
171171
<output>@2012-10-05T</output>
172172
</test>
173-
<test name="ModeTestTime">
173+
<test name="ModeTestTime" version="1.5">
174174
<expression>Mode({ @T15:59:59.999, @T05:59:59.999, @T20:59:59.999, @T05:59:59.999 })</expression>
175175
<output>@T05:59:59.999</output>
176176
</test>
177177
</group>
178-
<group name="PopulationStdDev">
179-
<test name="PopStdDevTest1">
178+
<group name="PopulationStdDev" version="1.5">
179+
<test name="PopStdDevTest1" version="1.5">
180180
<expression>PopulationStdDev({ 1.0, 2.0, 3.0, 4.0, 5.0 })</expression>
181181
<output>1.41421356</output>
182182
<!-- 23730951454746218587388284504413604736328125 -->
183183
</test>
184-
<test name="PopulationStdDevIsNull">
184+
<test name="PopulationStdDevIsNull" version="1.5">
185185
<expression>PopulationStdDev({ null as Quantity, null as Quantity, null as Quantity })</expression>
186186
<output>null</output>
187187
</test>
188188
</group>
189-
<group name="PopulationVariance">
190-
<test name="PopVarianceTest1">
189+
<group name="PopulationVariance" version="1.5">
190+
<test name="PopVarianceTest1" version="1.5">
191191
<expression>PopulationVariance({ 1.0, 2.0, 3.0, 4.0, 5.0 })</expression>
192192
<output>2.0</output>
193193
</test>
194-
<test name="PopVarianceIsNull">
194+
<test name="PopVarianceIsNull" version="1.5">
195195
<expression>PopulationVariance({ null as Quantity, null as Quantity, null as Quantity })</expression>
196196
<output>null</output>
197197
</test>
198198
</group>
199-
<group name="StdDev">
200-
<test name="StdDevTest1">
199+
<group name="StdDev" version="1.5">
200+
<test name="StdDevTest1" version="1.5">
201201
<expression>StdDev({ 1.0, 2.0, 3.0, 4.0, 5.0 })</expression>
202202
<output>1.58113883</output>
203203
<!-- 00841897613935316257993690669536590576171875 -->
204204
</test>
205-
<test name="StdDevIsNull">
205+
<test name="StdDevIsNull" version="1.5">
206206
<expression>StdDev({ null as Quantity, null as Quantity, null as Quantity })</expression>
207207
<output>null</output>
208208
</test>
209209
</group>
210-
<group name="Sum">
211-
<test name="SumTest1">
210+
<group name="Sum" version="1.5">
211+
<test name="SumTest1" version="1.5">
212212
<expression>Sum({ 6.0, 2.0, 3.0, 4.0, 5.0 })</expression>
213213
<output>20.0</output>
214214
</test>
215-
<test name="SumTestLong">
215+
<test name="SumTestLong" version="1.5">
216216
<expression>Sum({ 6L, 2L, 3L, 4L, 5L })</expression>
217217
<output>20L</output>
218218
</test>
219-
<test name="SumTestQuantity">
219+
<test name="SumTestQuantity" version="1.5">
220220
<expression>Sum({1 'ml',2 'ml',3 'ml',4 'ml',5 'ml'})</expression>
221221
<output>15 'ml'</output>
222222
</test>
223-
<test name="SumTestNull">
223+
<test name="SumTestNull" version="1.5">
224224
<expression>Sum({ null, 1, null })</expression>
225225
<output>1</output>
226226
</test>
227227
</group>
228-
<group name="Variance">
229-
<test name="VarianceTest1">
228+
<group name="Variance" version="1.5">
229+
<test name="VarianceTest1" version="1.5">
230230
<expression>Variance({ 1.0, 2.0, 3.0, 4.0, 5.0 })</expression>
231231
<output>2.5</output>
232232
</test>

‎tests/cql/CqlAggregateTest.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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"
3-
name="CqlAggregateTest" reference="http://build.fhir.org/ig/HL7/cql/03-developersguide.html#aggregate-queries">
4-
<group name="AggregateTests">
5-
<test name="FactorialOfFive">
3+
name="CqlAggregateTest" reference="http://build.fhir.org/ig/HL7/cql/03-developersguide.html#aggregate-queries" version="1.5">
4+
<group name="AggregateTests" version="1.5">
5+
<test name="FactorialOfFive" version="1.5">
66
<expression>({ 1, 2, 3, 4, 5 }) Num aggregate Result starting 1: Result * Num</expression>
77
<output>120</output>
88
</test>
9-
<test name="RolledOutIntervals">
9+
<test name="RolledOutIntervals" version="1.5">
1010
<expression>
1111
({
1212
Interval[@2012-01-01, @2012-02-28],
@@ -29,54 +29,54 @@
2929
</output>
3030
<!-- Execution Error: Invalid precision: 1. -->
3131
</test>
32-
<test name="AggregateSumWithStart">
32+
<test name="AggregateSumWithStart" version="1.5">
3333
<expression>
3434
({ 1, 2, 3, 4, 5 }) Num
3535
aggregate Result starting 1: Result + Num
3636
</expression>
3737
<output>16</output>
3838
<!-- 15 + 1 (the initial value) -->
3939
</test>
40-
<test name="AggregateSumWithNull">
40+
<test name="AggregateSumWithNull" version="1.5">
4141
<expression>
4242
({ 1, 2, 3, 4, 5 }) Num
4343
aggregate Result: Coalesce(Result, 0) + Num
4444
</expression>
4545
<output>15</output>
4646
<!-- 15 + 0 (the initial value from null) -->
4747
</test>
48-
<test name="AggregateSumAll">
48+
<test name="AggregateSumAll" version="1.5">
4949
<expression>
5050
({ 1, 1, 2, 2, 2, 3, 4, 4, 5 }) Num
5151
aggregate all Result: Coalesce(Result, 0) + Num
5252
</expression>
5353
<output>24</output>
5454
<!-- 24 + 0 -->
5555
</test>
56-
<test name="AggregateSumDistinct">
56+
<test name="AggregateSumDistinct" version="1.5">
5757
<expression>
5858
({ 1, 1, 2, 2, 2, 3, 4, 4, 5 }) Num
5959
aggregate distinct Result: Coalesce(Result, 0) + Num
6060
</expression>
6161
<output>15</output>
6262
<!-- 15 + 0 (the initial value) -->
6363
</test>
64-
<test name="Multi">
64+
<test name="Multi" version="1.5">
6565
<expression>
6666
from ({1}) X, ({2}) Y, ({3}) Z
6767
aggregate Agg: Coalesce(Agg, 0) + X + Y + Z
6868
</expression>
6969
<output>6</output>
7070
</test>
71-
<test name="MegaMulti">
71+
<test name="MegaMulti" version="1.5">
7272
<expression>
7373
from ({1, 2}) X, ({1, 2}) Y, ({1, 2}) Z
7474
aggregate Agg starting 0: Agg + X + Y + Z
7575
</expression>
7676
<output>36</output>
7777
<!-- (1+1+1)+(1+1+2)+(1+2+1)+(1+2+2)+(2+1+1)+(2+1+2)+(2+2+1)+(2+2+2) -->
7878
</test>
79-
<test name="MegaMultiDistinct">
79+
<test name="MegaMultiDistinct" version="1.5">
8080
<expression>
8181
from ({1, 2, 2, 1}) X, ({1, 2, 1, 2}) Y, ({2, 1, 2, 1}) Z
8282
aggregate distinct Agg starting 1: Agg + X + Y + Z

0 commit comments

Comments
 (0)