Skip to content

Commit 36a47eb

Browse files
author
Bryn Rhodes
committed
#118: Corrected tests for list membership
1 parent 0666708 commit 36a47eb

1 file changed

Lines changed: 15 additions & 17 deletions

File tree

tests/cql/CqlListOperatorsTest.xml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -475,10 +475,9 @@
475475
<expression>null as List&lt;Integer&gt; includes {2}</expression>
476476
<output>null</output>
477477
</test>
478-
<!-- this test is going to the ContainsEvaluator -->
479478
<test name="IncludesNullRight" version="1.0">
480479
<capability code="list-operators" />
481-
<expression>{'s', 'a', 'm'} includes null</expression>
480+
<expression>{'s', 'a', 'm'} includes null as List&lt;String&gt;</expression>
482481
<output>null</output>
483482
</test>
484483
</group>
@@ -529,10 +528,9 @@
529528
<expression>@T16:59:59.999 included in { @T02:29:15.156, @T15:59:59.999, @T20:59:59.999 }</expression>
530529
<output>false</output>
531530
</test>
532-
<!-- the following expression is going to the InEvaluator -->
533531
<test name="IncludedInNullLeft" version="1.0">
534532
<capability code="list-operators" />
535-
<expression>null included in {2}</expression>
533+
<expression>null as List&lt;Integer&gt; included in {2}</expression>
536534
<output>null</output>
537535
</test>
538536
<test name="IncludedInNullRight" version="1.0">
@@ -868,17 +866,17 @@
868866
</test>
869867
<test name="ProperContainsNullRightFalse" version="1.0">
870868
<capability code="list-operators" />
871-
<expression>{'s', 'u', 'n'} properly includes null</expression>
869+
<expression>{'s', 'u', 'n'} properly includes null as String</expression>
872870
<output>false</output>
873871
</test>
874872
<test name="ProperContains5" version="1.0">
875873
<capability code="list-operators" />
876874
<expression>{ null, null } properly includes null as String</expression>
877-
<output>false</output>
875+
<output>true</output>
878876
</test>
879877
<test name="ProperContainsNullRightTrue" version="1.0">
880878
<capability code="list-operators" />
881-
<expression>{'s', 'u', 'n', null} properly includes null</expression>
879+
<expression>{'s', 'u', 'n', null} properly includes null as String</expression>
882880
<output>true</output>
883881
</test>
884882
<test name="ProperContains6" version="1.0">
@@ -889,7 +887,7 @@
889887
<test name="ProperContains7" version="1.0">
890888
<capability code="list-operators" />
891889
<expression>{ 'a', 'a' } properly includes 'a'</expression>
892-
<output>false</output>
890+
<output>true</output>
893891
</test>
894892
<test name="ProperContains8" version="1.0">
895893
<capability code="list-operators" />
@@ -899,7 +897,7 @@
899897
<test name="ProperContains9" version="1.0">
900898
<capability code="list-operators" />
901899
<expression>{ 'a', null } properly includes 'a'</expression>
902-
<output>null</output>
900+
<output>true</output>
903901
</test>
904902
<test name="ProperContains10" version="1.0">
905903
<capability code="list-operators" />
@@ -914,7 +912,7 @@
914912
<test name="ProperContainsTimeNull" version="1.0">
915913
<capability code="list-operators" />
916914
<expression>{ @T15:59:59.999, @T20:59:59.999, @T20:59:49.999 } properly includes @T15:59:59</expression>
917-
<output>null</output>
915+
<output>false</output>
918916
</test>
919917
</group>
920918
<group name="ProperIn" version="1.0">
@@ -941,13 +939,13 @@
941939
</test>
942940
<test name="ProperInNullRightFalse" version="1.0">
943941
<capability code="list-operators" />
944-
<expression>null properly included in {'s', 'u', 'n'}</expression>
942+
<expression>null as String properly included in {'s', 'u', 'n'}</expression>
945943
<output>false</output>
946944
</test>
947945
<test name="ProperIn5" version="1.0">
948946
<capability code="list-operators" />
949947
<expression>null as String properly included in { null, null }</expression>
950-
<output>false</output>
948+
<output>true</output>
951949
</test>
952950
<test name="ProperInNullRightTrue" version="1.0">
953951
<capability code="list-operators" />
@@ -962,7 +960,7 @@
962960
<test name="ProperIn7" version="1.0">
963961
<capability code="list-operators" />
964962
<expression>'a' properly included in { 'a', 'a' }</expression>
965-
<output>false</output>
963+
<output>true</output>
966964
</test>
967965
<test name="ProperIn8" version="1.0">
968966
<capability code="list-operators" />
@@ -972,7 +970,7 @@
972970
<test name="ProperIn9" version="1.0">
973971
<capability code="list-operators" />
974972
<expression>'a' properly included in { 'a', null }</expression>
975-
<output>null</output>
973+
<output>true</output>
976974
</test>
977975
<test name="ProperIn10" version="1.0">
978976
<capability code="list-operators" />
@@ -987,7 +985,7 @@
987985
<test name="ProperInTimeNull" version="1.0">
988986
<capability code="list-operators" />
989987
<expression>@T15:59:59 properly included in { @T15:59:59.999, @T20:59:59.999, @T20:59:49.999 }</expression>
990-
<output>null</output>
988+
<output>false</output>
991989
</test>
992990
</group>
993991
<group name="ProperlyIncludes" version="1.0">
@@ -1039,7 +1037,7 @@
10391037
</test>
10401038
<test name="ProperlyIncludesNullLeft" version="1.0">
10411039
<capability code="list-operators" />
1042-
<expression>null properly includes {2}</expression>
1040+
<expression>null as List&lt;Integer&gt; properly includes {2}</expression>
10431041
<output>null</output>
10441042
</test>
10451043
</group>
@@ -1092,7 +1090,7 @@
10921090
</test>
10931091
<test name="ProperlyIncludedInNulRight" version="1.0">
10941092
<capability code="list-operators" />
1095-
<expression>{'s', 'u', 'n'} properly included in null</expression>
1093+
<expression>{'s', 'u', 'n'} properly included in null as List&lt;String&gt;</expression>
10961094
<output>null</output>
10971095
</test>
10981096
</group>

0 commit comments

Comments
 (0)