Module: sems
Branch: rco/offer_answer
Commit: 15e29701ce11afb82dd87709da968f09a5b74c88
URL:    
http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=15e29701ce11afb82dd87709da968f09a5b74c88

Author: Raphael Coeffic <[email protected]>
Committer: Raphael Coeffic <[email protected]>
Date:   Wed May 18 12:53:08 2011 +0200

modified some test scripts according to 
11166ef7f074d16055dc8b1c5d97b03308dd3ec6.

---

 doc/dsm/examples/183_early_establish.dsm  |    4 ++--
 doc/dsm/examples/test_b2b.dsm             |    8 ++++++--
 doc/dsm/examples/test_byehdr.dsm          |   16 +++++++++++-----
 doc/dsm/examples/test_conference.dsm      |    8 ++++++--
 doc/dsm/examples/test_conference_mute.dsm |    8 ++++++--
 doc/dsm/examples/test_exception.dsm       |   15 ++++++++++-----
 doc/dsm/examples/test_teeconf.dsm         |    9 ++++++---
 7 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/doc/dsm/examples/183_early_establish.dsm 
b/doc/dsm/examples/183_early_establish.dsm
index a762cb6..5bb42ce 100644
--- a/doc/dsm/examples/183_early_establish.dsm
+++ b/doc/dsm/examples/183_early_establish.dsm
@@ -6,14 +6,14 @@
 
 import(mod_dlg);
 
-initial state START ;
+initial state START;
+
 transition "on invite" START - invite / { 
        log(2, run invite!); 
        -- we don't want to have the default 200 OK reply
        dlg.reply(100, trying...);
        setTimer(1, 2);
 } -> runinvite;
-
 state runinvite;
 
 transition "go early" runinvite - timerTest(#id==1) -> reply_183;
diff --git a/doc/dsm/examples/test_b2b.dsm b/doc/dsm/examples/test_b2b.dsm
index 15b4e1c..0cfe093 100644
--- a/doc/dsm/examples/test_b2b.dsm
+++ b/doc/dsm/examples/test_b2b.dsm
@@ -1,7 +1,11 @@
 import(mod_conference)
 
-initial state lobby 
-  enter { playFile(wav/welcome.wav) };
+initial state START;
+
+transition "sess start" START - sessionStart / { 
+          playFile(wav/welcome.wav) 
+} -> lobby;
+state lobby;
 
 transition "bye in lobby recvd" lobby - hangup / stop(false) -> end;
 
diff --git a/doc/dsm/examples/test_byehdr.dsm b/doc/dsm/examples/test_byehdr.dsm
index 1425a54..9dbf68b 100644
--- a/doc/dsm/examples/test_byehdr.dsm
+++ b/doc/dsm/examples/test_byehdr.dsm
@@ -1,7 +1,13 @@
 
-initial state START 
-       enter {
-         playFile(wav/default_en.wav);
-       };
-transition "got bye" START - hangup / log(1, #headers) -> end;
+initial state START;
+
+transition "sess start" START - sessionStart / {
+          playFile(wav/default_en.wav);
+} -> session_started;
+state session_started;
+
+transition "got bye" (START,session_started) - hangup / {
+          log(1, #headers);
+          stop;
+} -> end;
 state end;
\ No newline at end of file
diff --git a/doc/dsm/examples/test_conference.dsm 
b/doc/dsm/examples/test_conference.dsm
index db289bf..a781297 100644
--- a/doc/dsm/examples/test_conference.dsm
+++ b/doc/dsm/examples/test_conference.dsm
@@ -1,8 +1,12 @@
 import(mod_conference)
 
-initial state lobby 
-  enter { playFile(wav/default_en.wav) };
+initial state START;
 
+state lobby;
+
+transition "start to lobby" START - sessionStart / { 
+          playFile(wav/default_en.wav) 
+} -> lobby;
 
 state room;
 
diff --git a/doc/dsm/examples/test_conference_mute.dsm 
b/doc/dsm/examples/test_conference_mute.dsm
index c3f261f..387cbbf 100644
--- a/doc/dsm/examples/test_conference_mute.dsm
+++ b/doc/dsm/examples/test_conference_mute.dsm
@@ -1,8 +1,12 @@
 import(mod_conference)
 
-initial state lobby 
-  enter { playFile(wav/default_en.wav) };
+initial state START;
 
+state lobby;
+
+transition "start to lobby" START - sessionStart / { 
+          playFile(wav/default_en.wav); 
+} -> lobby;
 
 state room;
 
diff --git a/doc/dsm/examples/test_exception.dsm 
b/doc/dsm/examples/test_exception.dsm
index e02f4f6..6ac064e 100644
--- a/doc/dsm/examples/test_exception.dsm
+++ b/doc/dsm/examples/test_exception.dsm
@@ -1,9 +1,14 @@
 
-initial state lobby
-  enter { 
-    playFile(wav/default_en.wav) 
-    throw(bla,blub=blu;i=somevalue); 
-  };
+initial state START;
+
+
+transition "got to lobby" START - sessionStart -> lobby;
+state lobby
+      enter { 
+       playFile(wav/default_en.wav);
+       throw(bla,blub=blu;i=somevalue); 
+};
+
 transition "thrown error" lobby - exception; test(#blub=="blu"); / 
     log(1, #i); stop(true) -> end;
 
diff --git a/doc/dsm/examples/test_teeconf.dsm 
b/doc/dsm/examples/test_teeconf.dsm
index 52fc5b7..1f1eb97 100644
--- a/doc/dsm/examples/test_teeconf.dsm
+++ b/doc/dsm/examples/test_teeconf.dsm
@@ -8,13 +8,16 @@
 import(mod_uri);
 import(mod_conference);
 
-initial state begin 
-  enter {
+initial state START;
+
+state begin;
+
+transition "begin" START - sessionStart / {
     setInOutPlaylist();
     conference.setPlayoutType(adaptive);
     uri.parse(@remote_uri, rparty.);
     repost();
-  };
+} -> begin;
 
 transition "tee participant" begin - test($rparty.user==5)  / {
   -- speak and listen in chan2

_______________________________________________
Semsdev mailing list
[email protected]
http://lists.iptel.org/mailman/listinfo/semsdev

Reply via email to