From 5209cd44fb7c6d8d1b25f74700b8213641b3e2e7 Mon Sep 17 00:00:00 2001
From: Octavian Patrascoiu <opatrascoiu@yahoo.com>
Date: Thu, 2 Nov 2023 14:28:50 +0000
Subject: [PATCH] Add tests for 'matches' function. Address comments in PR

---
 .../1111-feel-matches-function-test-01.xml    | 28 ++++++++++++++++---
 .../1111-feel-matches-function.dmn            | 12 ++++++--
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/TestCases/compliance-level-3/1111-feel-matches-function/1111-feel-matches-function-test-01.xml b/TestCases/compliance-level-3/1111-feel-matches-function/1111-feel-matches-function-test-01.xml
index b2d5a56cb..b6775fff0 100644
--- a/TestCases/compliance-level-3/1111-feel-matches-function/1111-feel-matches-function-test-01.xml
+++ b/TestCases/compliance-level-3/1111-feel-matches-function/1111-feel-matches-function-test-01.xml
@@ -78,6 +78,7 @@
         </resultNode>
     </testCase>
 
+<!--
     <testCase id="fn-matches-32">
         <description>Evaluation of matches function with "q" flag (allowed in XQuery 3.0)</description>
         <resultNode name="fn-matches-32">
@@ -104,6 +105,7 @@
             </expected>
         </resultNode>
     </testCase>
+-->
 
     <testCase id="fn-matches-45">
         <description>"." does NOT match CR in default mode</description>
@@ -387,15 +389,33 @@
         </resultNode>
     </testCase>
 
-    <testCase id="K2-MatchesFunc-16">
-        <description>Use a pattern whose interpretation is unknown. See public report 4466 and 21425.</description>
-        <resultNode name="K2-MatchesFunc-16">
+    <testCase id="K2-MatchesFunc-15">
+        <description> A negative character class never match a non-character. </description>
+        <resultNode name="K2-MatchesFunc-15" >
             <expected>
-                <value xsi:type="xsd:boolean">false</value>
+                <list>
+                    <item>
+                        <value xsi:type="xsd:boolean">false</value>
+                    </item>
+                    <item>
+                        <value xsi:type="xsd:boolean">true</value>
+                    </item>
+                </list>
             </expected>
         </resultNode>
     </testCase>
 
+    <!--
+        <testCase id="K2-MatchesFunc-16">
+            <description>Use a pattern whose interpretation is unknown. See public report 4466 and 21425.</description>
+            <resultNode name="K2-MatchesFunc-16">
+                <expected>
+                    <value xsi:type="xsd:boolean">false</value>
+                </expected>
+            </resultNode>
+        </testCase>
+    -->
+
     <testCase id="K2-MatchesFunc-17">
         <description>Caseless match with back-reference.</description>
         <resultNode name="K2-MatchesFunc-17">
diff --git a/TestCases/compliance-level-3/1111-feel-matches-function/1111-feel-matches-function.dmn b/TestCases/compliance-level-3/1111-feel-matches-function/1111-feel-matches-function.dmn
index a3db1573d..21e55264c 100644
--- a/TestCases/compliance-level-3/1111-feel-matches-function/1111-feel-matches-function.dmn
+++ b/TestCases/compliance-level-3/1111-feel-matches-function/1111-feel-matches-function.dmn
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!-- Extracted from https://dev.w3.org/2011/QT3-test-suite/ -->
-<definitions namespace="http://www.actico.com/spec/DMN/1111-feel-matches-function" name="1111-feel-matches-function"
+<definitions namespace="http://www.gs.com/spec/DMN/1111-feel-matches-function" name="1111-feel-matches-function"
              id="_1111_feel_matches_function" xmlns="https://www.omg.org/spec/DMN/20211108/MODEL/"
              xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/"
              xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/"
              xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <description>FEEL built-in function 'matches(input, pattern, flags?)' in category string functions</description>
 
+    <itemDefinition name="booleanList" isCollection="true">
+        <typeRef>boolean</typeRef>
+    </itemDefinition>
+
     <decision name="fn-null-input">
         <description>Evaluates "matches" function with null input</description>
         <variable typeRef="boolean" name="fn-null-input"/>
@@ -63,6 +67,7 @@
         </literalExpression>
     </decision>
 
+<!--
     <decision name="fn-matches-32">
         <description> Evaluation of matches function with "q" flag (allowed in XQuery 3.0) </description>
         <variable typeRef="boolean" name="fn-matches-32"/>
@@ -86,6 +91,7 @@
             <text>matches("x[Y-z]", "X[y-Z]", "qi")</text>
         </literalExpression>
     </decision>
+-->
 
     <decision name="fn-matches-45">
         <description> "." does NOT match CR in default mode</description>
@@ -337,9 +343,9 @@
 
     <decision name="K2-MatchesFunc-15">
         <description> A negative character class never match a non-character. </description>
-        <variable typeRef="boolean" name="K2-MatchesFunc-15"/>
+        <variable typeRef="booleanList" name="K2-MatchesFunc-15"/>
         <literalExpression>
-            <text>matches("a", "a[^b]"), matches("a ", "a[^b]")</text>
+            <text>[matches("a", "a[^b]"), matches("a ", "a[^b]")]</text>
         </literalExpression>
     </decision>