<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13051">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">EDGE tests: reduce code duplication<br><br>* move duplicated code into helper function<br>* use proper parameter types<br><br>Change-Id: I8a9528032629e5df629996da5cd8b808efede017<br>---<br>M tests/edge/EdgeTest.cpp<br>1 file changed, 15 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/51/13051/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp</span><br><span>index 98ca206..6ce2334 100644</span><br><span>--- a/tests/edge/EdgeTest.cpp</span><br><span>+++ b/tests/edge/EdgeTest.cpp</span><br><span>@@ -105,11 +105,22 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static bool check_strong_monotonicity(const GprsCodingScheme *cs, uint8_t last_UL, uint8_t last_DL)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+    if (cs->maxBytesUL() <= last_UL)</span><br><span style="color: hsl(120, 100%, 40%);">+                return false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+       if (cs->maxBytesDL() <= last_DL)</span><br><span style="color: hsl(120, 100%, 40%);">+                return false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+       return true;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void test_coding_scheme()</span><br><span> {</span><br><span>   unsigned i;</span><br><span style="color: hsl(0, 100%, 40%);">-     unsigned last_size_UL;</span><br><span style="color: hsl(0, 100%, 40%);">-  unsigned last_size_DL;</span><br><span style="color: hsl(120, 100%, 40%);">+        uint8_t last_size_UL;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t last_size_DL;</span><br><span>        GprsCodingScheme::Scheme gprs_schemes[] = {</span><br><span>          GprsCodingScheme::CS1,</span><br><span>               GprsCodingScheme::CS2,</span><br><span>@@ -152,9 +163,7 @@</span><br><span>                 OSMO_ASSERT(GprsCodingScheme::Scheme(current_cs) == gprs_schemes[i]);</span><br><span>                OSMO_ASSERT(current_cs == GprsCodingScheme(gprs_schemes[i]));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-               /* Check strong monotonicity */</span><br><span style="color: hsl(0, 100%, 40%);">-         OSMO_ASSERT(current_cs.maxBytesUL() > last_size_UL);</span><br><span style="color: hsl(0, 100%, 40%);">-         OSMO_ASSERT(current_cs.maxBytesDL() > last_size_DL);</span><br><span style="color: hsl(120, 100%, 40%);">+               OSMO_ASSERT(check_strong_monotonicity(&current_cs, last_size_UL, last_size_DL));</span><br><span>                 last_size_UL = current_cs.maxBytesUL();</span><br><span>              last_size_DL = current_cs.maxBytesDL();</span><br><span> </span><br><span>@@ -179,9 +188,7 @@</span><br><span>            OSMO_ASSERT(GprsCodingScheme::Scheme(current_cs) == egprs_schemes[i].s);</span><br><span>             OSMO_ASSERT(current_cs == GprsCodingScheme(egprs_schemes[i].s));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-            /* Check strong monotonicity */</span><br><span style="color: hsl(0, 100%, 40%);">-         OSMO_ASSERT(current_cs.maxBytesUL() > last_size_UL);</span><br><span style="color: hsl(0, 100%, 40%);">-         OSMO_ASSERT(current_cs.maxBytesDL() > last_size_DL);</span><br><span style="color: hsl(120, 100%, 40%);">+               OSMO_ASSERT(check_strong_monotonicity(&current_cs, last_size_UL, last_size_DL));</span><br><span>                 last_size_UL = current_cs.maxBytesUL();</span><br><span>              last_size_DL = current_cs.maxBytesDL();</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13051">change 13051</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/13051"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I8a9528032629e5df629996da5cd8b808efede017 </div>
<div style="display:none"> Gerrit-Change-Number: 13051 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>