<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9684">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">msc/USSD: use more informative names for test cases<br><br>Let's explicitly indicate is a SS/USSD message MO or MT.<br><br>Change-Id: I87f16f935f015dbd2ac2867d8ea5e155cc365e3f<br>---<br>M msc/MSC_Tests.ttcn<br>M msc/expected-results.xml<br>2 files changed, 12 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index ce95ff5..dc5303e 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -2109,7 +2109,8 @@</span><br><span> * USSD Testing</span><br><span> ***********************************************************************/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_tc_lu_and_ussd_single_req(charstring id, BSC_ConnHdlrPars pars)</span><br><span style="color: hsl(120, 100%, 40%);">+/* LU followed by MO USSD request */</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_tc_lu_and_mo_ussd_single_request(charstring id, BSC_ConnHdlrPars pars)</span><br><span> runs on BSC_ConnHdlr {</span><br><span> f_init_handler(pars);</span><br><span> </span><br><span>@@ -2156,15 +2157,15 @@</span><br><span> </span><br><span> f_expect_clear();</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_lu_and_ussd_single_req() runs on MTC_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_lu_and_mo_ussd_single_request() runs on MTC_CT {</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span> f_init();</span><br><span style="color: hsl(0, 100%, 40%);">- vc_conn := f_start_handler(refers(f_tc_lu_and_ussd_single_req), 46);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn := f_start_handler(refers(f_tc_lu_and_mo_ussd_single_request), 46);</span><br><span> vc_conn.done;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* LU followed by MT call and USSD request during this call */</span><br><span style="color: hsl(0, 100%, 40%);">-private function f_tc_lu_and_ussd_during_call(charstring id, BSC_ConnHdlrPars pars)</span><br><span style="color: hsl(120, 100%, 40%);">+/* LU followed by MT call and MO USSD request during this call */</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_tc_lu_and_mo_ussd_during_mt_call(charstring id, BSC_ConnHdlrPars pars)</span><br><span> runs on BSC_ConnHdlr {</span><br><span> f_init_handler(pars);</span><br><span> </span><br><span>@@ -2223,10 +2224,10 @@</span><br><span> /* Release the call (does Clear Complete itself) */</span><br><span> f_call_hangup(cpars, true);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_lu_and_ussd_during_call() runs on MTC_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_lu_and_mo_ussd_during_mt_call() runs on MTC_CT {</span><br><span> var BSC_ConnHdlr vc_conn;</span><br><span> f_init();</span><br><span style="color: hsl(0, 100%, 40%);">- vc_conn := f_start_handler(refers(f_tc_lu_and_ussd_during_call), 48);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn := f_start_handler(refers(f_tc_lu_and_mo_ussd_during_mt_call), 48);</span><br><span> vc_conn.done;</span><br><span> }</span><br><span> </span><br><span>@@ -2311,8 +2312,8 @@</span><br><span> execute( TC_smpp_mo_sms() );</span><br><span> execute( TC_smpp_mt_sms() );</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_lu_and_ussd_single_req() );</span><br><span style="color: hsl(0, 100%, 40%);">- execute( TC_lu_and_ussd_during_call() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_lu_and_mo_ussd_single_request() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_lu_and_mo_ussd_during_mt_call() );</span><br><span> </span><br><span> /* Run this last: at the time of writing this test crashes the MSC */</span><br><span> execute( TC_lu_imsi_auth_tmsi_encr_3_1_log_msc_debug() );</span><br><span>diff --git a/msc/expected-results.xml b/msc/expected-results.xml</span><br><span>index 8beab26..9595f17 100644</span><br><span>--- a/msc/expected-results.xml</span><br><span>+++ b/msc/expected-results.xml</span><br><span>@@ -71,6 +71,6 @@</span><br><span> <testcase classname='MSC_Tests' name='TC_smpp_mo_sms' time='MASKED'/></span><br><span> <testcase classname='MSC_Tests' name='TC_smpp_mt_sms' time='MASKED'/></span><br><span> <testcase classname='MSC_Tests' name='TC_lu_imsi_auth_tmsi_encr_3_1_log_msc_debug' time='MASKED'/></span><br><span style="color: hsl(0, 100%, 40%);">- <testcase classname='MSC_Tests' name='TC_lu_and_ussd_single_req' time='MASKED'/></span><br><span style="color: hsl(0, 100%, 40%);">- <testcase classname='MSC_Tests' name='TC_lu_and_ussd_during_call' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='MSC_Tests' name='TC_lu_and_mo_ussd_single_request' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='MSC_Tests' name='TC_lu_and_mo_ussd_during_mt_call' time='MASKED'/></span><br><span> </testsuite></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9684">change 9684</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9684"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I87f16f935f015dbd2ac2867d8ea5e155cc365e3f </div>
<div style="display:none"> Gerrit-Change-Number: 9684 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>