Harald Welte has submitted this change and it was merged.
Change subject: msc: cosmetic: f_start_handler(): drop the id arg, use
testcasename()
......................................................................
msc: cosmetic: f_start_handler(): drop the id arg, use testcasename()
Change-Id: Id4efe8cd00f44ea744996efe04802c5107f2a191
---
M msc/MSC_Tests.ttcn
1 file changed, 42 insertions(+), 41 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index c9cd8d7..4bf385a 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -338,8 +338,9 @@
type function void_fn(charstring id, BSC_ConnHdlrPars pars) runs on
BSC_ConnHdlr;
/* FIXME: move into BSC_ConnectionHandler? */
-function f_start_handler(void_fn fn, charstring id, integer imsi_suffix) runs
on MTC_CT return BSC_ConnHdlr {
+function f_start_handler(void_fn fn, integer imsi_suffix) runs on MTC_CT
return BSC_ConnHdlr {
var BSC_ConnHdlr vc_conn;
+ var charstring id := testcasename();
var BSC_ConnHdlrNetworkPars net_pars := {
kc_support := '0A'O, /* A5/1 and A5/3 enabled */
expect_tmsi := true,
@@ -389,7 +390,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_lu_imsi_noauth_tmsi),
testcasename(), 1);
+ vc_conn := f_start_handler(refers(f_tc_lu_imsi_noauth_tmsi), 1);
vc_conn.done;
}
@@ -403,7 +404,7 @@
f_init();
f_vty_config(MSCVTY, "msc", "no assign-tmsi");
- vc_conn := f_start_handler(refers(f_tc_lu_imsi_noauth_notmsi),
testcasename(), 2);
+ vc_conn := f_start_handler(refers(f_tc_lu_imsi_noauth_notmsi), 2);
vc_conn.done;
}
@@ -429,7 +430,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_lu_imsi_reject), testcasename(),
3);
+ vc_conn := f_start_handler(refers(f_tc_lu_imsi_reject), 3);
vc_conn.done;
}
@@ -456,7 +457,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_lu_imsi_timeout_gsup),
testcasename(), 4);
+ vc_conn := f_start_handler(refers(f_tc_lu_imsi_timeout_gsup), 4);
vc_conn.done;
}
@@ -470,7 +471,7 @@
f_init();
f_vty_config(MSCVTY, "network", "authentication required");
- vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi),
testcasename(), 5);
+ vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi), 5);
vc_conn.done;
}
@@ -506,7 +507,7 @@
testcase TC_cmserv_imsi_unknown() runs on MTC_CT {
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_cmserv_imsi_unknown),
testcasename(), 6);
+ vc_conn := f_start_handler(refers(f_tc_cmserv_imsi_unknown), 6);
vc_conn.done;
}
@@ -524,7 +525,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_lu_and_mo_call), testcasename(),
7);
+ vc_conn := f_start_handler(refers(f_tc_lu_and_mo_call), 7);
vc_conn.done;
}
@@ -555,7 +556,7 @@
f_init();
f_vty_config(MSCVTY, "network", "authentication required");
- vc_conn := f_start_handler(refers(f_tc_lu_auth_sai_timeout),
testcasename(), 8);
+ vc_conn := f_start_handler(refers(f_tc_lu_auth_sai_timeout), 8);
vc_conn.done;
}
@@ -586,7 +587,7 @@
f_init();
f_vty_config(MSCVTY, "network", "authentication required");
- vc_conn := f_start_handler(refers(f_tc_lu_auth_sai_err),
testcasename(), 9);
+ vc_conn := f_start_handler(refers(f_tc_lu_auth_sai_err), 9);
vc_conn.done;
}
@@ -622,7 +623,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_lu_clear_request),
testcasename(), 10);
+ vc_conn := f_start_handler(refers(f_tc_lu_clear_request), 10);
vc_conn.done;
}
@@ -651,7 +652,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_lu_disconnect), testcasename(),
11);
+ vc_conn := f_start_handler(refers(f_tc_lu_disconnect), 11);
vc_conn.done;
}
@@ -683,7 +684,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_lu_by_imei), testcasename(), 12);
+ vc_conn := f_start_handler(refers(f_tc_lu_by_imei), 12);
vc_conn.done;
}
@@ -729,7 +730,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_lu_tmsi_noauth_unknown),
testcasename(), 13);
+ vc_conn := f_start_handler(refers(f_tc_lu_tmsi_noauth_unknown), 13);
vc_conn.done;
}
@@ -753,7 +754,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_imsi_detach_by_imsi),
testcasename(), 14);
+ vc_conn := f_start_handler(refers(f_tc_imsi_detach_by_imsi), 14);
vc_conn.done;
}
@@ -776,7 +777,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_imsi_detach_by_tmsi),
testcasename(), 15);
+ vc_conn := f_start_handler(refers(f_tc_imsi_detach_by_tmsi), 15);
vc_conn.done;
}
@@ -799,7 +800,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_imsi_detach_by_imei),
testcasename(), 16);
+ vc_conn := f_start_handler(refers(f_tc_imsi_detach_by_imei), 16);
vc_conn.done;
}
@@ -826,7 +827,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_emerg_call_imei_reject),
testcasename(), 17);
+ vc_conn := f_start_handler(refers(f_tc_emerg_call_imei_reject), 17);
vc_conn.done;
}
@@ -842,7 +843,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_emerg_call_imsi),
testcasename(), 18);
+ vc_conn := f_start_handler(refers(f_tc_emerg_call_imsi), 18);
vc_conn.done;
}
@@ -863,7 +864,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_cm_serv_req_vgcs_reject),
testcasename(), 19);
+ vc_conn := f_start_handler(refers(f_tc_cm_serv_req_vgcs_reject), 19);
vc_conn.done;
}
@@ -884,7 +885,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_cm_serv_req_vbs_reject),
testcasename(), 20);
+ vc_conn := f_start_handler(refers(f_tc_cm_serv_req_vbs_reject), 20);
vc_conn.done;
}
@@ -905,7 +906,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_cm_serv_req_lcs_reject),
testcasename(), 21);
+ vc_conn := f_start_handler(refers(f_tc_cm_serv_req_lcs_reject), 21);
vc_conn.done;
}
@@ -926,7 +927,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_cm_reest_req_reject),
testcasename(), 22);
+ vc_conn := f_start_handler(refers(f_tc_cm_reest_req_reject), 22);
vc_conn.done;
}
@@ -966,7 +967,7 @@
f_init();
f_vty_config(MSCVTY, "network", "authentication required");
- vc_conn := f_start_handler(refers(f_tc_lu_auth_2G_fail),
testcasename(), 23);
+ vc_conn := f_start_handler(refers(f_tc_lu_auth_2G_fail), 23);
vc_conn.done;
}
@@ -983,7 +984,7 @@
f_vty_config(MSCVTY, "network", "authentication required");
f_vty_config(MSCVTY, "network", "encryption a5 1 3");
- vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi_encr_13_13),
testcasename(), 24);
+ vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi_encr_13_13),
24);
vc_conn.done;
}
@@ -1015,7 +1016,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_cl3_no_payload), testcasename(),
25);
+ vc_conn := f_start_handler(refers(f_tc_cl3_no_payload), 25);
vc_conn.done;
}
@@ -1052,7 +1053,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_cl3_rnd_payload),
testcasename(), 26);
+ vc_conn := f_start_handler(refers(f_tc_cl3_rnd_payload), 26);
vc_conn.done;
}
@@ -1069,7 +1070,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_establish_and_nothing),
testcasename(), 27);
+ vc_conn := f_start_handler(refers(f_tc_establish_and_nothing), 27);
vc_conn.done;
}
@@ -1093,7 +1094,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_mo_setup_and_nothing),
testcasename(), 28);
+ vc_conn := f_start_handler(refers(f_tc_mo_setup_and_nothing), 28);
vc_conn.done;
}
@@ -1127,7 +1128,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_mo_crcx_ran_timeout),
testcasename(), 29);
+ vc_conn := f_start_handler(refers(f_tc_mo_crcx_ran_timeout), 29);
vc_conn.done;
}
@@ -1195,7 +1196,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_mo_crcx_ran_reject),
testcasename(), 30);
+ vc_conn := f_start_handler(refers(f_tc_mo_crcx_ran_reject), 30);
vc_conn.done;
}
@@ -1283,7 +1284,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_mt_crcx_ran_reject),
testcasename(), 31);
+ vc_conn := f_start_handler(refers(f_tc_mt_crcx_ran_reject), 31);
vc_conn.done;
}
@@ -1337,7 +1338,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_mt_t310), testcasename(), 32);
+ vc_conn := f_start_handler(refers(f_tc_mt_t310), 32);
vc_conn.done;
}
@@ -1382,7 +1383,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_gsup_cancel), testcasename(),
33);
+ vc_conn := f_start_handler(refers(f_tc_gsup_cancel), 33);
vc_conn.done;
}
@@ -1400,7 +1401,7 @@
f_vty_config(MSCVTY, "network", "authentication required");
f_vty_config(MSCVTY, "network", "encryption a5 1");
- vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi_encr_1_13),
testcasename(), 34);
+ vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi_encr_1_13),
34);
vc_conn.done;
}
@@ -1418,7 +1419,7 @@
f_vty_config(MSCVTY, "network", "authentication required");
f_vty_config(MSCVTY, "network", "encryption a5 3");
- vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi_encr_3_13),
testcasename(), 35);
+ vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi_encr_3_13),
35);
vc_conn.done;
}
@@ -1455,7 +1456,7 @@
f_vty_config(MSCVTY, "network", "authentication required");
f_vty_config(MSCVTY, "network", "encryption a5 3");
- vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi_encr_3_1),
testcasename(), 36);
+ vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi_encr_3_1), 36);
vc_conn.done;
}
@@ -1495,7 +1496,7 @@
f_vty_config(MSCVTY, "network", "authentication required");
f_vty_config(MSCVTY, "network", "encryption a5 1 3");
- vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi_encr_13_2),
testcasename(), 37);
+ vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi_encr_13_2),
37);
vc_conn.done;
}
@@ -1517,7 +1518,7 @@
f_vty_config(MSCVTY, "network", "authentication required");
f_vty_config(MSCVTY, "network", "encryption a5 0 1 3");
- vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi_encr_013_2),
testcasename(), 38);
+ vc_conn := f_start_handler(refers(f_tc_lu_imsi_auth_tmsi_encr_013_2),
38);
vc_conn.done;
}
@@ -1537,7 +1538,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_lu_and_mt_call), testcasename(),
39);
+ vc_conn := f_start_handler(refers(f_tc_lu_and_mt_call), 39);
vc_conn.done;
}
@@ -1556,7 +1557,7 @@
var BSC_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_tc_mo_setup_dtmf_dup),
testcasename(), 39);
+ vc_conn := f_start_handler(refers(f_tc_mo_setup_dtmf_dup), 39);
vc_conn.done;
}
--
To view, visit https://gerrit.osmocom.org/7046
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4efe8cd00f44ea744996efe04802c5107f2a191
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofm...@sysmocom.de>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
