[svn-commits] mjordan: testsuite/asterisk/trunk r3977 - /asterisk/trunk/tests/apps/bridge/b...

[SVN commits to the Digium repositories]

Author: mjordan
Date: Sat Aug  3 14:32:46 2013
New Revision: 3977

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=3977
Log:
Update bridge_baseline test for Asterisk 12; convert to pluggable module

This updates the bridge_baseline test for Asterisk 12. It adds verification of
AMI events for both Asterisk 12 as well as earlier versions; it adds CDR checks
for 12 and earlier versions; and it converts the whole thing to a pluggable
module.

Removed:
    asterisk/trunk/tests/apps/bridge/bridge_baseline/run-test
Modified:
    asterisk/trunk/tests/apps/bridge/bridge_baseline/test-config.yaml

Modified: asterisk/trunk/tests/apps/bridge/bridge_baseline/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/bridge/bridge_baseline/test-config.yaml?view=diff&rev=3977&r1=3976&r2=3977
==============================================================================
--- asterisk/trunk/tests/apps/bridge/bridge_baseline/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/bridge/bridge_baseline/test-config.yaml Sat Aug  3 14:32:46 2013
@@ -1,10 +1,7 @@
 testinfo:
     summary:     'Get a baseline for Bridge operations'
     description: |
-        'This tests the bridging of two local channels using the Bridge application.
-         If successful, a BridgeExec event is sent which the test checks for the
-         expected results.  The test passes if the event indicates a successful bridge
-         and if the channels is the bridge are the expected channels.'
+        'This tests the bridging of two local channels using the Bridge application.'
 
 test-modules:
     test-object:
@@ -84,7 +81,9 @@
         type: 'headermatch'
         conditions:
             match:
-                Event: 'Unlink'
+                Event: 'Bridge'
+                Bridgestate: 'Unlink'
+                Bridgetype: 'core'
         count: '1'
 
 cdr-config-pre-12:
@@ -114,10 +113,11 @@
 
 hangup-config-12:
     type: 'headermatch'
+    delay: 2
     conditions:
         match:
             Event: 'BridgeEnter'
-            BridgeType: simple_bridge
+            BridgeType: basic
             Channel: Local/local at call1-.{8};1
 
 ami-config-12:
@@ -126,7 +126,8 @@
         conditions:
             match:
                 Event: 'BridgeEnter'
-                BridgeType: simple_bridge
+                BridgeType: basic
+                BridgeTechnology: simple_bridge
                 Channel: Local/local at call1-.{8};1
         count: '1'
     -
@@ -134,7 +135,8 @@
         conditions:
             match:
                 Event: 'BridgeEnter'
-                BridgeType: simple_bridge
+                BridgeType: basic
+                BridgeTechnology: simple_bridge
                 Channel: Local/local at call2-.{8};1
         count: '1'
     -
@@ -142,7 +144,8 @@
         conditions:
             match:
                 Event: 'BridgeLeave'
-                BridgeType: simple_bridge
+                BridgeType: basic
+                BridgeTechnology: simple_bridge
                 Channel: Local/local at call1-.{8};1
         count: '1'
     -
@@ -150,7 +153,8 @@
         conditions:
             match:
                 Event: 'BridgeLeave'
-                BridgeType: simple_bridge
+                BridgeType: basic
+                BridgeTechnology: simple_bridge
                 Channel: Local/local at call2-.{8};1
         count: '1'
 
@@ -158,6 +162,16 @@
     -
         file: 'Master'
         lines:
+            -
+                accountcode: ''
+                destination: 'local'
+                dcontext: 'call.{1}'
+                callerid: '"" <>'
+                channel: 'Local/local at call.{1}-.{8};2'
+                dchannel: ''
+                lastapp: 'Echo'
+                disposition: 'ANSWERED'
+                amaflags: 'DOCUMENTATION'
             -
                 accountcode: ''
                 destination: 'bridge'
@@ -185,17 +199,7 @@
                 callerid: '"" <>'
                 channel: 'Local/local at call.{1}-.{8};2'
                 dchannel: ''
-                lastapp: 'Answer'
-                disposition: 'ANSWERED'
-                amaflags: 'DOCUMENTATION'
-            -
-                accountcode: ''
-                destination: 'local'
-                dcontext: 'call.{1}'
-                callerid: '"" <>'
-                channel: 'Local/local at call.{1}-.{8};2'
-                dchannel: ''
-                lastapp: 'Answer'
+                lastapp: 'Echo'
                 disposition: 'ANSWERED'
                 amaflags: 'DOCUMENTATION'