<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24478">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BTS_Tests: accept templates as parameters in t_EITC()<br><br>Change-Id: I56cd32a6ba91c078608d64c95538b9a43e2fada9<br>Related: SYS#4895, OS#4941<br>---<br>M bts/BTS_Tests.ttcn<br>1 file changed, 26 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/78/24478/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn</span><br><span>index 6c5663a..d00c40e 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -6216,7 +6216,8 @@</span><br><span>      boolean         exp</span><br><span> }</span><br><span> friend type record of RllTestCase RllTestCases;</span><br><span style="color: hsl(0, 100%, 40%);">-friend template RllTestCase t_EITC(uint3_t sapi, RslLinkId id,</span><br><span style="color: hsl(120, 100%, 40%);">+friend template RllTestCase t_EITC(template (present) uint3_t sapi,</span><br><span style="color: hsl(120, 100%, 40%);">+                                   template (present) RslLinkId id,</span><br><span>                             octetstring l3, boolean exp) := {</span><br><span>         sapi := sapi,</span><br><span>        link_id := id,</span><br><span>@@ -6293,16 +6294,16 @@</span><br><span> testcase TC_rll_est_ind() runs on test_CT {</span><br><span>      var RllTestCases tcs := {</span><br><span>            /* SAPI0 establishment (contention resolution) */</span><br><span style="color: hsl(0, 100%, 40%);">-               valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), '01020304'O, true)),</span><br><span style="color: hsl(120, 100%, 40%);">+         valueof(t_EITC(0, ts_RslLinkID_DCCH(0), '01020304'O, true)),</span><br><span>                 /* normal SAPI0 establishment */</span><br><span style="color: hsl(0, 100%, 40%);">-                valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), ''O, true)),</span><br><span style="color: hsl(120, 100%, 40%);">+         valueof(t_EITC(0, ts_RslLinkID_DCCH(0), ''O, true)),</span><br><span>                 /* SAPI 3 doesn't support contention resolution */</span><br><span style="color: hsl(0, 100%, 40%);">-          valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), '01020304'O, false)),</span><br><span style="color: hsl(0, 100%, 40%);">-          valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), '01020304'O, false)),</span><br><span style="color: hsl(120, 100%, 40%);">+               valueof(t_EITC(3, ts_RslLinkID_DCCH(3), '01020304'O, false)),</span><br><span style="color: hsl(120, 100%, 40%);">+         valueof(t_EITC(3, ts_RslLinkID_SACCH(3), '01020304'O, false)),</span><br><span>               /* normal SAPI3 establishment on main DCCH */</span><br><span style="color: hsl(0, 100%, 40%);">-           valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), ''O, true)),</span><br><span style="color: hsl(120, 100%, 40%);">+         valueof(t_EITC(3, ts_RslLinkID_DCCH(3), ''O, true)),</span><br><span>                 /* normal SAPI3 establishment on SACCH */</span><br><span style="color: hsl(0, 100%, 40%);">-               valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), ''O, true))</span><br><span style="color: hsl(120, 100%, 40%);">+         valueof(t_EITC(3, ts_RslLinkID_SACCH(3), ''O, true))</span><br><span>         };</span><br><span>   f_rll_testmatrix(tcs, refers(f_TC_rll_est_ind));</span><br><span> }</span><br><span>@@ -6337,14 +6338,14 @@</span><br><span> testcase TC_rll_est_req_DCCH_3() runs on test_CT {</span><br><span>        var RllTestCases tcs := {</span><br><span>            /* normal SAPI3 establishment on main DCCH */</span><br><span style="color: hsl(0, 100%, 40%);">-           valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), ''O, true))//,</span><br><span style="color: hsl(120, 100%, 40%);">+               valueof(t_EITC(3, ts_RslLinkID_DCCH(3), ''O, true))//,</span><br><span>       };</span><br><span>   f_rll_testmatrix(tcs, refers(f_TC_rll_est_req));</span><br><span> }</span><br><span> testcase TC_rll_est_req_ACCH_3() runs on test_CT {</span><br><span>  var RllTestCases tcs := {</span><br><span>            /* normal SAPI3 establishment on SACCH */</span><br><span style="color: hsl(0, 100%, 40%);">-               valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), ''O, true))</span><br><span style="color: hsl(120, 100%, 40%);">+         valueof(t_EITC(3, ts_RslLinkID_SACCH(3), ''O, true))</span><br><span>         }</span><br><span>    f_rll_testmatrix(tcs, refers(f_TC_rll_est_req));</span><br><span> }</span><br><span>@@ -6435,26 +6436,26 @@</span><br><span> }</span><br><span> testcase TC_rll_rel_ind_DCCH_0() runs on test_CT {</span><br><span>   var RllTestCases tcs := {</span><br><span style="color: hsl(0, 100%, 40%);">-               valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), '01020304'O, true))</span><br><span style="color: hsl(120, 100%, 40%);">+          valueof(t_EITC(0, ts_RslLinkID_DCCH(0), '01020304'O, true))</span><br><span>  };</span><br><span>   f_rll_testmatrix(tcs, refers(f_TC_rll_rel_ind));</span><br><span> }</span><br><span> </span><br><span> testcase TC_rll_rel_ind_ACCH_0() runs on test_CT {</span><br><span>      var RllTestCases tcs := {</span><br><span style="color: hsl(0, 100%, 40%);">-               valueof(t_EITC(0, valueof(ts_RslLinkID_SACCH(0)), ''O, true))</span><br><span style="color: hsl(120, 100%, 40%);">+         valueof(t_EITC(0, ts_RslLinkID_SACCH(0), ''O, true))</span><br><span>         };</span><br><span>   f_rll_testmatrix(tcs, refers(f_TC_rll_rel_ind));</span><br><span> }</span><br><span> testcase TC_rll_rel_ind_DCCH_3() runs on test_CT {</span><br><span>  var RllTestCases tcs := {</span><br><span style="color: hsl(0, 100%, 40%);">-               valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), ''O, true))</span><br><span style="color: hsl(120, 100%, 40%);">+          valueof(t_EITC(3, ts_RslLinkID_DCCH(3), ''O, true))</span><br><span>  };</span><br><span>   f_rll_testmatrix(tcs, refers(f_TC_rll_rel_ind));</span><br><span> }</span><br><span> testcase TC_rll_rel_ind_ACCH_3() runs on test_CT {</span><br><span>  var RllTestCases tcs := {</span><br><span style="color: hsl(0, 100%, 40%);">-               valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), ''O, true))</span><br><span style="color: hsl(120, 100%, 40%);">+         valueof(t_EITC(3, ts_RslLinkID_SACCH(3), ''O, true))</span><br><span>         };</span><br><span>   f_rll_testmatrix(tcs, refers(f_TC_rll_rel_ind));</span><br><span> }</span><br><span>@@ -6488,10 +6489,10 @@</span><br><span> }</span><br><span> testcase TC_rll_rel_req() runs on test_CT {</span><br><span>  var RllTestCases tcs := {</span><br><span style="color: hsl(0, 100%, 40%);">-               valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), '01020304'O, true)),</span><br><span style="color: hsl(0, 100%, 40%);">-           valueof(t_EITC(0, valueof(ts_RslLinkID_SACCH(0)), ''O, true)),</span><br><span style="color: hsl(0, 100%, 40%);">-          valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), ''O, true)),</span><br><span style="color: hsl(0, 100%, 40%);">-           valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), ''O, true))</span><br><span style="color: hsl(120, 100%, 40%);">+         valueof(t_EITC(0, ts_RslLinkID_DCCH(0), '01020304'O, true)),</span><br><span style="color: hsl(120, 100%, 40%);">+          valueof(t_EITC(0, ts_RslLinkID_SACCH(0), ''O, true)),</span><br><span style="color: hsl(120, 100%, 40%);">+         valueof(t_EITC(3, ts_RslLinkID_DCCH(3), ''O, true)),</span><br><span style="color: hsl(120, 100%, 40%);">+          valueof(t_EITC(3, ts_RslLinkID_SACCH(3), ''O, true))</span><br><span>         };</span><br><span>   f_rll_testmatrix(tcs, refers(f_TC_rll_rel_req));</span><br><span> }</span><br><span>@@ -6531,16 +6532,16 @@</span><br><span> testcase TC_rll_unit_data_req_DCCH() runs on test_CT {</span><br><span>    var octetstring l3 := f_rnd_octstring(15);</span><br><span>   var RllTestCases tcs := {</span><br><span style="color: hsl(0, 100%, 40%);">-               valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), l3, true)),</span><br><span style="color: hsl(0, 100%, 40%);">-            valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), l3, true))</span><br><span style="color: hsl(120, 100%, 40%);">+           valueof(t_EITC(0, ts_RslLinkID_DCCH(0), l3, true)),</span><br><span style="color: hsl(120, 100%, 40%);">+           valueof(t_EITC(3, ts_RslLinkID_DCCH(3), l3, true))</span><br><span>   };</span><br><span>   f_rll_testmatrix(tcs, refers(f_TC_rll_ud_req));</span><br><span> }</span><br><span> testcase TC_rll_unit_data_req_ACCH() runs on test_CT {</span><br><span>       var octetstring l3 := f_rnd_octstring(19);</span><br><span>   var RllTestCases tcs := {</span><br><span style="color: hsl(0, 100%, 40%);">-               valueof(t_EITC(0, valueof(ts_RslLinkID_SACCH(0)), l3, true)),</span><br><span style="color: hsl(0, 100%, 40%);">-           valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), l3, true))</span><br><span style="color: hsl(120, 100%, 40%);">+          valueof(t_EITC(0, ts_RslLinkID_SACCH(0), l3, true)),</span><br><span style="color: hsl(120, 100%, 40%);">+          valueof(t_EITC(3, ts_RslLinkID_SACCH(3), l3, true))</span><br><span>  };</span><br><span>   f_rll_testmatrix(tcs, refers(f_TC_rll_ud_req));</span><br><span> }</span><br><span>@@ -6573,16 +6574,16 @@</span><br><span> testcase TC_rll_unit_data_ind_DCCH() runs on test_CT {</span><br><span>     var octetstring l3 := f_rnd_octstring(20);</span><br><span>   var RllTestCases tcs := {</span><br><span style="color: hsl(0, 100%, 40%);">-               valueof(t_EITC(0, valueof(ts_RslLinkID_DCCH(0)), l3, true)),</span><br><span style="color: hsl(0, 100%, 40%);">-            valueof(t_EITC(3, valueof(ts_RslLinkID_DCCH(3)), l3, true))</span><br><span style="color: hsl(120, 100%, 40%);">+           valueof(t_EITC(0, ts_RslLinkID_DCCH(0), l3, true)),</span><br><span style="color: hsl(120, 100%, 40%);">+           valueof(t_EITC(3, ts_RslLinkID_DCCH(3), l3, true))</span><br><span>   };</span><br><span>   f_rll_testmatrix(tcs, refers(f_TC_rll_ud_ind));</span><br><span> }</span><br><span> testcase TC_rll_unit_data_ind_ACCH() runs on test_CT {</span><br><span>       var octetstring l3 := f_rnd_octstring(18);</span><br><span>   var RllTestCases tcs := {</span><br><span style="color: hsl(0, 100%, 40%);">-               valueof(t_EITC(0, valueof(ts_RslLinkID_SACCH(0)), l3, true)),</span><br><span style="color: hsl(0, 100%, 40%);">-           valueof(t_EITC(3, valueof(ts_RslLinkID_SACCH(3)), l3, true))</span><br><span style="color: hsl(120, 100%, 40%);">+          valueof(t_EITC(0, ts_RslLinkID_SACCH(0), l3, true)),</span><br><span style="color: hsl(120, 100%, 40%);">+          valueof(t_EITC(3, ts_RslLinkID_SACCH(3), l3, true))</span><br><span>  };</span><br><span>   f_rll_testmatrix(tcs, refers(f_TC_rll_ud_ind));</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24478">change 24478</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/c/osmo-ttcn3-hacks/+/24478"/><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-Change-Id: I56cd32a6ba91c078608d64c95538b9a43e2fada9 </div>
<div style="display:none"> Gerrit-Change-Number: 24478 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>