fixeria submitted this change.
msc: use f_expect_paging() in SS/USSD TCs
Change-Id: Ia75420c738ef412af6ae602566fab7c997b48335
---
M msc/MSC_Tests.ttcn
1 file changed, 4 insertions(+), 45 deletions(-)
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index b4b3614..380052b 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -3596,8 +3596,6 @@
/* LU followed by MT USSD notification */
friend function f_tc_lu_and_mt_ussd_notification(charstring id, BSC_ConnHdlrPars pars)
runs on BSC_ConnHdlr {
- timer T := 5.0;
-
f_init_handler(pars);
/* Perform location update */
@@ -3637,18 +3635,7 @@
/* Send it to MSC and expect Paging Request */
GSUP.send(gsup_req);
- T.start;
- alt {
- [] as_paging() { setverdict(pass); }
- [] as_paging_any() {
- setverdict(fail, "Rx unexpected BSSMAP/RANAP Paging");
- mtc.stop;
- }
- [] as_unexp_gsup_or_bssap_msg();
- [] T.timeout {
- setverdict(fail, "Timeout waiting for Paging Request");
- }
- }
+ f_expect_paging();
/* Send Paging Response and expect USSD notification */
f_establish_fully(EST_TYPE_PAG_RESP);
@@ -4221,8 +4208,6 @@
/* MT (network-originated) USSD and no response to Paging Request */
friend function f_tc_proc_ss_paging_fail(charstring id, BSC_ConnHdlrPars pars)
runs on BSC_ConnHdlr {
- timer TP := 2.0; /* Paging timer */
-
f_init_handler(pars);
/* Perform location update */
@@ -4246,22 +4231,9 @@
cause := ? /* FIXME: introduce an enumerated type! */
);
- /* Initiate a MT USSD notification */
+ /* Initiate a MT USSD notification, expect paging */
GSUP.send(gsup_req);
-
- /* Send it to MSC and expect Paging Request */
- TP.start;
- alt {
- [] as_paging() { setverdict(pass); }
- [] as_paging_any() {
- setverdict(fail, "Rx unexpected BSSMAP/RANAP Paging");
- mtc.stop;
- }
- [] as_unexp_gsup_or_bssap_msg();
- [] TP.timeout {
- setverdict(fail, "Timeout waiting for Paging Request");
- }
- }
+ f_expect_paging();
/* Wait up to 20 seconds for GSUP PROC_SS_ERROR message.
* OsmoMSC waits for Paging Response 10 seconds by default. */
@@ -4279,7 +4251,6 @@
runs on BSC_ConnHdlr {
var octetstring facility := f_rnd_octstring(23);
var OCT4 sid := '20000555'O;
- timer TP := 2.0;
f_init_handler(pars);
@@ -4320,20 +4291,8 @@
/* Initiate a MT USSD with random payload */
GSUP.send(gsup_req);
-
/* Expect Paging Request */
- TP.start;
- alt {
- [] as_paging() { setverdict(pass); }
- [] as_paging_any() {
- setverdict(fail, "Rx unexpected BSSMAP/RANAP Paging");
- mtc.stop;
- }
- [] as_unexp_gsup_or_bssap_msg();
- [] TP.timeout {
- setverdict(fail, "Timeout waiting for Paging Request");
- }
- }
+ f_expect_paging();
/* Send Paging Response and establish connection */
f_establish_fully(EST_TYPE_PAG_RESP);
To view, visit change 39871. To unsubscribe, or for help writing mail filters, visit settings.