FS-7648 Fix regex "all" and "xor" tests.

diff --git a/conf/testing/dialplan/default/0009_condition_regex_all.xml b/conf/testing/dialplan/default/0009_condition_regex_all.xml
index 47609d20be56fdc755693b972f9fe19fcb8f41f2..db6141baa622cf60bbcc14288271580f1f794bcd 100644 (file)
--- a/conf/testing/dialplan/default/0009_condition_regex_all.xml
+++ b/conf/testing/dialplan/default/0009_condition_regex_all.xml
@@ -1,26 +1,47 @@
-<extension name="Logical AND" >
+<extension name="Logical AND 1 false" >
   <condition field="destination_number" expression="^6030$"/>
-  <condition regex="all"> <!-- ALL -->
-    <!-- ALL CAN NOT MATCH EVER -->
-    <regex time-of-day="08:00:00-12:00:00"/> <!-- CAN'T TIME TRAVEL -->
-    <regex time-of-day="22:00:00-23:00:00"/> 
-    <regex wday="3"/>
-    <action application="log" data="INFO At least one of the conditions matched!"/>
-    <action application="playback" data="ivr/ivr-yes_we_have_no_bananas.wav"/>
-    <anti-action application="log" data="WARNING None of the conditions matched!"/>
-    <anti-action application="playback" data="ivr/ivr-no_no_no.wav"/>
+  <condition regex="all">
+    <regex wday="1-7"/>
+    <regex year="0"/>
+    <anti-action application="log" data="INFO Test PASSED!"/>
+    <anti-action application="playback" data="ivr/ivr-thank_you_for_calling.wav"/>
+    <action application="log" data="ERROR Test FAILED!"/>
+    <action application="playback" data="ivr/ivr-no_no_no.wav"/>
   </condition>
 </extension>
 
-<extension name="Logical AND 2" >
+<extension name="Logical AND 2 false" >
   <condition field="destination_number" expression="^6031$"/>
   <condition regex="all">
-    <regex field="caller_id_name" expression="testuser"/>
-    <regex field="caller_id_number" expression="^1000$"/>
-    <regex field="destination_number" expression="^6031$"/>
-    <action application="log" data="INFO At least one of the conditions matched!"/>
-    <anti-action application="log" data="WARNING None of the conditions matched!"/>
-    <action application="playback" data="ivr/ivr-yes_we_have_no_bananas.wav"/>
-    <anti-action application="playback"        data="ivr/ivr-no_no_no.wav"/>
+    <regex field="destination_number" expression="."/>
+    <regex field="destination_number" expression="^$"/>
+    <anti-action application="log" data="INFO Test PASSED!"/>
+    <anti-action application="playback" data="ivr/ivr-thank_you_for_calling.wav"/>
+    <action application="log" data="ERROR Test FAILED!"/>
+    <action application="playback" data="ivr/ivr-no_no_no.wav"/>
+  </condition>
+</extension>
+
+<extension name="Logical AND 1 true" >
+  <condition field="destination_number" expression="^6032$"/>
+  <condition regex="all">
+    <regex wday="1-7"/>
+    <regex wday="1-7"/>
+    <action application="log" data="INFO Test PASSED!"/>
+    <action application="playback" data="ivr/ivr-thank_you_for_calling.wav"/>
+    <anti-action application="log" data="ERROR Test FAILED!"/>
+    <anti-action application="playback" data="ivr/ivr-no_no_no.wav"/>
+  </condition>
+</extension>
+
+<extension name="Logical AND 2 true" >
+  <condition field="destination_number" expression="^6033$"/>
+  <condition regex="all">
+    <regex field="destination_number" expression="."/>
+    <regex field="destination_number" expression="."/>
+    <action application="log" data="INFO Test PASSED!"/>
+    <action application="playback" data="ivr/ivr-thank_you_for_calling.wav"/>
+    <anti-action application="log" data="ERROR Test FAILED!"/>
+    <anti-action application="playback" data="ivr/ivr-no_no_no.wav"/>
   </condition>
 </extension>

diff --git a/conf/testing/dialplan/default/0010_condition_xor.xml b/conf/testing/dialplan/default/0010_condition_xor.xml
index 1ec506632dc8bb93feba5f3288c6845343a72771..753b9dcd706feae31c614de9e026c908ea32d54a 100644 (file)
--- a/conf/testing/dialplan/default/0010_condition_xor.xml
+++ b/conf/testing/dialplan/default/0010_condition_xor.xml
@@ -1,24 +1,49 @@
-<extension name="Logical XOR" >
+<extension name="Logical XOR 1 false" >
   <condition field="destination_number" expression="^6040$"/>
   <condition regex="xor">
-    <regex time-of-day="08:00:00-19:00:00"/>
-    <regex wday="4"/>
-    <action application="log" data="INFO At least one of the conditions matched!"/>
-    <action application="playback" data="ivr/ivr-yes_we_have_no_bananas.wav"/>
-    <anti-action application="log" data="WARNING None of the conditions matched!"/>
-    <anti-action application="playback"        data="ivr/ivr-no_no_no.wav"/>
+    <regex wday="1-7"/>
+    <regex wday="1-7"/>
+    <anti-action application="log" data="INFO Test PASSED!"/>
+    <anti-action application="playback" data="ivr/ivr-thank_you_for_calling.wav"/>
+    <action application="log" data="ERROR Test FAILED!"/>
+    <action application="playback" data="ivr/ivr-no_no_no.wav"/>
   </condition>
 </extension>
 
-<extension name="Logical XOR 2" >
+<extension name="Logical XOR 2 false" >
   <condition field="destination_number" expression="^6041$"/>
   <condition regex="xor">
-    <regex field="caller_id_name" expression="testuser"/>
-    <regex field="caller_id_number" expression="^1000$"/>
-    <regex field="destination_number" expression="^6041$"/>
-    <action application="log" data="INFO At least one of the conditions matched!"/>
-    <anti-action application="log" data="WARNING None of the conditions matched!"/>
-    <action application="playback" data="ivr/ivr-yes_we_have_no_bananas.wav"/>
+    <regex field="destination_number" expression="."/>
+    <regex field="destination_number" expression="."/>
+    <anti-action application="log" data="INFO Test PASSED!"/>
+    <anti-action application="playback" data="ivr/ivr-thank_you_for_calling.wav"/>
+    <action application="log" data="ERROR Test FAILED!"/>
+    <action application="playback" data="ivr/ivr-no_no_no.wav"/>
+  </condition>
+</extension>
+
+<extension name="Logical XOR 1 true" >
+  <condition field="destination_number" expression="^6042$"/>
+  <condition regex="xor">
+    <regex wday="1-7"/>
+    <regex year="0"/>
+    <regex year="0"/>
+    <action application="log" data="INFO Test PASSED!"/>
+    <action application="playback" data="ivr/ivr-thank_you_for_calling.wav"/>
+    <anti-action application="log" data="ERROR Test FAILED!"/>
+    <anti-action application="playback" data="ivr/ivr-no_no_no.wav"/>
+  </condition>
+</extension>
+
+<extension name="Logical XOR 2 true" >
+  <condition field="destination_number" expression="^6043$"/>
+  <condition regex="xor">
+    <regex field="destination_number" expression="."/>
+    <regex field="destination_number" expression="^$"/>
+    <regex field="destination_number" expression="^$"/>
+    <action application="log" data="INFO Test PASSED!"/>
+    <action application="playback" data="ivr/ivr-thank_you_for_calling.wav"/>
+    <anti-action application="log" data="ERROR Test FAILED!"/>
     <anti-action application="playback" data="ivr/ivr-no_no_no.wav"/>
   </condition>
 </extension>