<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13448">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">HLR_Tests.ttcn: suspend some compilation warnings<br><br>In the most use cases of f_SS_expect() we are not interested in<br>GSUP_PDU returned by this function. Calling it without storing<br>the returned value causes TTCN-3 compiler to complain:<br><br> warning: The value returned by function<br> `@HLR_Tests.f_SS_expect' is not used<br><br>Let's make use of previously unused variable 'res', and save<br>the returned GSUP_PDU to make the TTCN-3 compiler happy.<br><br>Change-Id: Ifda42aa18af8076013b436364513296b2b008731<br>---<br>M hlr/HLR_Tests.ttcn<br>1 file changed, 34 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/hlr/HLR_Tests.ttcn b/hlr/HLR_Tests.ttcn</span><br><span>index e32fa68..da6ad7c 100644</span><br><span>--- a/hlr/HLR_Tests.ttcn</span><br><span>+++ b/hlr/HLR_Tests.ttcn</span><br><span>@@ -783,8 +783,9 @@</span><br><span> ussd_string := "*#200#");</span><br><span> GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid,</span><br><span> OSMO_GSUP_SESSION_STATE_BEGIN, ss)));</span><br><span style="color: hsl(0, 100%, 40%);">- f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END,</span><br><span style="color: hsl(0, 100%, 40%);">- tr_SS_FACILITY_RETURN_ERROR(1, 18));</span><br><span style="color: hsl(120, 100%, 40%);">+ res := f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_SESSION_STATE_END,</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_SS_FACILITY_RETURN_ERROR(1, 18));</span><br><span> }</span><br><span> testcase TC_mo_ussd_unknown() runs on test_CT {</span><br><span> var HlrSubscriberList sl;</span><br><span>@@ -809,8 +810,9 @@</span><br><span> ussd_string := "*100#");</span><br><span> GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid,</span><br><span> OSMO_GSUP_SESSION_STATE_BEGIN, ss)));</span><br><span style="color: hsl(0, 100%, 40%);">- f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END,</span><br><span style="color: hsl(0, 100%, 40%);">- tr_SS_FACILITY_RETURN_ERROR(1, 34));</span><br><span style="color: hsl(120, 100%, 40%);">+ res := f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_SESSION_STATE_END,</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_SS_FACILITY_RETURN_ERROR(1, 34));</span><br><span> }</span><br><span> testcase TC_mo_ussd_euse_disc() runs on test_CT {</span><br><span> var HlrSubscriberList sl;</span><br><span>@@ -837,8 +839,10 @@</span><br><span> GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid,</span><br><span> OSMO_GSUP_SESSION_STATE_BEGIN, ss)));</span><br><span> resp_str := "Your IMSI is " & hex2str(g_pars.sub.imsi);</span><br><span style="color: hsl(0, 100%, 40%);">- f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END,</span><br><span style="color: hsl(0, 100%, 40%);">- tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS, f_encGSM7bit(resp_str)));</span><br><span style="color: hsl(120, 100%, 40%);">+ res := f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_SESSION_STATE_END,</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS,</span><br><span style="color: hsl(120, 100%, 40%);">+ f_encGSM7bit(resp_str)));</span><br><span> }</span><br><span> testcase TC_mo_ussd_iuse_imsi() runs on test_CT {</span><br><span> var HlrSubscriberList sl;</span><br><span>@@ -865,8 +869,10 @@</span><br><span> GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid,</span><br><span> OSMO_GSUP_SESSION_STATE_BEGIN, ss)));</span><br><span> resp_str := "Your extension is " & hex2str(g_pars.sub.msisdn);</span><br><span style="color: hsl(0, 100%, 40%);">- f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END,</span><br><span style="color: hsl(0, 100%, 40%);">- tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS, f_encGSM7bit(resp_str)));</span><br><span style="color: hsl(120, 100%, 40%);">+ res := f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_SESSION_STATE_END,</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS,</span><br><span style="color: hsl(120, 100%, 40%);">+ f_encGSM7bit(resp_str)));</span><br><span> }</span><br><span> testcase TC_mo_ussd_iuse_msisdn() runs on test_CT {</span><br><span> var HlrSubscriberList sl;</span><br><span>@@ -893,8 +899,10 @@</span><br><span> ussd_string := "*100#");</span><br><span> GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid,</span><br><span> OSMO_GSUP_SESSION_STATE_BEGIN, ss)));</span><br><span style="color: hsl(0, 100%, 40%);">- f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END,</span><br><span style="color: hsl(0, 100%, 40%);">- tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS, f_encGSM7bit("*100#")));</span><br><span style="color: hsl(120, 100%, 40%);">+ res := f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_SESSION_STATE_END,</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS,</span><br><span style="color: hsl(120, 100%, 40%);">+ f_encGSM7bit("*100#")));</span><br><span> }</span><br><span> testcase TC_mo_ussd_euse() runs on test_CT {</span><br><span> var HlrSubscriberList sl;</span><br><span>@@ -925,8 +933,10 @@</span><br><span> GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid,</span><br><span> OSMO_GSUP_SESSION_STATE_BEGIN, ss)));</span><br><span> /* expect echo response from EUSE */</span><br><span style="color: hsl(0, 100%, 40%);">- f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_CONTINUE,</span><br><span style="color: hsl(0, 100%, 40%);">- tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS, f_encGSM7bit("*100#")));</span><br><span style="color: hsl(120, 100%, 40%);">+ res := f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_SESSION_STATE_CONTINUE,</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS,</span><br><span style="color: hsl(120, 100%, 40%);">+ f_encGSM7bit("*100#")));</span><br><span> </span><br><span> /* Simulate CONTINUE from MS/MSC */</span><br><span> ss := f_USSD_FACILITY_IE_INVOKE(op_code := SS_OP_CODE_PROCESS_USS_REQ,</span><br><span>@@ -935,9 +945,10 @@</span><br><span> OSMO_GSUP_SESSION_STATE_CONTINUE, ss)));</span><br><span> </span><br><span> /* expect echo response from EUSE */</span><br><span style="color: hsl(0, 100%, 40%);">- f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END,</span><br><span style="color: hsl(0, 100%, 40%);">- tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS,</span><br><span style="color: hsl(0, 100%, 40%);">- f_encGSM7bit("mahlzeit")));</span><br><span style="color: hsl(120, 100%, 40%);">+ res := f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_SESSION_STATE_END,</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS,</span><br><span style="color: hsl(120, 100%, 40%);">+ f_encGSM7bit("mahlzeit")));</span><br><span> }</span><br><span> testcase TC_mo_ussd_euse_continue() runs on test_CT {</span><br><span> var HlrSubscriberList sl;</span><br><span>@@ -969,8 +980,10 @@</span><br><span> ussd_string := "*999#");</span><br><span> GSUP.send(valueof(ts_GSUP_PROC_SS_REQ(g_pars.sub.imsi, g_pars.ussd.sid,</span><br><span> OSMO_GSUP_SESSION_STATE_BEGIN, ss)));</span><br><span style="color: hsl(0, 100%, 40%);">- f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END,</span><br><span style="color: hsl(0, 100%, 40%);">- tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS, f_encGSM7bit("*999#")));</span><br><span style="color: hsl(120, 100%, 40%);">+ res := f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_SESSION_STATE_END,</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_SS_USSD_FACILITY_RETURN_RESULT(1, 59, SS_USSD_DEFAULT_DCS,</span><br><span style="color: hsl(120, 100%, 40%);">+ f_encGSM7bit("*999#")));</span><br><span> }</span><br><span> testcase TC_mo_ussd_euse_defaultroute() runs on test_CT {</span><br><span> var HlrSubscriberList sl;</span><br><span>@@ -1004,6 +1017,7 @@</span><br><span> */</span><br><span> private function f_TC_mo_sss_reject() runs on HLR_ConnHdlr {</span><br><span> var SS_FacilityInformation ss_req;</span><br><span style="color: hsl(120, 100%, 40%);">+ var GSUP_PDU res;</span><br><span> </span><br><span> /* Prepare '*#21#' SS request */</span><br><span> ss_req := valueof(ts_SS_FACILITY_INVOKE(</span><br><span>@@ -1019,9 +1033,9 @@</span><br><span> enc_SS_FacilityInformation(ss_req))));</span><br><span> </span><br><span> /* Expect ReturnError with FACILITY_NOT_SUPPORTED */</span><br><span style="color: hsl(0, 100%, 40%);">- f_SS_expect(g_pars.sub.imsi,</span><br><span style="color: hsl(0, 100%, 40%);">- g_pars.ussd.sid, OSMO_GSUP_SESSION_STATE_END,</span><br><span style="color: hsl(0, 100%, 40%);">- tr_SS_FACILITY_RETURN_ERROR(0, 21));</span><br><span style="color: hsl(120, 100%, 40%);">+ res := f_SS_expect(g_pars.sub.imsi, g_pars.ussd.sid,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_SESSION_STATE_END,</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_SS_FACILITY_RETURN_ERROR(0, 21));</span><br><span> }</span><br><span> testcase TC_mo_sss_reject() runs on test_CT {</span><br><span> var HLR_ConnHdlrPars pars;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13448">change 13448</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/13448"/><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: Ifda42aa18af8076013b436364513296b2b008731 </div>
<div style="display:none"> Gerrit-Change-Number: 13448 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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 (1000002) </div>