aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Yanitskiy <axilirator@gmail.com>2018-06-18 23:37:54 +0700
committerVadim Yanitskiy <axilirator@gmail.com>2018-06-21 22:06:45 +0700
commitda5a405d9f51a1e5867224e4395383d41e684852 (patch)
tree581abe7c9305abc212c635b9eee7a8fba34b15ca
parent911257ebb24ffc6b657cc0710a13ff74fdf90eab (diff)
msc/USSD: drop the TC_lu_and_ussd_wrong_code test case
As we are about to finish the implementation of GSM TS 09.11, in our case it is 'SS/USSD over GSUP', OsmoMSC will not decide itself which USSD request-code is known, and which is wrong. Change-Id: Ic104a49bb2dce2127063bcef8443ee6b639c9f19
-rw-r--r--msc/MSC_Tests.ttcn54
-rw-r--r--msc/expected-results.xml1
2 files changed, 0 insertions, 55 deletions
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 33165637..ce95ff5a 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -2163,59 +2163,6 @@ testcase TC_lu_and_ussd_single_req() runs on MTC_CT {
vc_conn.done;
}
-private function f_tc_lu_and_ussd_wrong_code(charstring id, BSC_ConnHdlrPars pars)
-runs on BSC_ConnHdlr {
- f_init_handler(pars);
-
- /* Perform location update */
- f_perform_lu();
-
- /* Send CM Service Request for SS/USSD */
- f_establish_fully(EST_TYPE_SS_ACT);
-
- /* Compose a new SS/REGISTER message with request */
- var template (value) PDU_ML3_MS_NW ussd_req := ts_ML3_MO_SS_REGISTER(
- tid := 1, /* We just need a single transaction */
- ti_flag := c_TIF_ORIG, /* Sent from the side that originates the TI */
- facility := f_USSD_FACILITY_IE_INVOKE(
- invoke_id := 5, /* Phone may not start from 0 or 1 */
- op_code := SS_OP_CODE_PROCESS_USS_REQ,
- ussd_string := "*#999#"
- )
- );
-
- /* Compose SS/RELEASE_COMPLETE template with expected response */
- var template PDU_ML3_NW_MS ussd_rsp := tr_ML3_MT_SS_RELEASE_COMPLETE(
- tid := 1, /* Response should arrive within the same transaction */
- ti_flag := c_TIF_REPL, /* Sent to the side that originates the TI */
- facility := f_USSD_FACILITY_IE_RETURN_ERROR(
- invoke_id := 5, /* InvokeID shall be the same for both REQ and RSP */
- err_code := SS_ERR_CODE_UNEXPECTED_DATA_VALUE
- )
- );
-
- /* Request own number request */
- BSSAP.send(ts_PDU_DTAP_MO(ussd_req));
- alt {
- /* We expect RELEASE_COMPLETE message with the response */
- [] BSSAP.receive(tr_PDU_DTAP_MT(ussd_rsp)) {
- setverdict(pass);
- }
- [] BSSAP.receive {
- setverdict(fail, "Unknown/unexpected BSSAP received");
- self.stop;
- }
- }
-
- f_expect_clear();
-}
-testcase TC_lu_and_ussd_wrong_code() runs on MTC_CT {
- var BSC_ConnHdlr vc_conn;
- f_init();
- vc_conn := f_start_handler(refers(f_tc_lu_and_ussd_wrong_code), 47);
- vc_conn.done;
-}
-
/* LU followed by MT call and USSD request during this call */
private function f_tc_lu_and_ussd_during_call(charstring id, BSC_ConnHdlrPars pars)
runs on BSC_ConnHdlr {
@@ -2365,7 +2312,6 @@ control {
execute( TC_smpp_mt_sms() );
execute( TC_lu_and_ussd_single_req() );
- execute( TC_lu_and_ussd_wrong_code() );
execute( TC_lu_and_ussd_during_call() );
/* Run this last: at the time of writing this test crashes the MSC */
diff --git a/msc/expected-results.xml b/msc/expected-results.xml
index ba405197..8beab26a 100644
--- a/msc/expected-results.xml
+++ b/msc/expected-results.xml
@@ -72,6 +72,5 @@
<testcase classname='MSC_Tests' name='TC_smpp_mt_sms' time='MASKED'/>
<testcase classname='MSC_Tests' name='TC_lu_imsi_auth_tmsi_encr_3_1_log_msc_debug' time='MASKED'/>
<testcase classname='MSC_Tests' name='TC_lu_and_ussd_single_req' time='MASKED'/>
- <testcase classname='MSC_Tests' name='TC_lu_and_ussd_wrong_code' time='MASKED'/>
<testcase classname='MSC_Tests' name='TC_lu_and_ussd_during_call' time='MASKED'/>
</testsuite>