summaryrefslogtreecommitdiffstats
path: root/msc/MSC_Tests.ttcn
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2019-07-19 15:01:15 +0200
committerOliver Smith <osmith@sysmocom.de>2019-07-23 15:07:48 +0200
commit91bfa1c43621966eee0ae4bfa05d08f29c17f2d7 (patch)
tree79864e36bfccf367337fc79ab49d18f0167f5254 /msc/MSC_Tests.ttcn
parent690d60fd895a6484c17d463dcbe44fd3c0538e59 (diff)
msc: check IMEI: move reject LU into new function
Diffstat (limited to 'msc/MSC_Tests.ttcn')
-rw-r--r--msc/MSC_Tests.ttcn52
1 files changed, 4 insertions, 48 deletions
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 15ff17c..c463dd5 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -5601,7 +5601,6 @@ testcase TC_lu_imsi_noauth_notmsi_check_imei() runs on MTC_CT {
private function f_tc_lu_imsi_auth_tmsi_check_imei_nack(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {
var PDU_ML3_MS_NW l3_lu;
- var PDU_DTAP_MT dtap_mt;
pars.net.expect_auth := true;
pars.net.expect_imei := true;
@@ -5617,17 +5616,7 @@ private function f_tc_lu_imsi_auth_tmsi_check_imei_nack(charstring id, BSC_ConnH
f_mm_common();
f_msc_lu_hlr();
f_mm_imei();
-
- /* Expect reject */
- alt {
- [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) {
- setverdict(pass);
- }
- [] BSSAP.receive(tr_PDU_DTAP_MT(?)) -> value dtap_mt {
- setverdict(fail, "Expected LU reject BSSAP message, got: ", dtap_mt);
- mtc.stop;
- }
- }
+ f_expect_lu_reject();
f_expect_clear();
}
testcase TC_lu_imsi_auth_tmsi_check_imei_nack() runs on MTC_CT {
@@ -5642,7 +5631,6 @@ testcase TC_lu_imsi_auth_tmsi_check_imei_nack() runs on MTC_CT {
private function f_tc_lu_imsi_auth_tmsi_check_imei_err(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {
var PDU_ML3_MS_NW l3_lu;
- var PDU_DTAP_MT dtap_mt;
pars.net.expect_auth := true;
pars.net.expect_imei := true;
@@ -5658,17 +5646,7 @@ private function f_tc_lu_imsi_auth_tmsi_check_imei_err(charstring id, BSC_ConnHd
f_mm_common();
f_msc_lu_hlr();
f_mm_imei();
-
- /* Expect reject */
- alt {
- [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) {
- setverdict(pass);
- }
- [] BSSAP.receive(tr_PDU_DTAP_MT(?)) -> value dtap_mt {
- setverdict(fail, "Expected LU reject BSSAP message, got: ", dtap_mt);
- mtc.stop;
- }
- }
+ f_expect_lu_reject();
f_expect_clear();
}
testcase TC_lu_imsi_auth_tmsi_check_imei_err() runs on MTC_CT {
@@ -5746,7 +5724,6 @@ testcase TC_lu_imsi_noauth_notmsi_check_imei_early() runs on MTC_CT {
private function f_tc_lu_imsi_auth_tmsi_check_imei_early_nack(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {
var PDU_ML3_MS_NW l3_lu;
- var PDU_DTAP_MT dtap_mt;
pars.net.expect_auth := true;
pars.net.expect_imei_early := true;
@@ -5760,17 +5737,7 @@ private function f_tc_lu_imsi_auth_tmsi_check_imei_early_nack(charstring id, BSC
BSSAP.send(ts_BSSMAP_ClassmarkUpd(g_pars.cm2, g_pars.cm3));
f_mm_imei_early();
-
- /* Expect reject */
- alt {
- [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) {
- setverdict(pass);
- }
- [] BSSAP.receive(tr_PDU_DTAP_MT(?)) -> value dtap_mt {
- setverdict(fail, "Expected LU reject BSSAP message, got: ", dtap_mt);
- mtc.stop;
- }
- }
+ f_expect_lu_reject();
f_expect_clear();
}
testcase TC_lu_imsi_auth_tmsi_check_imei_early_nack() runs on MTC_CT {
@@ -5785,7 +5752,6 @@ testcase TC_lu_imsi_auth_tmsi_check_imei_early_nack() runs on MTC_CT {
private function f_tc_lu_imsi_auth_tmsi_check_imei_early_err(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr {
var PDU_ML3_MS_NW l3_lu;
- var PDU_DTAP_MT dtap_mt;
pars.net.expect_auth := true;
pars.net.expect_imei_early := true;
@@ -5799,17 +5765,7 @@ private function f_tc_lu_imsi_auth_tmsi_check_imei_early_err(charstring id, BSC_
BSSAP.send(ts_BSSMAP_ClassmarkUpd(g_pars.cm2, g_pars.cm3));
f_mm_imei_early();
-
- /* Expect reject */
- alt {
- [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_LU_Rej)) {
- setverdict(pass);
- }
- [] BSSAP.receive(tr_PDU_DTAP_MT(?)) -> value dtap_mt {
- setverdict(fail, "Expected LU reject BSSAP message, got: ", dtap_mt);
- mtc.stop;
- }
- }
+ f_expect_lu_reject();
f_expect_clear();
}
testcase TC_lu_imsi_auth_tmsi_check_imei_early_err() runs on MTC_CT {