diff options
| author | Max <msuraev@sysmocom.de> | 2019-03-12 12:53:27 +0100 |
|---|---|---|
| committer | Max <msuraev@sysmocom.de> | 2019-03-19 15:05:51 +0000 |
| commit | f4d3973688a0d07cadb9e1f3529712b5e50624ea (patch) | |
| tree | ca2c6d33756aba807504c275d002fc664e1b167f | |
| parent | 0fb91b736c3a3219fb018b4841f18ef164519f73 (diff) | |
MS store: move test helper to unit test
It's confusing to have test-specific helper with the same name as tested
function directly inside the GprsMsStorage class. Let's convert it into
static function and move to the unit test.
Change-Id: Ia2a5b90779051af894fe15d957c1d26f0a142f33
| -rw-r--r-- | src/gprs_ms_storage.cpp | 17 | ||||
| -rw-r--r-- | src/gprs_ms_storage.h | 1 | ||||
| -rw-r--r-- | tests/ms/MsTest.cpp | 20 |
3 files changed, 18 insertions, 20 deletions
diff --git a/src/gprs_ms_storage.cpp b/src/gprs_ms_storage.cpp index c7de6d30..04518c59 100644 --- a/src/gprs_ms_storage.cpp +++ b/src/gprs_ms_storage.cpp @@ -106,20 +106,3 @@ GprsMs *GprsMsStorage::create_ms() return ms; } - -GprsMs *GprsMsStorage::create_ms(uint32_t tlli, enum gprs_rlcmac_tbf_direction dir) -{ - GprsMs *ms = get_ms(tlli); - - if (ms) - return ms; - - ms = create_ms(); - - if (dir == GPRS_RLCMAC_UL_TBF) - ms->set_tlli(tlli); - else - ms->confirm_tlli(tlli); - - return ms; -} diff --git a/src/gprs_ms_storage.h b/src/gprs_ms_storage.h index 44ad0ed4..14707f5f 100644 --- a/src/gprs_ms_storage.h +++ b/src/gprs_ms_storage.h @@ -39,7 +39,6 @@ public: virtual void ms_active(class GprsMs *); GprsMs *get_ms(uint32_t tlli, uint32_t old_tlli = 0, const char *imsi = 0) const; - GprsMs *create_ms(uint32_t tlli, enum gprs_rlcmac_tbf_direction dir); GprsMs *create_ms(); const LListHead<GprsMs>& ms_list() const {return m_list;} diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp index 728daf6e..2b0bc0ff 100644 --- a/tests/ms/MsTest.cpp +++ b/tests/ms/MsTest.cpp @@ -337,6 +337,22 @@ static void test_ms_change_tlli() printf("=== end %s ===\n", __func__); } +static GprsMs *prepare_ms(GprsMsStorage *st, uint32_t tlli, enum gprs_rlcmac_tbf_direction dir) +{ + GprsMs *ms = st->get_ms(tlli); + if (ms) + return ms; + + ms = st->create_ms(); + + if (dir == GPRS_RLCMAC_UL_TBF) + ms->set_tlli(tlli); + else + ms->confirm_tlli(tlli); + + return ms; +} + static void test_ms_storage() { uint32_t tlli = 0xffeeddbb; @@ -355,7 +371,7 @@ static void test_ms_storage() ms = store.get_ms(tlli + 0); OSMO_ASSERT(ms == NULL); - ms = store.create_ms(tlli + 0, GPRS_RLCMAC_UL_TBF); + ms = prepare_ms(&store, tlli + 0, GPRS_RLCMAC_UL_TBF); OSMO_ASSERT(ms != NULL); OSMO_ASSERT(ms->tlli() == tlli + 0); ms->set_imsi(imsi1); @@ -371,7 +387,7 @@ static void test_ms_storage() ms_tmp = store.get_ms(0, 0, imsi2); OSMO_ASSERT(ms_tmp == NULL); - ms = store.create_ms(tlli + 1, GPRS_RLCMAC_UL_TBF); + ms = prepare_ms(&store, tlli + 1, GPRS_RLCMAC_UL_TBF); OSMO_ASSERT(ms != NULL); OSMO_ASSERT(ms->tlli() == tlli + 1); ms->set_imsi(imsi2); |