From 247b82e26777deff18b1d131eec07e9cc8ea5259 Mon Sep 17 00:00:00 2001 From: Anton Vasetenkov Date: Mon, 12 Aug 2024 19:38:47 +1200 Subject: [PATCH 1/2] Add tests for ProperContains and ProperIn --- tests/cql/CqlListOperatorsTest.xml | 88 ++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 4 deletions(-) diff --git a/tests/cql/CqlListOperatorsTest.xml b/tests/cql/CqlListOperatorsTest.xml index 9c342b9..91bfe67 100644 --- a/tests/cql/CqlListOperatorsTest.xml +++ b/tests/cql/CqlListOperatorsTest.xml @@ -650,12 +650,52 @@ + + null as List<String> properly includes 'a' + false + + + {} properly includes 'a' + false + + + { 'a' } properly includes 'a' + false + + + { null } properly includes null as String + false + - {'s', 'u', 'n'} properly includes null + {'s', 'u', 'n'} properly includes null as String + false + + + { null, null } properly includes null as String false - {'s', 'u', 'n', null} properly includes null + {'s', 'u', 'n', null} properly includes null as String + true + + + { 'a', 'b' } properly includes 'a' + true + + + { 'a', 'a' } properly includes 'a' + false + + + { 'a', 'b' } properly includes 'c' + false + + + { 'a', null } properly includes 'a' + null + + + { 'a', 'b', null } properly includes 'a' true @@ -668,12 +708,52 @@ + + 'a' properly included in null as List<String> + false + + + 'a' properly included in {} + false + + + 'a' properly included in { 'a' } + false + + + null as String properly included in { null } + false + - null properly included in {'s', 'u', 'n'} + null as String properly included in {'s', 'u', 'n'} + false + + + null as String properly included in { null, null } false - null properly included in {'s', 'u', 'n', null} + null as String properly included in {'s', 'u', 'n', null} + true + + + 'a' properly included in { 'a', 'b' } + true + + + 'a' properly included in { 'a', 'a' } + false + + + 'c' properly included in { 'a', 'b' } + false + + + 'a' properly included in { 'a', null } + null + + + 'a' properly included in { 'a', 'b', null } true From b89808cf0a21a4d734e2e515ec12d8e767063c49 Mon Sep 17 00:00:00 2001 From: Anton Vasetenkov Date: Fri, 6 Feb 2026 17:47:26 +1300 Subject: [PATCH 2/2] Merge fix --- tests/cql/CqlListOperatorsTest.xml | 80 ++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 10 deletions(-) diff --git a/tests/cql/CqlListOperatorsTest.xml b/tests/cql/CqlListOperatorsTest.xml index 58fdd57..420a0ea 100644 --- a/tests/cql/CqlListOperatorsTest.xml +++ b/tests/cql/CqlListOperatorsTest.xml @@ -847,18 +847,22 @@ + null as List<String> properly includes 'a' false + {} properly includes 'a' false + { 'a' } properly includes 'a' false + { null } properly includes null as String false @@ -868,6 +872,7 @@ false + { null, null } properly includes null as String false @@ -876,6 +881,31 @@ {'s', 'u', 'n', null} properly includes null true + + + { 'a', 'b' } properly includes 'a' + true + + + + { 'a', 'a' } properly includes 'a' + false + + + + { 'a', 'b' } properly includes 'c' + false + + + + { 'a', null } properly includes 'a' + null + + + + { 'a', 'b', null } properly includes 'a' + true + { @T15:59:59, @T20:59:59.999, @T20:59:49.999 } properly includes @T15:59:59 @@ -889,34 +919,64 @@ + + + 'a' properly included in null as List<String> + false + + + + 'a' properly included in {} + false + + + + 'a' properly included in { 'a' } + false + + + + null as String properly included in { null } + false + null properly included in {'s', 'u', 'n'} false + + + null as String properly included in { null, null } + false + null properly included in {'s', 'u', 'n', null} true - - { 'a', 'b' } properly includes 'a' + + + 'a' properly included in { 'a', 'b' } true - - { 'a', 'a' } properly includes 'a' + + + 'a' properly included in { 'a', 'a' } false - - { 'a', 'b' } properly includes 'c' + + + 'c' properly included in { 'a', 'b' } false - - { 'a', null } properly includes 'a' + + + 'a' properly included in { 'a', null } null - - { 'a', 'b', null } properly includes 'a' + + + 'a' properly included in { 'a', 'b', null } true