kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Artur Zaprzała 2015-06-30 12:24:57 +02:00
parent cde9702859
commit 66a2ba22a0
2 changed files with 78 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
conf/testing/dialplan/default/0009_condition_regex_all.xml
View File

@ -1,26 +1,47 @@
<extension name="Logical AND" > <extension name="Logical AND 1 false" >
<condition field="destination_number" expression="^6030$"/> <condition field="destination_number" expression="^6030$"/>
<condition regex="all"> <!-- ALL --> <condition regex="all">
<!-- ALL CAN NOT MATCH EVER --> <regex wday="1-7"/>
<regex time-of-day="08:00:00-12:00:00"/> <!-- CAN'T TIME TRAVEL --> <regex year="0"/>
<regex time-of-day="22:00:00-23:00:00"/> <anti-action application="log" data="INFO Test PASSED!"/>
<regex wday="3"/> <anti-action application="playback" data="ivr/ivr-thank_you_for_calling.wav"/>
<action application="log" data="INFO At least one of the conditions matched!"/> <action application="log" data="ERROR Test FAILED!"/>
<action application="playback" data="ivr/ivr-yes_we_have_no_bananas.wav"/> <action application="playback" data="ivr/ivr-no_no_no.wav"/>
<anti-action application="log" data="WARNING None of the conditions matched!"/> </condition>
</extension>
<extension name="Logical AND 2 false" >
<condition field="destination_number" expression="^6031$"/>
<condition regex="all">
<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"/> <anti-action application="playback" data="ivr/ivr-no_no_no.wav"/>
</condition> </condition>
</extension> </extension>
<extension name="Logical AND 2" > <extension name="Logical AND 2 true" >
<condition field="destination_number" expression="^6031$"/> <condition field="destination_number" expression="^6033$"/>
<condition regex="all"> <condition regex="all">
<regex field="caller_id_name" expression="testuser"/> <regex field="destination_number" expression="."/>
<regex field="caller_id_number" expression="^1000$"/> <regex field="destination_number" expression="."/>
<regex field="destination_number" expression="^6031$"/> <action application="log" data="INFO Test PASSED!"/>
<action application="log" data="INFO At least one of the conditions matched!"/> <action application="playback" data="ivr/ivr-thank_you_for_calling.wav"/>
<anti-action application="log" data="WARNING None of the conditions matched!"/> <anti-action application="log" data="ERROR Test FAILED!"/>
<action application="playback" data="ivr/ivr-yes_we_have_no_bananas.wav"/>
<anti-action application="playback" data="ivr/ivr-no_no_no.wav"/> <anti-action application="playback" data="ivr/ivr-no_no_no.wav"/>
</condition> </condition>
</extension> </extension>

53
conf/testing/dialplan/default/0010_condition_xor.xml
View File

@ -1,24 +1,49 @@
<extension name="Logical XOR" > <extension name="Logical XOR 1 false" >
<condition field="destination_number" expression="^6040$"/> <condition field="destination_number" expression="^6040$"/>
<condition regex="xor"> <condition regex="xor">
<regex time-of-day="08:00:00-19:00:00"/> <regex wday="1-7"/>
<regex wday="4"/> <regex wday="1-7"/>
<action application="log" data="INFO At least one of the conditions matched!"/> <anti-action application="log" data="INFO Test PASSED!"/>
<action application="playback" data="ivr/ivr-yes_we_have_no_bananas.wav"/> <anti-action application="playback" data="ivr/ivr-thank_you_for_calling.wav"/>
<anti-action application="log" data="WARNING None of the conditions matched!"/> <action application="log" data="ERROR Test FAILED!"/>
<action application="playback" data="ivr/ivr-no_no_no.wav"/>
</condition>
</extension>
<extension name="Logical XOR 2 false" >
<condition field="destination_number" expression="^6041$"/>
<condition regex="xor">
<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"/> <anti-action application="playback" data="ivr/ivr-no_no_no.wav"/>
</condition> </condition>
</extension> </extension>
<extension name="Logical XOR 2" > <extension name="Logical XOR 2 true" >
<condition field="destination_number" expression="^6041$"/> <condition field="destination_number" expression="^6043$"/>
<condition regex="xor"> <condition regex="xor">
<regex field="caller_id_name" expression="testuser"/> <regex field="destination_number" expression="."/>
<regex field="caller_id_number" expression="^1000$"/> <regex field="destination_number" expression="^$"/>
<regex field="destination_number" expression="^6041$"/> <regex field="destination_number" expression="^$"/>
<action application="log" data="INFO At least one of the conditions matched!"/> <action application="log" data="INFO Test PASSED!"/>
<anti-action application="log" data="WARNING None of the conditions matched!"/> <action application="playback" data="ivr/ivr-thank_you_for_calling.wav"/>
<action application="playback" data="ivr/ivr-yes_we_have_no_bananas.wav"/> <anti-action application="log" data="ERROR Test FAILED!"/>
<anti-action application="playback" data="ivr/ivr-no_no_no.wav"/> <anti-action application="playback" data="ivr/ivr-no_no_no.wav"/>
</condition> </condition>
</extension> </extension>